[Pkg-allegro-commits] r21 - unstable/wing/debian

[Sam Hocevar]

Author: sho
Date: 2006-05-29 13:36:05 +0000 (Mon, 29 May 2006)
New Revision: 21

Added:
   unstable/wing/debian/wing-data.preinst
Modified:
   unstable/wing/debian/changelog
   unstable/wing/debian/control
   unstable/wing/debian/rules
   unstable/wing/debian/wing.postinst
Log:
wing (0.7-27) unstable; urgency=low

  * debian/control:
    + Removed the wing/wing-data circular dependency.
    + Set policy to 3.7.2.


Modified: unstable/wing/debian/changelog
===================================================================
--- unstable/wing/debian/changelog	2006-05-28 22:02:12 UTC (rev 20)
+++ unstable/wing/debian/changelog	2006-05-29 13:36:05 UTC (rev 21)
@@ -1,3 +1,11 @@
+wing (0.7-27) unstable; urgency=low
+
+  * debian/control:
+    + Removed the wing/wing-data circular dependency.
+    + Set policy to 3.7.2.
+
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org>  Mon, 29 May 2006 15:23:03 +0200
+
 wing (0.7-26) unstable; urgency=low
 
   * debian/control:

Modified: unstable/wing/debian/control
===================================================================
--- unstable/wing/debian/control	2006-05-28 22:02:12 UTC (rev 20)
+++ unstable/wing/debian/control	2006-05-29 13:36:05 UTC (rev 21)
@@ -4,11 +4,11 @@
 Maintainer: Debian allegro packages maintainers <pkg-allegro-maintainers at lists.alioth.debian.org>
 Uploaders: Sam Hocevar (Debian packages) <sam+deb at zoy.org>
 Build-Depends: liballegro4.2-dev (>= 2:4.2.0-4), quilt, debhelper (>= 4.0)
-Standards-Version: 3.6.2
+Standards-Version: 3.7.2
 
 Package: wing
 Architecture: any
-Depends: ${shlibs:Depends}, wing-data
+Depends: ${shlibs:Depends}, wing-data (= ${Source-Version})
 Description: Galaga-like arcade game
  WING is a galaga knock-off arcade game. It features high quality
  pre-rendered graphics, dynamically generated stars in background, single
@@ -17,7 +17,6 @@
 
 Package: wing-data
 Architecture: all
-Depends: wing (= ${Source-Version})
 Conflicts: wing (<< 0.7-5)
 Description: graphics and audio data for wing
  WING is a galaga knock-off arcade game. It features high quality

Modified: unstable/wing/debian/rules
===================================================================
--- unstable/wing/debian/rules	2006-05-28 22:02:12 UTC (rev 20)
+++ unstable/wing/debian/rules	2006-05-29 13:36:05 UTC (rev 21)
@@ -30,8 +30,8 @@
 	dh_testdir -pwing
 	dh_testroot -pwing
 	dh_clean -k -pwing
-	dh_installdirs -pwing usr/games var/games
-
+	dh_installdirs -pwing usr/share/doc usr/games var/games usr/share/games/wing
+	dh_installdirs -pwing-data usr/share/games/wing
 	# install the package into debian/wing.
 	install `pwd`/wing `pwd`/debian/wing/usr/games/wing
 
@@ -42,11 +42,9 @@
 wing-data: 
 	dh_testdir -pwing-data
 	dh_testroot -pwing-data
-	dh_installdirs -pwing-data usr/share/doc usr/share/games/wing
 	cp -a images levels sound debian/wing-data/usr/share/games/wing
-	ln -s wing `pwd`/debian/wing-data/usr/share/doc/wing-data
-	#dh_installdocs -pwing-data
-	#dh_installchangelogs -pwing-data
+	dh_installdocs -pwing-data README
+	dh_installchangelogs -pwing-data
 	dh_compress -pwing-data
 	dh_fixperms -pwing-data
 	dh_installdeb -pwing-data
@@ -58,13 +56,11 @@
 binary-arch: build install
 	dh_testdir -pwing
 	dh_testroot -pwing
-	dh_installdirs -pwing usr/share/games/wing
 	cp debian/wing.xpm debian/wing/usr/share/games/wing/
-	dh_installdocs -pwing README
+	ln -s wing-data `pwd`/debian/wing/usr/share/doc/wing
 	dh_installmenu -pwing
 	dh_installman -pwing debian/wing.6
 	dh_installinfo -pwing
-	dh_installchangelogs -pwing
 #	dh_link -pwing
 	dh_strip -pwing
 	dh_compress -pwing

Added: unstable/wing/debian/wing-data.preinst
===================================================================
--- unstable/wing/debian/wing-data.preinst	2006-05-28 22:02:12 UTC (rev 20)
+++ unstable/wing/debian/wing-data.preinst	2006-05-29 13:36:05 UTC (rev 21)
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+set -e
+
+DOCDIR="/usr/share/doc/wing-data"
+
+if [ -L "$DOCDIR" ]; then
+  rm -f "$DOCDIR"
+fi
+
+#DEBHELPER#
+

Modified: unstable/wing/debian/wing.postinst
===================================================================
--- unstable/wing/debian/wing.postinst	2006-05-28 22:02:12 UTC (rev 20)
+++ unstable/wing/debian/wing.postinst	2006-05-29 13:36:05 UTC (rev 21)
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+DOCDIR="/usr/share/doc/wing"
+
 case "$1" in
   configure)
     if ! dpkg-statoverride --list /usr/games/wing >/dev/null; then
@@ -33,6 +35,13 @@
     # Fix perms, just in case
     chown root:games /var/games/wing.scores
     chmod 0664 /var/games/wing.scores
+    # Fix the wing/wing-data circular dependency
+    if [ -d "$DOCDIR" -a ! -L "$DOCDIR" ]; then
+      rmdir --ignore-fail-on-non-empty "$DOCDIR"
+      if [ ! -d "$DOCDIR" ]; then
+        ln -s wing-data "$DOCDIR"
+      fi
+    fi
     ;;
   abort-upgrade|abort-remove|abort-deconfigure)
     ;;