[pkg-wine-party] [SCM] Debian Wine packaging branch, master, updated. wine-1.1.18-1-329-ge643d1d

Ove Kaaven ovek at arcticnet.no
Thu May 21 21:19:19 UTC 2009


The following commit has been merged in the master branch:
commit c09126eac0f6eabcb138af4a3ff2cb7c68eb615e
Author: Ove Kaaven <ovek at arcticnet.no>
Date:   Thu May 21 17:23:29 2009 +0200

    Made the /usr/share/doc/<package> directory in all binary packages (except libwine) be a symlink to /usr/share/doc/libwine.
    (All binary packages already do have a strict dependency on the same libwine binary version as themselves, so this should be in line with policy.)
    Since Debian Wine is made up of many binary packages, this should reduce the .deb package sizes and disk usage somewhat.

diff --git a/debian/doclink.sh b/debian/doclink.sh
new file mode 100644
index 0000000..1759444
--- /dev/null
+++ b/debian/doclink.sh
@@ -0,0 +1,19 @@
+#!/bin/bash
+SRC="$1"
+sed -n 's,^Package: ,,p' debian/control |
+while read PKG; do
+  if [ "$SRC" != "$PKG" -a -d debian/$PKG ]; then
+    # create symlink
+    install -d debian/$PKG/usr/share/doc
+    pushd debian/$PKG/usr/share/doc > /dev/null
+    [ ! -d $PKG ] || rmdir $PKG
+    [ -d $PKG ] || mkdir $SRC
+    ln -s $SRC $PKG
+    popd > /dev/null
+    # since dpkg won't itself change a directory into a symlink on upgrade,
+    # emit maintainer script fragment to ensure proper upgrade
+    echo "if [ \"\$1\" = \"upgrade\" -a -d /usr/share/doc/$PKG ]; then rm -rf /usr/share/doc/$PKG; fi" >> debian/$PKG.preinst.debhelper
+  fi
+done
+# return success
+true
diff --git a/debian/libwine.docs b/debian/libwine.docs
index e174728..933e068 100644
--- a/debian/libwine.docs
+++ b/debian/libwine.docs
@@ -1 +1,4 @@
+ANNOUNCE
+AUTHORS
+README
 debian/README.Debian
diff --git a/debian/rules b/debian/rules
index 6292f9a..1d6a0ca 100755
--- a/debian/rules
+++ b/debian/rules
@@ -271,6 +271,9 @@ binary-arch: install-arch-stamp
 	# create installation directories
 	dh_installdirs -s
 
+	# create usr/share/doc symlinks
+	bash debian/doclink.sh libwine
+
 	# prepare <packagename>.install files
 	bash debian/prep-install.sh
 
@@ -285,13 +288,14 @@ binary-arch: install-arch-stamp
 	# split up libwine
 	bash debian/split.sh libwine usr/lib/wine
 
-	dh_installdocs -s
+	dh_installdocs -plibwine
+	dh_installchangelogs -plibwine
+
 	dh_installman -s
 #	dh_installmenu -s
 	dh_installdebconf -s
 	dh_installmime -s
 
-	dh_installchangelogs -s
 	dh_link -s
 
 	# Wine uses many "interesting" linker options,
diff --git a/debian/wine-bin.docs b/debian/wine-bin.docs
deleted file mode 100644
index 933e068..0000000
--- a/debian/wine-bin.docs
+++ /dev/null
@@ -1,4 +0,0 @@
-ANNOUNCE
-AUTHORS
-README
-debian/README.Debian

-- 
Debian Wine packaging



More information about the pkg-wine-party mailing list