[opencity] 81/91: Fix missing opencity.xpm file. #735455

[Markus Koschany]

This is an automated email from the git hooks/post-receive script.

apo-guest pushed a commit to branch master
in repository opencity.

commit a673e072400f9aba14b5effd7a176001c06beaf7
Author: Markus Koschany <apo at gambaru.de>
Date:   Wed Jan 15 16:49:46 2014 +0000

    Fix missing opencity.xpm file. #735455
---
 debian/changelog             | 12 +++++++++++-
 debian/control               |  4 ++++
 debian/opencity-data.install |  3 ++-
 debian/opencity.install      |  1 -
 4 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d723055..61fc028 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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 @@ opencity (0.0.6.4stable-2) unstable; urgency=medium
   * 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.
diff --git a/debian/control b/debian/control
index 97a1bbc..5e57b64 100644
--- a/debian/control
+++ b/debian/control
@@ -39,6 +39,10 @@ Package: opencity-data
 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
diff --git a/debian/opencity-data.install b/debian/opencity-data.install
index c8f39f9..b0804aa 100644
--- a/debian/opencity-data.install
+++ b/debian/opencity-data.install
@@ -1,3 +1,4 @@
+debian/opencity.xpm usr/share/pixmaps
 etc
-usr/share/games
 opencity.png usr/share/pixmaps
+usr/share/games
diff --git a/debian/opencity.install b/debian/opencity.install
index 3b4e500..4f85d90 100644
--- a/debian/opencity.install
+++ b/debian/opencity.install
@@ -1,3 +1,2 @@
 debian/opencity.desktop usr/share/applications/
-debian/opencity.xpm usr/share/pixmaps/
 usr/games

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/opencity.git