[pkg-wine-party] [SCM] Debian Wine packaging branch, master, updated. wine-1.1.24-1-618-gc8c5acb

[Ove Kaaven]

The following commit has been merged in the master branch:
commit 69254d4b147e0ea850aea00ec1b2e5528d34c61e
Author: Ove Kaaven <ovek at arcticnet.no>
Date:   Wed Jul 8 20:43:54 2009 +0200

    Added code to generate transition packages for amd64 in the event that ia32-apt-get completely replaces ia32-libs.
    Not enabled yet, though, since right now, it looks like such a replacement may not actually happen.

diff --git a/debian/prep-control-transit.sh b/debian/prep-control-transit.sh
new file mode 100644
index 0000000..be052fb
--- /dev/null
+++ b/debian/prep-control-transit.sh
@@ -0,0 +1,28 @@
+#!/bin/bash
+PREFIX="$1"
+SUFFIX="$2"
+
+sed -n "
+/^Source: / {
+ s/Source: \(.*\)/Source: \1${SUFFIX}/
+ h
+}
+/^Package: / {
+ : PKG
+ x
+ s/Package: \([^\n]*\)\n\(\([^\n]*\n\)*\)Depends: \(.*\n\([ ].*\n\)*\)/Package: \1${SUFFIX}\n\2Depends: ${PREFIX}\1${SUFFIX}\n/M
+ s/Conflicts: .*\n//M
+ s/Recommends: .*\n//M
+ s/Suggests: .*\n//M
+ s/Replaces: .*\n//M
+ /^./ p
+ x
+ $ q
+ h
+}
+/^Source: \|^Package: /! H
+$ b PKG
+" debian/control.in > debian/control
+
+# return success
+true
diff --git a/debian/rules b/debian/rules
index 8828bc6..d8ed041 100755
--- a/debian/rules
+++ b/debian/rules
@@ -59,6 +59,9 @@ endif
 #LIBDIRS = $(IA32_LIBDIR) $(AMD64_LIBDIR)
 BUILDS = build32
 LIBDIRS = $(IA32_LIBDIR)
+#BUILDS =
+#LIBDIRS =
+#TRANSPREFIX = ia32-
 
 else # !x86_64
 
@@ -69,7 +72,11 @@ endif # x86_64
 LOADERS = wine-kthread wine-pthread wine-preloader
 
 control-stamp: debian/control.in
+ifneq (,$(BUILDS))
 	bash debian/prep-control.sh "$(VERSUFFIX)"
+else
+	bash debian/prep-control-transit.sh "$(TRANSPREFIX)" "$(VERSUFFIX)"
+endif
 	touch control-stamp
 
 configure-ia32: configure-ia32-stamp
@@ -279,6 +286,7 @@ binary-indep: build-indep install-indep
 	dh_builddeb -i
 
 # Build architecture-dependent files here.
+ifneq (,$(BUILDS))
 binary-arch: install-arch-stamp
 	dh_testdir
 	dh_testroot
@@ -345,6 +353,29 @@ binary-arch: install-arch-stamp
 	dh_gencontrol -s
 	dh_md5sums -s
 	dh_builddeb -s
+else
+binary-arch: control-stamp
+	# Create dummy (transition) packages. The control-stamp rule
+	# will make them depend on the desired packages.
+	dh_testdir
+	dh_testroot
+	# create installation directories
+	dh_installdirs -s
+
+	bash debian/doclink.sh libwine$(VERSUFFIX)
+
+	dh_installdocs -plibwine$(VERSUFFIX)
+	dh_installchangelogs -plibwine$(VERSUFFIX)
+
+	dh_compress -s
+	dh_fixperms -s
+
+	dh_installdeb -s
+
+	dh_gencontrol -s
+	dh_md5sums -s
+	dh_builddeb -s
+endif
 
 binary: binary-arch binary-indep
 

-- 
Debian Wine packaging