[heroes] 11/18: Add transitional heroes-common and heroes-sdl packages.

[Stephen Kitt]

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

skitt pushed a commit to annotated tag debian/0.21-11
in repository heroes.

commit 10c6f0963b0e810e7b73365218e8615ccc184a62
Author: Stephen Kitt <steve at sk2.org>
Date:   Sat Jan 23 15:48:19 2016 +0100

    Add transitional heroes-common and heroes-sdl packages.
---
 debian/changelog                     |  3 ++-
 debian/control                       | 19 ++++++++++++++++++-
 debian/heroes-sdl.links              |  2 ++
 debian/{dirs => heroes.dir}          |  0
 debian/{docs => heroes.docs}         |  0
 debian/{install => heroes.install}   |  2 ++
 debian/{postinst => heroes.postinst} |  0
 debian/{postrm => heroes.postrm}     |  0
 debian/rules                         |  4 ++--
 9 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 68fbbf0..d0f9a65 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,7 +7,8 @@ heroes (0.21-11) UNRELEASED; urgency=medium
   * Enable the upstream tests, except those which require displaying the
     game.
   * Build a single heroes package since we only care about the SDL
-    version.
+    version (with heroes-common and heroes-sdl transitional packages for
+    now).
   * Add homepage.
   * Add "set -e" to the maintainer scripts.
   * Drop the Encoding key from heroes.desktop.
diff --git a/debian/control b/debian/control
index ba2f9b3..38eeefc 100644
--- a/debian/control
+++ b/debian/control
@@ -11,8 +11,9 @@ Package: heroes
 Architecture: any
 Depends: heroes-data (>= 1.4), ${shlibs:Depends}, ${misc:Depends}
 Replaces: heroes-common, heroes-sdl
-Conflicts: heroes-common, heroes-sdl
+Breaks: heroes-common (<< 0.21-11~), heroes-sdl (<< 0.21-11~)
 Provides: heroes-common, heroes-sdl
+Recommends: heroes-sound-effects, heroes-sound-tracks
 Description: Collect powerups and avoid your opponents' trails
  Heroes is similar to the "Tron" and "Nibbles" games of yore, but includes
  many graphical improvements and new game features.  In it, you must maneuver
@@ -25,3 +26,19 @@ Description: Collect powerups and avoid your opponents' trails
  .
  You should install the heroes-sound-effects package if you want sound effects,
  and the heroes-sound-tracks package if you want background music in the game.
+
+Package: heroes-sdl
+Architecture: all
+Section: oldlibs
+Priority: extra
+Depends: heroes (>= 0.21-11~), ${misc:Depends}
+Description: transitional package for heroes
+ This is a dummy transitional package. It can safely be removed.
+
+Package: heroes-common
+Architecture: all
+Section: oldlibs
+Priority: extra
+Depends: heroes (>= 0.21-11~), ${misc:Depends}
+Description: transitional package for heroes
+ This is a dummy transitional package. It can safely be removed.
diff --git a/debian/heroes-sdl.links b/debian/heroes-sdl.links
new file mode 100644
index 0000000..2de8531
--- /dev/null
+++ b/debian/heroes-sdl.links
@@ -0,0 +1,2 @@
+/usr/games/heroes /usr/games/heroes-sdl
+/usr/share/man/man6/heroes.6.gz /usr/share/man/man6/heroes-sdl.6.gz
diff --git a/debian/dirs b/debian/heroes.dir
similarity index 100%
rename from debian/dirs
rename to debian/heroes.dir
diff --git a/debian/docs b/debian/heroes.docs
similarity index 100%
rename from debian/docs
rename to debian/heroes.docs
diff --git a/debian/install b/debian/heroes.install
similarity index 84%
rename from debian/install
rename to debian/heroes.install
index dcd0ca1..722e8c8 100644
--- a/debian/install
+++ b/debian/heroes.install
@@ -1,3 +1,5 @@
 debian/heroes.desktop usr/share/applications
 debian/heroes.xpm usr/share/pixmaps
 src/etc/heroesrc      etc
+usr/games
+usr/share
diff --git a/debian/postinst b/debian/heroes.postinst
similarity index 100%
rename from debian/postinst
rename to debian/heroes.postinst
diff --git a/debian/postrm b/debian/heroes.postrm
similarity index 100%
rename from debian/postrm
rename to debian/heroes.postrm
diff --git a/debian/rules b/debian/rules
index cbd9775..5a2b77d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,8 +20,8 @@ override_dh_autoreconf_clean:
 override_dh_fixperms:
 	dh_fixperms -Xheroes
 
-override_dh_auto_install:
-	dh_auto_install
+override_dh_install:
+	dh_install
 	chown root:games debian/heroes/usr/games/heroes
 	chmod g+s debian/heroes/usr/games/heroes
 	rm -f debian/heroes/usr/share/games/heroes/etc/heroesrc

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