r14569 - packages/trunk/pink-pony/debian

[Dominik George]

Author: natureshadow-guest
Date: 2013-09-14 14:29:03 +0000 (Sat, 14 Sep 2013)
New Revision: 14569

Modified:
   packages/trunk/pink-pony/debian/changelog
   packages/trunk/pink-pony/debian/control
   packages/trunk/pink-pony/debian/rules
Log:
Incorporated feedback from Miriam.


Modified: packages/trunk/pink-pony/debian/changelog
===================================================================
--- packages/trunk/pink-pony/debian/changelog	2013-09-14 11:41:53 UTC (rev 14568)
+++ packages/trunk/pink-pony/debian/changelog	2013-09-14 14:29:03 UTC (rev 14569)
@@ -1,19 +1,20 @@
-pink-pony (1.3.1-1) unstable; urgency=low
+pink-pony (1.3.1-2) unstable; urgency=low
 
   * Team upload.
+  * Split up into pink-pony and pink-pony-data.
+  * Fixed copy&paste error in man page, noticed by Markus Koschany
+    (Closes: #722184).
 
-  [ Miriam Ruiz ]
+ -- Dominik George <nik at naturalnet.de>  Sat, 14 Sep 2013 16:28:18 +0200
+
+pink-pony (1.3.1-1) unstable; urgency=low
+
   * New upstream release.
   * Using SDL_mixer instead of Audiere for music.
   * Thanks to Juhani Numminen for beta testing the package :)
 
-  [ Dominik George ]
-  * Split up into pink-pony and pink-pony-data.
-  * Fixed copy&paste error in man page, noticed by Markus Koschany
-    (Closes: #722184).
+ -- Miriam Ruiz <miriam at debian.org>  Thu, 12 Sep 2013 21:50:39 +0200
 
- -- Dominik George <nik at naturalnet.de>  Sat, 14 Sep 2013 13:39:53 +0200
-
 pink-pony (1.2.1+git20110821-2) unstable; urgency=low
 
   * Fixed some installation issues.

Modified: packages/trunk/pink-pony/debian/control
===================================================================
--- packages/trunk/pink-pony/debian/control	2013-09-14 11:41:53 UTC (rev 14568)
+++ packages/trunk/pink-pony/debian/control	2013-09-14 14:29:03 UTC (rev 14569)
@@ -16,6 +16,7 @@
 Package: pink-pony
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, pink-pony-data (= ${binary:Version})
+Recommends: pink-pony-data (= ${binary:Version})
 Suggests: pink-pony-dbg (= ${binary:Version})
 Description: 3D racing game with ponies
  Pink Pony is a Tron­-like multiplayer racing­ game. You control little
@@ -28,6 +29,7 @@
 Package: pink-pony-data
 Architecture: all
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts: pink-pony (<= 1.3.1-1)
 Description: 3D racing game with ponies - debug
  Pink Pony is a Tron­-like multiplayer racing­ game. You control little
  ponies that leave a trail of flowers everywhere they step. You have to

Modified: packages/trunk/pink-pony/debian/rules
===================================================================
--- packages/trunk/pink-pony/debian/rules	2013-09-14 11:41:53 UTC (rev 14568)
+++ packages/trunk/pink-pony/debian/rules	2013-09-14 14:29:03 UTC (rev 14569)
@@ -73,27 +73,40 @@
 
 # Build architecture-independent files here.
 binary-indep: install
+	dh_testdir -i
+	dh_testroot -i
+	dh_installchangelogs -i
+	dh_installdocs -i
+	dh_install -i
+	dh_link -i
+	dh_compress -i
+	dh_fixperms -i
+	[ ! -e /usr/bin/dh_buildinfo ] || dh_buildinfo -i
+	dh_installdeb -i
+	dh_gencontrol -i
+	dh_md5sums -i
+	dh_builddeb -i
 
 # Build architecture-dependent files here.
 binary-arch: install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs
-	dh_installdocs
-	dh_installexamples
-	dh_install
-	dh_installmenu
-	dh_installman
-	dh_link
-	dh_strip --dbg-package=pink-pony-dbg
-	dh_compress
-	dh_fixperms
-	[ ! -e /usr/bin/dh_buildinfo ] || dh_buildinfo
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
+	dh_testdir -a
+	dh_testroot -a
+	dh_installchangelogs -a
+	dh_installdocs -a
+	dh_installexamples -a
+	dh_install -a
+	dh_installmenu -a
+	dh_installman -a
+	dh_link -a
+	dh_strip --dbg-package=pink-pony-dbg -a
+	dh_compress -a
+	dh_fixperms -a
+	[ ! -e /usr/bin/dh_buildinfo ] || dh_buildinfo -a
+	dh_installdeb -a
+	dh_shlibdeps -a
+	dh_gencontrol -a
+	dh_md5sums -a
+	dh_builddeb -a
 
 binary: binary-indep binary-arch
 .PHONY: config build clean binary-indep binary-arch binary install