diff -Nru wine1.4-1.4.1/debian/changelog wine1.4-1.4.1/debian/changelog --- wine1.4-1.4.1/debian/changelog 2012-09-06 01:22:50.000000000 +0000 +++ wine1.4-1.4.1/debian/changelog 2012-11-09 23:08:44.000000000 +0000 @@ -1,3 +1,13 @@ +wine1.4 (1.4.1-0ubuntu2) raring; urgency=low + + * Drop wine1.4-common package and use :any depends for multiarch + * Remove recommends on gettext (LP: #954029) + * Add CFLAGS="-DIP_UNICAST_IF=50" to configure (LP: #1065640) + * Remove wine1.2 and wine1.3 dummy packages + - Replaces all versions of them + + -- Scott Ritchie Fri, 09 Nov 2012 14:06:10 -0800 + wine1.4 (1.4.1-0ubuntu1) quantal; urgency=low * New upstream release (LP: #1016047) diff -Nru wine1.4-1.4.1/debian/control wine1.4-1.4.1/debian/control --- wine1.4-1.4.1/debian/control 2012-09-06 01:16:02.000000000 +0000 +++ wine1.4-1.4.1/debian/control 2012-11-09 23:32:44.000000000 +0000 @@ -64,10 +64,9 @@ Multi-Arch: foreign Pre-Depends: dpkg (>= 1.14.12ubuntu3), ${misc:Pre-Depends} Depends: ${shlibs:Depends}, - wine1.4-common (= ${binary:Version}), + wine1.4:any (= ${binary:Version}), libncurses5 -Recommends: gettext, - libasound2-plugins, +Recommends: libasound2-plugins, libcapi20-3, libcups2, libdbus-1-3, @@ -96,8 +95,8 @@ wine1.2 (<< 1.4-0ubuntu1), wine1.3 (<< 1.4-0ubuntu1) Replaces: wine (<< 1.2.1), - wine1.2 (<< 1.4-0ubuntu1), - wine1.3 (<< 1.4-0ubuntu1) + wine1.2, + wine1.3 Provides: wine-i386 Description: Microsoft Windows Compatibility Layer (32-bit support) Wine is a compatibility layer for running Windows applications on Linux. @@ -117,9 +116,8 @@ Multi-Arch: foreign Pre-Depends: dpkg (>= 1.14.12ubuntu3), ${misc:Pre-Depends} Depends: ${shlibs:Depends}, - wine1.4-common (= ${binary:Version}) -Recommends: gettext, - libasound2-plugins, + wine1.4:any (= ${binary:Version}) +Recommends: libasound2-plugins, libcapi20-3, libcups2, libdbus-1-3, @@ -148,8 +146,8 @@ wine1.2 (<< 1.4-0ubuntu1), wine1.3 (<< 1.4-0ubuntu1) Replaces: wine (<< 1.2.1), - wine1.2 (<< 1.4-0ubuntu1), - wine1.3 (<< 1.4-0ubuntu1) + wine1.2, + wine1.3 Provides: wine-amd64 Description: Microsoft Windows Compatibility Layer (64-bit support) Wine is a compatibility layer for running Windows applications on Linux. @@ -184,6 +182,7 @@ winbind, winetricks, xdg-utils +Suggests: dosbox Breaks: ttf-tahoma-replacement, ttf-symbol-replacement, ttf-symbol-replacement-wine1.3, @@ -247,36 +246,6 @@ This package includes debugging symbols useful for reporting crashes and other failures. -Package: wine1.2 -Architecture: i386 amd64 -Section: otherosfs -Pre-Depends: ${misc:Pre-Depends} -Depends: wine1.4 -Multi-Arch: foreign -Description: Microsoft Windows Compatibility Layer (transitional package) - Wine is a compatibility layer for running Windows applications on Linux. - Applications are run at full speed without the need of cpu emulation. Wine - does not require Microsoft Windows, however it can use native system dll - files in place of its own if they are available. - . - This is a transitional package to ease upgrades of older versions and contains - no files. - -Package: wine1.3 -Architecture: i386 amd64 -Section: otherosfs -Pre-Depends: ${misc:Pre-Depends} -Depends: wine1.4 -Multi-Arch: foreign -Description: Microsoft Windows Compatibility Layer (transitional package) - Wine is a compatibility layer for running Windows applications on Linux. - Applications are run at full speed without the need of cpu emulation. Wine - does not require Microsoft Windows, however it can use native system dll - files in place of its own if they are available. - . - This is a transitional package to ease upgrades of older versions and contains - no files. - Package: wine Architecture: amd64 i386 Section: otherosfs @@ -292,18 +261,3 @@ . This meta-package always depends on the default version of Wine. -Package: wine1.4-common -Architecture: all -Multi-Arch: foreign -Pre-Depends: ${misc:Pre-Depends} -Depends: wine1.4 (= ${binary:Version}) -Suggests: dosbox -Description: Microsoft Windows Compatibility Layer (transitional package) - Wine is a compatibility layer for running Windows applications on Linux. - Applications are run at full speed without the need of cpu emulation. Wine - does not require Microsoft Windows, however it can use native system dll - files in place of its own if they are available. - . - This is a transitional package to ease upgrades of older versions and contains - no files. - diff -Nru wine1.4-1.4.1/debian/rules wine1.4-1.4.1/debian/rules --- wine1.4-1.4.1/debian/rules 2012-02-01 11:12:46.000000000 +0000 +++ wine1.4-1.4.1/debian/rules 2012-11-09 23:08:35.000000000 +0000 @@ -4,9 +4,9 @@ override_dh_auto_configure: ifeq ($(DEB_BUILD_ARCH), amd64) - CC="gcc-4.5" dh_auto_configure -- --enable-win64 + CFLAGS="-DIP_UNICAST_IF=50" CC="gcc-4.5" dh_auto_configure -- --enable-win64 else - CC="gcc-4.5" dh_auto_configure + CFLAGS="-DIP_UNICAST_IF=50" CC="gcc-4.5" dh_auto_configure endif override_dh_auto_test: diff -Nru wine1.4-1.4.1/debian/wine1.2/DEBIAN/control wine1.4-1.4.1/debian/wine1.2/DEBIAN/control --- wine1.4-1.4.1/debian/wine1.2/DEBIAN/control 1970-01-01 00:00:00.000000000 +0000 +++ wine1.4-1.4.1/debian/wine1.2/DEBIAN/control 2012-11-09 21:48:38.000000000 +0000 @@ -0,0 +1,19 @@ +Package: wine1.2 +Source: wine1.4 +Version: 1.4.1-0ubuntu1 +Architecture: amd64 +Maintainer: Scott Ritchie +Installed-Size: 21 +Depends: wine1.4 +Section: otherosfs +Priority: optional +Multi-Arch: foreign +Homepage: http://www.winehq.org/ +Description: Microsoft Windows Compatibility Layer (transitional package) + Wine is a compatibility layer for running Windows applications on Linux. + Applications are run at full speed without the need of cpu emulation. Wine + does not require Microsoft Windows, however it can use native system dll + files in place of its own if they are available. + . + This is a transitional package to ease upgrades of older versions and contains + no files. diff -Nru wine1.4-1.4.1/debian/wine1.2.substvars wine1.4-1.4.1/debian/wine1.2.substvars --- wine1.4-1.4.1/debian/wine1.2.substvars 1970-01-01 00:00:00.000000000 +0000 +++ wine1.4-1.4.1/debian/wine1.2.substvars 2012-11-09 21:47:22.000000000 +0000 @@ -0,0 +1 @@ +misc:Depends=wine1.4 diff -Nru wine1.4-1.4.1/debian/wine1.3/DEBIAN/control wine1.4-1.4.1/debian/wine1.3/DEBIAN/control --- wine1.4-1.4.1/debian/wine1.3/DEBIAN/control 1970-01-01 00:00:00.000000000 +0000 +++ wine1.4-1.4.1/debian/wine1.3/DEBIAN/control 2012-11-09 21:48:38.000000000 +0000 @@ -0,0 +1,19 @@ +Package: wine1.3 +Source: wine1.4 +Version: 1.4.1-0ubuntu1 +Architecture: amd64 +Maintainer: Scott Ritchie +Installed-Size: 21 +Depends: wine1.4 +Section: otherosfs +Priority: optional +Multi-Arch: foreign +Homepage: http://www.winehq.org/ +Description: Microsoft Windows Compatibility Layer (transitional package) + Wine is a compatibility layer for running Windows applications on Linux. + Applications are run at full speed without the need of cpu emulation. Wine + does not require Microsoft Windows, however it can use native system dll + files in place of its own if they are available. + . + This is a transitional package to ease upgrades of older versions and contains + no files. diff -Nru wine1.4-1.4.1/debian/wine1.3.substvars wine1.4-1.4.1/debian/wine1.3.substvars --- wine1.4-1.4.1/debian/wine1.3.substvars 1970-01-01 00:00:00.000000000 +0000 +++ wine1.4-1.4.1/debian/wine1.3.substvars 2012-11-09 21:47:22.000000000 +0000 @@ -0,0 +1 @@ +misc:Depends=wine1.4 diff -Nru wine1.4-1.4.1/debian/wine1.4-common/DEBIAN/control wine1.4-1.4.1/debian/wine1.4-common/DEBIAN/control --- wine1.4-1.4.1/debian/wine1.4-common/DEBIAN/control 1970-01-01 00:00:00.000000000 +0000 +++ wine1.4-1.4.1/debian/wine1.4-common/DEBIAN/control 2012-11-09 21:48:38.000000000 +0000 @@ -0,0 +1,20 @@ +Package: wine1.4-common +Source: wine1.4 +Version: 1.4.1-0ubuntu1 +Architecture: all +Maintainer: Scott Ritchie +Installed-Size: 21 +Depends: wine1.4 (= 1.4.1-0ubuntu1) +Suggests: dosbox +Section: otherosfs +Priority: optional +Multi-Arch: foreign +Homepage: http://www.winehq.org/ +Description: Microsoft Windows Compatibility Layer (transitional package) + Wine is a compatibility layer for running Windows applications on Linux. + Applications are run at full speed without the need of cpu emulation. Wine + does not require Microsoft Windows, however it can use native system dll + files in place of its own if they are available. + . + This is a transitional package to ease upgrades of older versions and contains + no files. diff -Nru wine1.4-1.4.1/debian/wine1.4-common.substvars wine1.4-1.4.1/debian/wine1.4-common.substvars --- wine1.4-1.4.1/debian/wine1.4-common.substvars 1970-01-01 00:00:00.000000000 +0000 +++ wine1.4-1.4.1/debian/wine1.4-common.substvars 2012-11-09 21:47:22.000000000 +0000 @@ -0,0 +1 @@ +misc:Depends=wine1.4