[pkg-wine-party] [SCM] Debian Wine packaging branch, master, updated. wine-1.1.26-1-458-g614609b

[Ove Kaaven]

The following commit has been merged in the master branch:
commit a92512b234a74ee7b869e99b231d57ed19603043
Author: Ove Kaaven <ovek at arcticnet.no>
Date:   Sun Aug 9 10:04:03 2009 +0200

    Made it possible to add suffixes to the dependencies of autogenerated transition packages.
    (I'll use this to make experimental users migrate to the wine-unstable packages.)

diff --git a/debian/prep-control-transit.sh b/debian/prep-control-transit.sh
index 9e6dde9..1e1eb3d 100644
--- a/debian/prep-control-transit.sh
+++ b/debian/prep-control-transit.sh
@@ -1,6 +1,7 @@
 #!/bin/bash
-PREFIX="$1"
-SUFFIX="$2"
+SUFFIX="$1"
+TRANSPREFIX="$2"
+TRANSSUFFIX="$3"
 
 sed -n "
 /^Source: / {
@@ -10,7 +11,7 @@ sed -n "
 /^Package: / {
  : PKG
  x
- s/Package: \([^\n]*\)\n\(\([^\n]*\n\)*\)Depends: \(.*\n\([ ].*\n\)*\)/Package: \1${SUFFIX}\n\2Depends: ${PREFIX}\1${SUFFIX}\n/M
+ s/Package: \([^\n]*\)\n\(\([^\n]*\n\)*\)Depends: \(.*\n\([ ].*\n\)*\)/Package: \1${SUFFIX}\n\2Depends: ${TRANSPREFIX}\1${TRANSSUFFIX}\n/M
  s/Pre-Depends: .*\n//M
  s/Conflicts: .*\n//M
  s/Recommends: .*\n//M
diff --git a/debian/rules b/debian/rules
index 6e0ccc8..caa71e3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -74,6 +74,7 @@ LIBDIRS = $(IA32_LIBDIR)
 #BUILDS =
 #LIBDIRS =
 #TRANSPREFIX = ia32-
+#TRANSSUFFIX = $(VERSUFFIX)
 
 else # !x86_64
 
@@ -90,7 +91,7 @@ control-stamp: debian/control.in
 ifneq (,$(BUILDS))
 	bash debian/prep-control.sh "$(VERSUFFIX)"
 else
-	bash debian/prep-control-transit.sh "$(TRANSPREFIX)" "$(VERSUFFIX)"
+	bash debian/prep-control-transit.sh "$(VERSUFFIX)" "$(TRANSPREFIX)" "$(TRANSSUFFIX)"
 endif
 	touch control-stamp
 

-- 
Debian Wine packaging