r14822 - packages/trunk/opencity/debian

[Markus Koschany]

Author: apo-guest
Date: 2014-01-15 16:49:46 +0000 (Wed, 15 Jan 2014)
New Revision: 14822

Modified:
   packages/trunk/opencity/debian/changelog
   packages/trunk/opencity/debian/control
   packages/trunk/opencity/debian/opencity-data.install
   packages/trunk/opencity/debian/opencity.install
Log:
Fix missing opencity.xpm file. #735455


Modified: packages/trunk/opencity/debian/changelog
===================================================================
--- packages/trunk/opencity/debian/changelog	2014-01-14 23:48:31 UTC (rev 14821)
+++ packages/trunk/opencity/debian/changelog	2014-01-15 16:49:46 UTC (rev 14822)
@@ -1,3 +1,13 @@
+opencity (0.0.6.4stable-3) unstable; urgency=medium
+
+  * Install opencity.xpm in arch-independent opencity-data package.
+   - debian/control: Add Breaks and Replaces to opencity-data to ensure a clean
+     upgrade path since opencity.xpm has been moved from the arch-dependent to
+     the arch-independent package. Fixes FTBFS on buildd because of missing
+     opencity.xpm file. Thanks to Samuel Thibault for the report. (Closes: #735455)
+
+ -- Markus Koschany <apo at gambaru.de>  Wed, 15 Jan 2014 17:08:41 +0100
+
 opencity (0.0.6.4stable-2) unstable; urgency=medium
 
   [ Evgeni Golov ]
@@ -12,7 +22,7 @@
   * Bump compat level to 9 and require debhelper >= 9.
   * debian/control:
     - Declare compliance with Debian Policy 3.9.5.
-    - Drop docbook-to-man dependency and manpage.sgml.
+    - Drop docbook-to-man dependency and manpages.sgml.
       Use upstream's man page instead.
     - Move imagemagick to Build-Depends-Indep.
     - opencity-data: Remove obsolete Conflicts field.

Modified: packages/trunk/opencity/debian/control
===================================================================
--- packages/trunk/opencity/debian/control	2014-01-14 23:48:31 UTC (rev 14821)
+++ packages/trunk/opencity/debian/control	2014-01-15 16:49:46 UTC (rev 14822)
@@ -39,6 +39,10 @@
 Architecture: all
 Depends:
  ${misc:Depends}
+Replaces:
+ opencity (<< 0.0.6.4stable-3)
+Breaks:
+ opencity (<< 0.0.6.4stable-3)
 Suggests:
  opencity
 Description: data for opencity, a 3D city simulator game

Modified: packages/trunk/opencity/debian/opencity-data.install
===================================================================
--- packages/trunk/opencity/debian/opencity-data.install	2014-01-14 23:48:31 UTC (rev 14821)
+++ packages/trunk/opencity/debian/opencity-data.install	2014-01-15 16:49:46 UTC (rev 14822)
@@ -1,3 +1,4 @@
+debian/opencity.xpm usr/share/pixmaps
 etc
+opencity.png usr/share/pixmaps
 usr/share/games
-opencity.png usr/share/pixmaps

Modified: packages/trunk/opencity/debian/opencity.install
===================================================================
--- packages/trunk/opencity/debian/opencity.install	2014-01-14 23:48:31 UTC (rev 14821)
+++ packages/trunk/opencity/debian/opencity.install	2014-01-15 16:49:46 UTC (rev 14822)
@@ -1,3 +1,2 @@
 debian/opencity.desktop usr/share/applications/
-debian/opencity.xpm usr/share/pixmaps/
 usr/games