mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2024-09-13 09:17:20 -07:00
Rename debian package to wine-staging and small changelog cleanup.
This commit is contained in:
Michael Müller
parent
12af26a582
commit
90261acce1
9
debian/changelog
vendored
9
debian/changelog
vendored
@ -1,4 +1,5 @@
|
||||
wine-compholio (1.7.34) UNRELEASED; urgency=low
|
||||
wine-staging (1.7.34) UNRELEASED; urgency=low
|
||||
* Rename debian package from 'wine-compholio' to 'wine-staging' and provide compatibility package.
|
||||
* Avoid duplicate wined3d specfile by adding PARENTSPEC Makefile argument.
|
||||
* Fix issue in DOS Attributes patch which broke ./configure on systems with alternative shells.
|
||||
* Added patch to fix handling of subdirectory in FtpFindFirstFile.
|
||||
@ -7,8 +8,8 @@ wine-compholio (1.7.34) UNRELEASED; urgency=low
|
||||
* Removed patch to add fake ProductId to registry (accepted upstream).
|
||||
* Removed patch to implement stubs for MFStartup and MFShutdown (accepted upstream).
|
||||
* Removed patch to implement shlwapi.StrCatChainW (accepted upstream).
|
||||
* Removed patch to implement semi-stub for psapi/kernel32 K32EnumProcessModulesEx.
|
||||
* Removed patch to return proper charcount for GetLocaleInfo with LOCALE_IFIRSTDAYOFWEEK.
|
||||
* Removed patch to implement semi-stub for psapi/kernel32 K32EnumProcessModulesEx (accepted upstream).
|
||||
* Removed patch to return proper charcount for GetLocaleInfo with LOCALE_IFIRSTDAYOFWEEK (accepted upstream).
|
||||
-- Sebastian Lackner <sebastian@fds-team.de> Mon, 15 Dec 2014 22:42:09 +0100
|
||||
|
||||
wine-compholio (1.7.33) unstable; urgency=low
|
||||
@ -67,7 +68,7 @@ wine-compholio (1.7.32) unstable; urgency=low
|
||||
* Removed patch to fix implementation ofCoWaitForMultipleHandles (accepted upstream).
|
||||
* Removed patch to avoid interthread no-op messages in ShowWindow (accepted upstream).
|
||||
* Removed patches to take abs() of vertex z coordinate as FFP fog coordinate (fixed upstream).
|
||||
* Removed patch to fix detection of gnutls on Ubuntu 14.10.
|
||||
* Removed patch to fix detection of gnutls on Ubuntu 14.10 (accepted upstream).
|
||||
-- Sebastian Lackner <sebastian@fds-team.de> Sun, 30 Nov 2014 15:22:49 +0100
|
||||
|
||||
wine-compholio (1.7.31) unstable; urgency=low
|
||||
|
||||
60
debian/control
vendored
60
debian/control
vendored
@ -1,4 +1,4 @@
|
||||
Source: wine-compholio
|
||||
Source: wine-staging
|
||||
Section: otherosfs
|
||||
Priority: optional
|
||||
Maintainer: Erich E. Hoover <erich.e.hoover@gmail.com>
|
||||
@ -69,7 +69,7 @@ Build-Depends: autotools-dev,
|
||||
x11proto-xinerama-dev
|
||||
Standards-Version: 3.9.2
|
||||
|
||||
Package: wine-compholio-i386
|
||||
Package: wine-staging-i386
|
||||
Architecture: i386
|
||||
Multi-Arch: foreign
|
||||
Pre-Depends: dpkg (>= 1.14.12ubuntu3), ${misc:Pre-Depends}
|
||||
@ -108,9 +108,9 @@ Recommends: libcapi20-3,
|
||||
libgsm1
|
||||
Section: otherosfs
|
||||
Priority: optional
|
||||
Replaces: wine-compholio (<< 1.7.15-1~)
|
||||
Breaks: wine-compholio (<< 1.7.15-1~)
|
||||
Description: The Compholio Edition is a special build of the popular Wine software
|
||||
Replaces: wine-compholio-i386 (<< 1.7.34~)
|
||||
Breaks: wine-compholio-i386 (<< 1.7.34~)
|
||||
Description: The Staging Edition is a special build of the popular Wine software
|
||||
with patches representing my current staging tree for Wine.
|
||||
.
|
||||
Microsoft Windows Compatibility Layer (Binary Emulator and Library)
|
||||
@ -125,7 +125,7 @@ Description: The Compholio Edition is a special build of the popular Wine softwa
|
||||
work, there may be some loss of functionality compared with the stable release
|
||||
provided by the regular wine package.
|
||||
|
||||
Package: wine-compholio-amd64
|
||||
Package: wine-staging-amd64
|
||||
Architecture: amd64
|
||||
Multi-Arch: foreign
|
||||
Pre-Depends: dpkg (>= 1.14.12ubuntu3), ${misc:Pre-Depends}
|
||||
@ -164,9 +164,9 @@ Recommends: libcapi20-3,
|
||||
libgsm1
|
||||
Section: otherosfs
|
||||
Priority: optional
|
||||
Replaces: wine-compholio (<< 1.7.15-1~)
|
||||
Breaks: wine-compholio (<< 1.7.15-1~)
|
||||
Description: The Compholio Edition is a special build of the popular Wine software
|
||||
Replaces: wine-compholio-amd64 (<< 1.7.34~)
|
||||
Breaks: wine-compholio-amd64 (<< 1.7.34~)
|
||||
Description: The Staging Edition is a special build of the popular Wine software
|
||||
with patches representing my current staging tree for Wine.
|
||||
.
|
||||
Microsoft Windows Compatibility Layer (Binary Emulator and Library)
|
||||
@ -181,16 +181,18 @@ Description: The Compholio Edition is a special build of the popular Wine softwa
|
||||
work, there may be some loss of functionality compared with the stable release
|
||||
provided by the regular wine package.
|
||||
|
||||
Package: wine-compholio
|
||||
Package: wine-staging
|
||||
Architecture: i386 amd64
|
||||
Multi-Arch: foreign
|
||||
Pre-Depends: dpkg (>= 1.14.12ubuntu3), ${misc:Pre-Depends}
|
||||
Depends: ${misc:Depends}, ${shlibs:Depends},
|
||||
wine-compholio-i386 (= ${binary:Version}) [i386 amd64],
|
||||
wine-compholio-amd64 (= ${binary:Version}) [amd64],
|
||||
wine-staging-i386 (= ${binary:Version}) [i386 amd64],
|
||||
wine-staging-amd64 (= ${binary:Version}) [amd64],
|
||||
Section: otherosfs
|
||||
Priority: optional
|
||||
Description: The Compholio Edition is a special build of the popular Wine software
|
||||
Replaces: wine-compholio (<< 1.7.34~)
|
||||
Breaks: wine-compholio (<< 1.7.34~)
|
||||
Description: The Staging Edition is a special build of the popular Wine software
|
||||
with patches representing my current staging tree for Wine.
|
||||
.
|
||||
Microsoft Windows Compatibility Layer (Binary Emulator and Library)
|
||||
@ -207,18 +209,18 @@ Description: The Compholio Edition is a special build of the popular Wine softwa
|
||||
work, there may be some loss of functionality compared with the stable release
|
||||
provided by the regular wine package.
|
||||
|
||||
Package: wine-compholio-dev
|
||||
Package: wine-staging-dev
|
||||
Architecture: i386 amd64
|
||||
Pre-Depends: dpkg (>= 1.14.12ubuntu3), ${misc:Pre-Depends}
|
||||
Depends: libc6-dev,
|
||||
${shlibs:Depends},
|
||||
wine-compholio-i386 (= ${binary:Version}) [i386 amd64],
|
||||
wine-compholio-amd64 (= ${binary:Version}) [amd64],
|
||||
wine-staging-i386 (= ${binary:Version}) [i386 amd64],
|
||||
wine-staging-amd64 (= ${binary:Version}) [amd64],
|
||||
Section: libdevel
|
||||
Priority: optional
|
||||
Replaces: wine-compholio (<< 1.7.15-1~)
|
||||
Breaks: wine-compholio (<< 1.7.15-1~)
|
||||
Description: The Compholio Edition is a special build of the popular Wine software
|
||||
Replaces: wine-compholio-dev (<< 1.7.34~)
|
||||
Breaks: wine-compholio-dev (<< 1.7.34~)
|
||||
Description: The Staging Edition is a special build of the popular Wine software
|
||||
with patches representing my current staging tree for Wine.
|
||||
.
|
||||
Microsoft Windows Compatibility Layer (Binary Emulator and Library)
|
||||
@ -230,18 +232,18 @@ Description: The Compholio Edition is a special build of the popular Wine softwa
|
||||
This package consists of the development files needed to compile programs
|
||||
using wine's free version of the Microsoft Windows API.
|
||||
|
||||
Package: wine-compholio-dbg
|
||||
Package: wine-staging-dbg
|
||||
Architecture: i386 amd64
|
||||
Multi-Arch: same
|
||||
Pre-Depends: dpkg (>= 1.14.12ubuntu3), ${misc:Pre-Depends}
|
||||
Depends: ${shlibs:Depends},
|
||||
wine-compholio-i386 (= ${binary:Version}) [i386 amd64],
|
||||
wine-compholio-amd64 (= ${binary:Version}) [amd64],
|
||||
wine-staging-i386 (= ${binary:Version}) [i386 amd64],
|
||||
wine-staging-amd64 (= ${binary:Version}) [amd64],
|
||||
Section: debug
|
||||
Priority: optional
|
||||
Replaces: wine-compholio (<< 1.7.15-1~)
|
||||
Breaks: wine-compholio (<< 1.7.15-1~)
|
||||
Description: The Compholio Edition is a special build of the popular Wine software
|
||||
Replaces: wine-staging-dbg (<< 1.7.15-1~)
|
||||
Breaks: wine-staging-dbg (<< 1.7.15-1~)
|
||||
Description: The Staging Edition is a special build of the popular Wine software
|
||||
with patches representing my current staging tree for Wine.
|
||||
.
|
||||
Microsoft Windows Compatibility Layer (Binary Emulator and Library)
|
||||
@ -252,3 +254,11 @@ Description: The Compholio Edition is a special build of the popular Wine softwa
|
||||
.
|
||||
This package includes debugging symbols useful for reporting crashes and other
|
||||
failures.
|
||||
|
||||
Package: wine-compholio
|
||||
Architecture: i386 amd64
|
||||
Depends: wine-staging, ${misc:Depends}
|
||||
Priority: extra
|
||||
Section: oldlibs
|
||||
Description: Transitional dummy package
|
||||
This is a transitional dummy package. It can safely be removed.
|
||||
|
||||
25
debian/rules
vendored
25
debian/rules
vendored
@ -18,7 +18,7 @@ override_dh_auto_configure:
|
||||
|
||||
# Run configure
|
||||
ifeq ($(DEB_BUILD_ARCH), amd64)
|
||||
./configure --prefix=/opt/wine-compholio \
|
||||
./configure --prefix=/opt/wine-staging \
|
||||
--libdir=\$${prefix}/lib64 \
|
||||
--mandir=\$${prefix}/share/man \
|
||||
--infodir=\$${prefix}/share/info \
|
||||
@ -27,7 +27,7 @@ ifeq ($(DEB_BUILD_ARCH), amd64)
|
||||
--with-xattr \
|
||||
$(CONFFLAGS)
|
||||
else
|
||||
./configure --prefix=/opt/wine-compholio \
|
||||
./configure --prefix=/opt/wine-staging \
|
||||
--libdir=\$${prefix}/lib \
|
||||
--mandir=\$${prefix}/share/man \
|
||||
--infodir=\$${prefix}/share/info \
|
||||
@ -45,28 +45,31 @@ override_dh_installdocs:
|
||||
|
||||
# Create copies of license files
|
||||
cp "$(CURDIR)/LICENSE" "$(CURDIR)/LICENSE.wine"
|
||||
cp "$(CURDIR)/LICENSE.md" "$(CURDIR)/LICENSE.wine-compholio"
|
||||
cp "$(CURDIR)/LICENSE.md" "$(CURDIR)/LICENSE.wine-staging"
|
||||
|
||||
dh_installdocs --link-doc=wine-compholio
|
||||
dh_installdocs --link-doc=wine-staging
|
||||
|
||||
|
||||
override_dh_install:
|
||||
dh_install --fail-missing
|
||||
|
||||
# These files will end up in multiple packages otherwise
|
||||
rm -f debian/wine-compholio/opt/wine-compholio/bin/wine
|
||||
rm -f debian/wine-compholio/opt/wine-compholio/bin/wine-preloader
|
||||
rm -f debian/wine-compholio/opt/wine-compholio/bin/wine64
|
||||
rm -f debian/wine-compholio/opt/wine-compholio/bin/wine64-preloader
|
||||
rm -f debian/wine-staging/opt/wine-staging/bin/wine
|
||||
rm -f debian/wine-staging/opt/wine-staging/bin/wine-preloader
|
||||
rm -f debian/wine-staging/opt/wine-staging/bin/wine64
|
||||
rm -f debian/wine-staging/opt/wine-staging/bin/wine64-preloader
|
||||
|
||||
# Create compatibility symlink
|
||||
mkdir -p debian/wine-compholio/opt
|
||||
ln -s /opt/wine-staging debian/wine-compholio/opt/wine-compholio
|
||||
|
||||
override_dh_strip:
|
||||
dh_strip -Xwine-pthread -Xwine-kthread --dbg-package=wine-compholio-dbg
|
||||
dh_strip -Xwine-pthread -Xwine-kthread --dbg-package=wine-staging-dbg
|
||||
|
||||
|
||||
override_dh_shlibdeps:
|
||||
ifeq ($(DEB_HOST_ARCH),amd64)
|
||||
dh_shlibdeps -l $(CURDIR)/debian/tmp/opt/wine-compholio/lib64/
|
||||
dh_shlibdeps -l $(CURDIR)/debian/tmp/opt/wine-staging/lib64/
|
||||
else
|
||||
dh_shlibdeps -l $(CURDIR)/debian/tmp/opt/wine-compholio/lib/
|
||||
dh_shlibdeps -l $(CURDIR)/debian/tmp/opt/wine-staging/lib/
|
||||
endif
|
||||
|
||||
4
debian/wine-compholio-amd64.install
vendored
4
debian/wine-compholio-amd64.install
vendored
@ -1,4 +0,0 @@
|
||||
/opt/wine-compholio/lib64/libwine.so*
|
||||
/opt/wine-compholio/lib64/wine
|
||||
/opt/wine-compholio/bin/wine64
|
||||
/opt/wine-compholio/bin/wine64-preloader
|
||||
1
debian/wine-compholio-dev.install
vendored
1
debian/wine-compholio-dev.install
vendored
@ -1 +0,0 @@
|
||||
/opt/wine-compholio/include
|
||||
4
debian/wine-compholio-i386.install
vendored
4
debian/wine-compholio-i386.install
vendored
@ -1,4 +0,0 @@
|
||||
/opt/wine-compholio/lib/libwine.so*
|
||||
/opt/wine-compholio/lib/wine
|
||||
/opt/wine-compholio/bin/wine
|
||||
/opt/wine-compholio/bin/wine-preloader
|
||||
2
debian/wine-compholio.install
vendored
2
debian/wine-compholio.install
vendored
@ -1,2 +0,0 @@
|
||||
/opt/wine-compholio/bin
|
||||
/opt/wine-compholio/share
|
||||
4
debian/wine-staging-amd64.install
vendored
Normal file
4
debian/wine-staging-amd64.install
vendored
Normal file
@ -0,0 +1,4 @@
|
||||
/opt/wine-staging/lib64/libwine.so*
|
||||
/opt/wine-staging/lib64/wine
|
||||
/opt/wine-staging/bin/wine64
|
||||
/opt/wine-staging/bin/wine64-preloader
|
||||
1
debian/wine-staging-dev.install
vendored
Normal file
1
debian/wine-staging-dev.install
vendored
Normal file
@ -0,0 +1 @@
|
||||
/opt/wine-staging/include
|
||||
4
debian/wine-staging-i386.install
vendored
Normal file
4
debian/wine-staging-i386.install
vendored
Normal file
@ -0,0 +1,4 @@
|
||||
/opt/wine-staging/lib/libwine.so*
|
||||
/opt/wine-staging/lib/wine
|
||||
/opt/wine-staging/bin/wine
|
||||
/opt/wine-staging/bin/wine-preloader
|
||||
@ -2,5 +2,5 @@ documentation/README.*
|
||||
ANNOUNCE
|
||||
AUTHORS
|
||||
LICENSE.wine
|
||||
LICENSE.wine-compholio
|
||||
LICENSE.wine-staging
|
||||
README
|
||||
2
debian/wine-staging.install
vendored
Normal file
2
debian/wine-staging.install
vendored
Normal file
@ -0,0 +1,2 @@
|
||||
/opt/wine-staging/bin
|
||||
/opt/wine-staging/share
|
||||
Loading…
Reference in New Issue
Block a user