[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 24f431d67e3a77d86b552a2c0b64307e79967a31
Author: Ove Kaaven <ovek at arcticnet.no>
Date:   Sat Aug 8 22:33:20 2009 +0200

    Added a script to generate Recommends lines.
    Initially use it to make libwine recommend the libgsm package Wine was compiled against.
    (The package splitting has gone far enough, I don't think I want to make a separate libwine-codecs package to depend on libgsm.
    I'm just going to use Recommends instead for stuff like that. Perhaps even eliminate some more libwine-* packages in the future...)

diff --git a/debian/cleandeps.sh b/debian/cleandeps.sh
index e66e35e..367afab 100644
--- a/debian/cleandeps.sh
+++ b/debian/cleandeps.sh
@@ -1,12 +1,14 @@
 #!/bin/bash
 SUFFIX="$1"
-shift
-echo Cleaning extra dependencies...
-for dep in debian/*.deps; do
-  package="$(basename "$dep" .deps)"
-  path="debian/$package$SUFFIX"
-#  echo $path
-  rm -f "$path/extradep32" "$path/extradep64"
+
+for ext in deps recs; do
+  for dep in debian/*.${ext}; do
+    package="$(basename "$dep" .${ext})"
+    path="debian/$package$SUFFIX"
+  #  echo $path
+    rm -f "$path/extra${ext}32" "$path/extra${ext}64"
+  done
 done
+
 # return success
 true
diff --git a/debian/control.in b/debian/control.in
index 6472fb9..774610c 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -90,6 +90,7 @@ Architecture: i386 hurd-i386 kfreebsd-i386 netbsd-i386 amd64 kfreebsd-amd64 powe
 Depends: ${shlibs:Depends}
 Pre-Depends: ${misc:Pre-Depends}
 Replaces: wine (<< 0.9.11-1), libwine-twain (<< 0.9.13), libwine-gl (<< 0.9.53-1)
+Recommends: ${shlibs:Recommends}
 Suggests: wine-doc
 Description: Windows API implementation - library
  Wine is a free MS-Windows API implementation.
diff --git a/debian/gendeps.sh b/debian/gendeps.sh
index 25d730b..39f88d3 100644
--- a/debian/gendeps.sh
+++ b/debian/gendeps.sh
@@ -2,15 +2,18 @@
 SUFFIX="$1"
 shift
 ARCHS="$@"
-echo Forcing extra dependencies...
-for dep in debian/*.deps; do
-  package="$(basename "$dep" .deps)"
-  path="debian/$package$SUFFIX"
-  deplist=$(sed 's,^,-l,' $dep)
-#  echo $path: $deplist
-  for arch in $ARCHS; do
-    gcc -m$arch -Wl,--noinhibit-exec -o "$path/extradep$arch" debian/extradep.c $deplist
+
+for ext in deps recs; do
+  for dep in debian/*.${ext}; do
+    package="$(basename "$dep" .${ext})"
+    path="debian/$package$SUFFIX"
+    deplist=$(sed 's,^,-l,' $dep)
+  #  echo $path: $deplist
+    for arch in $ARCHS; do
+      gcc -m$arch -Wl,--noinhibit-exec -o "$path/extra${ext}$arch" debian/extradep.c $deplist
+    done
   done
 done
+
 # return success
 true
diff --git a/debian/libwine.recs b/debian/libwine.recs
new file mode 100644
index 0000000..5a32c7e
--- /dev/null
+++ b/debian/libwine.recs
@@ -0,0 +1 @@
+gsm
diff --git a/debian/recs.sh b/debian/recs.sh
new file mode 100644
index 0000000..94d19ce
--- /dev/null
+++ b/debian/recs.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+SUFFIX="$1"
+
+for dep in debian/*.recs; do
+  package="$(basename "$dep" .recs)"
+  path="debian/$package$SUFFIX"
+  dpkg-shlibdeps -O $path/extradeps* -dRecommends $path/extrarecs* 2>/dev/null |
+   grep "shlibs:Recommends" >> debian/$package$SUFFIX.substvars
+done
+
+# return success
+true
diff --git a/debian/rules b/debian/rules
index caa71e3..011667f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -87,6 +87,14 @@ LOADERS = wine-kthread wine-pthread wine-preloader
 empty:=
 space:=$(empty) $(empty)
 
+SHLIBS_OPTS = -Llibwine$(VERSUFFIX) -l$(subst $(space),:,$(patsubst %,$(CURDIR)/debian/libwine$(VERSUFFIX)/%,$(LIBDIRS)))
+
+ifneq (,$(findstring build32,$(BUILDS)))
+ifeq (usr/lib32,$(IA32_LIBDIR))
+PRE_DEPS = Pre-Depends=libc6-i386 (>= 2.9-18)
+endif
+endif
+
 control-stamp: debian/control.in
 ifneq (,$(BUILDS))
 	bash debian/prep-control.sh "$(VERSUFFIX)"
@@ -357,19 +365,17 @@ binary-arch: install-arch-stamp
 	# tight libwine dependencies for packages built here
 	dh_makeshlibs -plibwine$(VERSUFFIX) -n -V "libwine$(VERSUFFIX) (= $(VERSION))"
 
+	echo "misc:Pre-Depends=$(PRE_DEPS)" >> debian/libwine$(VERSUFFIX).substvars
+
+	# forcing extra dependencies
 	bash debian/gendeps.sh "$(VERSUFFIX)" $(patsubst build%,%,$(BUILDS))
-	dh_shlibdeps -s -Llibwine$(VERSUFFIX) -l$(subst $(space),:,$(patsubst %,$(CURDIR)/debian/libwine$(VERSUFFIX)/%,$(LIBDIRS)))
+	dh_shlibdeps -s $(SHLIBS_OPTS) -Xextrarecs
+	bash debian/recs.sh "$(VERSUFFIX)"
 	bash debian/cleandeps.sh "$(VERSUFFIX)"
 
 	# relaxed libwine dependencies for everyone else
 	dh_makeshlibs -s
 
-ifneq (,$(findstring build32,$(BUILDS)))
-ifeq (usr/lib32,$(IA32_LIBDIR))
-	echo "misc:Pre-Depends=libc6-i386 (>= 2.9-18)" >> debian/libwine$(VERSUFFIX).substvars
-endif
-endif
-
 	dh_installdeb -s
 
 	dh_gencontrol -s

-- 
Debian Wine packaging