[pkg-wine-party] [SCM] Debian Wine packaging branch, master, updated. wine-1.1.16-1-470-gd205cc1

Sat May 16 09:54:16 UTC 2009

The following commit has been merged in the master branch:
commit 22842cdefa4bad5bb3ab11f4d5bd2514180d5ec1
Author: Ove Kaaven <ovek at arcticnet.no>
Date:   Fri May 15 22:49:11 2009 +0200

    Permanently removed the amd64 binaries-in-diff hack.

diff --git a/debian/diff-amd64.sh b/debian/diff-amd64.sh
deleted file mode 100644
index aae6665..0000000
--- a/debian/diff-amd64.sh
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/bin/bash
-DEBIAN_VERSION=$(dpkg-parsechangelog|sed -n 's,^Version: \(.*\)$,\1,p')
-NATIVE_VERSION=$(echo $DEBIAN_VERSION|sed -n 's,^\(.*\)-[^-]*$,\1,p')
-REAL_DIR=`pwd`
-DIR=wine-$NATIVE_VERSION
-DIFFNAME=wine_$DEBIAN_VERSION.diff
-DSCNAME=wine_$DEBIAN_VERSION.dsc
-(
-cd ..
-echo Updating $DIFFNAME.gz...
-gunzip $DIFFNAME
-filterdiff -x "*/debian/amd64.tar.lzma.uu" $DIFFNAME > wine-temp.diff
-diff -u --label $DIR.orig/debian/amd64.tar.lzma.uu /dev/null --label $DIR/debian/amd64.tar.lzma.uu $REAL_DIR/debian/amd64.tar.lzma.uu >> wine-temp.diff
-mv wine-temp.diff $DIFFNAME
-gzip -9 $DIFFNAME
-echo Updating $DSCNAME...
-MD5=$(md5sum $DIFFNAME.gz|sed -n 's,^\([^ ]*\).*$,\1,p')
-SHA1=$(sha1sum $DIFFNAME.gz|sed -n 's,^\([^ ]*\).*$,\1,p')
-SHA256=$(sha256sum $DIFFNAME.gz|sed -n 's,^\([^ ]*\).*$,\1,p')
-SIZE=$(ls -l $DIFFNAME.gz|sed -n 's,^[^ ]* [^ ]* [^ ]* [^ ]* \([^ ]*\).*$,\1,p')
-CURRENT=""
-while read -r
-do
-  if [ "$REPLY" = "Files: " ]
-  then
-    CURRENT="$MD5"
-    echo "$REPLY"
-  elif [ "$REPLY" = "Checksums-Sha1: " ]
-  then
-    CURRENT="$SHA1"
-    echo "$REPLY"
-  elif [ "$REPLY" = "Checksums-Sha256: " ]
-  then
-    CURRENT="$SHA256"
-    echo "$REPLY"
-  elif [ -z "$CURRENT" ]
-  then
-    echo "$REPLY"
-  else
-    FN=`echo "$REPLY"|cut -d ' ' -f 4`
-    if [ "$FN" = "$DIFFNAME.gz" ]
-    then
-      echo " $CURRENT $SIZE $DIFFNAME.gz"
-    else
-      echo "$REPLY"
-    fi
-  fi
-done < $DSCNAME > wine-temp.dsc
-mv wine-temp.dsc $DSCNAME
-)
diff --git a/debian/maint/build b/debian/maint/build
index f29d556..2586014 100755
--- a/debian/maint/build
+++ b/debian/maint/build
@@ -1,7 +1,5 @@
 #!/bin/sh
 set -e
-rm -f debian/amd64.tar.lzma.uu
-export DEB_FIXDIFF=yes
 git-buildpackage --git-pristine-tar \
  --git-upstream-tag="wine-%(version)s" \
  --git-debian-tag="wine-%(version)s" \
diff --git a/debian/maint/build-final b/debian/maint/build-final
index 2fb924b..220310e 100755
--- a/debian/maint/build-final
+++ b/debian/maint/build-final
@@ -1,6 +1,5 @@
 #!/bin/sh
 set -e
-rm -f debian/amd64.tar.lzma.uu
 version=`dpkg-parsechangelog|sed -n 's/Version: \(.*\)/\1/p'`
 # see if the version in the changelog is tagged (already built)
 obj_type="`git-cat-file -t "wine-$version" 2>/dev/null`" || true
@@ -22,7 +21,6 @@ version=`dpkg-parsechangelog|sed -n 's/Version: \(.*\)/\1/p'`
 git add debian/changelog
 git commit -m "Release $version"
 # build package
-export DEB_FIXDIFF=yes
 git-buildpackage --git-pristine-tar \
  --git-upstream-tag="wine-%(version)s" \
  --git-debian-tag="wine-%(version)s" \
diff --git a/debian/rules b/debian/rules
index 4480406..5509e36 100755
--- a/debian/rules
+++ b/debian/rules
@@ -27,33 +27,8 @@ VERSION := $(lastword $(shell dpkg-parsechangelog|grep "^Version: "))
 
 #DEBIAN_SID := $(findstring sid,$(DEBIAN_VERSION))
 
-ifeq (,$(findstring etch,$(DEBIAN_VERSION)))
-# delete amd64.tar.lzma.uu if we're not on etch.
-AMD64_PACK = false
-endif
-
-# On i386, pack binaries into amd64.tar.lzma.uu and embed it into
-# source package, because debian's amd64 port has pretty crappy
-# support for building 32-bit binaries natively.
-
-#ifeq ($(DEB_HOST_GNU_CPU)-$(DEB_HOST_GNU_SYSTEM),i486-linux-gnu)
-#AMD64_PACK ?= true
-#endif
-
-# On amd64, build 32-bit package by simply unpacking amd64.tar.lzma.uu
-# if it exists, otherwise build from source using 32-bit compiler.
-
 ifeq ($(DEB_HOST_GNU_CPU),x86_64)
-ifeq ($(DEB_HOST_GNU_SYSTEM),linux-gnu)
-ifneq (,$(wildcard debian/amd64.tar.lzma.uu))
-AMD64_COPY = true
-endif
-endif
-ifeq (,$(AMD64_COPY))
 BUILDS = build32
-else
-BUILDS =
-endif
 # Not ready yet: build Win64 version
 #BUILDS += build64
 #NATIVE_BUILD = build64
@@ -180,9 +155,6 @@ clean: clean-arch32 clean-arch64
 	dh_testroot
 	rm -f debian/libwine.install debian/wine-bin.install
 	rm -f install-arch-stamp build-indep-stamp configure-ia32-stamp
-ifeq (false,$(AMD64_PACK))
-	rm -f debian/amd64.tar.lzma.uu
-endif
 	rm -rf lib32
 	dh_clean
 
@@ -280,7 +252,6 @@ binary-arch: install-arch-stamp
 	# create installation directories
 	dh_installdirs -s
 
-ifeq (,$(AMD64_COPY))
 	# certain binaries are only compiled on some platforms;
 	# if they were compiled on the current one, install them
 	for pkg in libwine wine-bin; do \
@@ -321,7 +292,6 @@ endif
 	mv debian/libwine/usr/lib/wine/wldap32*  debian/libwine-ldap/usr/lib/wine
 	mv debian/libwine/usr/lib/wine/winenas*  debian/libwine-nas/usr/lib/wine
 	mv debian/libwine/usr/lib/wine/wineps*   debian/libwine-print/usr/lib/wine
-endif
 
 	dh_installdocs -s
 	dh_installman -s
@@ -350,20 +320,6 @@ endif
 	dh_compress -s
 	dh_fixperms -s
 
-ifneq (,$(AMD64_COPY))
-	# Using compressed 32-bit build.  Make sure it's the latest one!!
-	uudecode < debian/amd64.tar.lzma.uu | lzma -d | tar -xpf -
-endif
-ifeq (true,$(AMD64_PACK))
-	# Generating compressed 32-bit build.  Make sure to keep your *_i386.deb in sync with this file in your *.diff.gz!!
-	tar -cpf - `grep-dctrl -v "Architecture: all" debian/control | grep "^Package: " | sed -e "s,^Package: ,debian/,g"` \
-		| lzma -c9 | uuencode - > debian/amd64.tar.lzma.uu
-ifneq (,$(DEB_FIXDIFF))
-	# okay, try to change the .diff.gz
-	bash debian/diff-amd64.sh
-endif
-endif
-
 	# tight libwine dependencies for packages built here
 	dh_makeshlibs -plibwine -n -V "libwine (= $(VERSION))"
 

-- 
Debian Wine packaging

