[heroes] 04/18: Build a single heroes package.

Stephen Kitt skitt at moszumanska.debian.org
Sat Jan 23 19:34:40 UTC 2016 

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 2584d2fe92b9d5e7c0ee8e598314c2c6ab29e9f7
Author: Stephen Kitt <steve at sk2.org>
Date:   Thu Jan 21 16:56:17 2016 +0100

    Build a single heroes package.
---
 debian/README.Debian                        | 36 -----------------------------
 debian/changelog                            |  2 ++
 debian/control                              | 34 +++++----------------------
 debian/{heroes-common.dirs => dirs}         |  4 ++--
 debian/{heroes-common.docs => docs}         |  0
 debian/heroes-sdl.dirs                      |  3 ---
 debian/heroes-sdl.menu                      |  7 ------
 debian/heroes-sdl.postinst                  | 17 --------------
 debian/heroes-sdl.prerm                     |  9 --------
 debian/{heroes-common.install => install}   |  4 ----
 debian/menu                                 |  7 ++++++
 debian/{heroes-common.postinst => postinst} |  0
 debian/{heroes-common.postrm => postrm}     |  0
 debian/rules                                | 19 +++++++--------
 14 files changed, 25 insertions(+), 117 deletions(-)

diff --git a/debian/README.Debian b/debian/README.Debian
deleted file mode 100644
index 027d2aa..0000000
--- a/debian/README.Debian
+++ /dev/null
@@ -1,36 +0,0 @@
-  PERMISSIONS:
-
-heroes-sdl is installed sgid games by default.  To remove this,
-execute the following command as root:
-
-dpkg-statoverride --add root root 755 /usr/games/heroes-sdl
-
-  BUILDING HEROES:
-
-  On some platforms, Heroes build-conflicts with the libraries for one
-of its targets.  This is because when I last updated these lines, those
-libraries were not available on those platforms.
-
-  In the past, when libraries became available on a new platform, the
-autobuilders (and people building NMUs) have occasionally built against
-the new library *without telling me*.  (so heroes-sdl, for instance, would
-suddenly be available on a new platform)
-  This led to problems getting new versions of Heroes into testing,
-since I wasn't aware that I should enable autobuilds of that binary
-package on that platform.
-
-  In short, what this means is:
-
-   - if you run into problems with this while building Heroes for your own
-   use, you may ignore them. (-d) In fact, you can leave out some build-deps
-   and it'll still work; the missing library won't be used.
-
-   - if you can't build Heroes due to a Build-Conflicts, this means that
-   you should file a wishlist bug telling me that the particular library
-   is now available on your platform.
-
-   - if you trigger and Build-Conflicts *and* you are building official
-   packages (eg, a binary NMU), stop, do not pass go, do not upload the
-   generated packages unless you first resolve the conflict!
-
-  -- Daniel Burrows <dburrows at debian.org>
diff --git a/debian/changelog b/debian/changelog
index 5fc6a5e..ff3f007 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ heroes (0.21-11) UNRELEASED; urgency=medium
     patch.
   * Enable the upstream tests, except those which require displaying the
     game.
+  * Build a single heroes package since we only care about the SDL
+    version.
 
  -- Stephen Kitt <skitt at debian.org>  Wed, 20 Jan 2016 14:16:25 +0100
 
diff --git a/debian/control b/debian/control
index 0169f5f..1c6f2ba 100644
--- a/debian/control
+++ b/debian/control
@@ -3,16 +3,15 @@ Section: games
 Priority: optional
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
 Uploaders: Stephen Kitt <skitt at debian.org>
-Build-Depends: libsdl1.2-dev (>= 1.2.2-3.1), libsdl-mixer1.2-dev, debhelper (>= 9), dh-autoreconf, gettext, autogen, help2man, heroes-data (>= 1.4-1), texinfo, autotools-dev
+Build-Depends: libsdl1.2-dev (>= 1.2.2-3.1), libsdl-mixer1.2-dev, debhelper (>= 9), dh-autoreconf, gettext, autogen, help2man, heroes-data (>= 1.4), texinfo, autotools-dev
 Standards-Version: 3.8.0
 
-Package: heroes-common
+Package: heroes
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Recommends: heroes-sdl (= ${binary:Version})
-Replaces: heroes-ggi (<< 0.8-3), heroes-sdl (<< 0.8-3), heroes-utils
-Conflicts: heroes-ggi (<< 0.8-3), heroes-sdl (<< 0.8-3), heroes-utils
-Provides: heroes
+Depends: heroes-data (>= 1.4), ${shlibs:Depends}, ${misc:Depends}
+Replaces: heroes-common, heroes-sdl
+Conflicts: heroes-common, heroes-sdl
+Provides: heroes-common, heroes-sdl
 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,24 +24,3 @@ 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.
- .
- This package contains a small number of common files for heroes.
-
-Package: heroes-sdl
-Architecture: any
-Depends: heroes-data (>= 1.4-1), heroes-common (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
-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
- a small vehicle around a world and collect powerups while avoiding obstacles,
- your opponents' trails, and even your own trail.
- .
- Several styles of play are available, including "get-all-the-bonuses",
- deathmatch, and "squish-the-pedestrians".  All game styles can be played
- in both single-player and two-player (split-screen) modes.
- .
- 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.
- .
- This version is linked against the SDL libraries.
diff --git a/debian/heroes-common.dirs b/debian/dirs
similarity index 100%
rename from debian/heroes-common.dirs
rename to debian/dirs
index 5be6ef8..4e5e0a7 100644
--- a/debian/heroes-common.dirs
+++ b/debian/dirs
@@ -1,4 +1,4 @@
+etc
 usr/games
-usr/share/man/man6
 usr/share/doc
-etc
+usr/share/man/man6
diff --git a/debian/heroes-common.docs b/debian/docs
similarity index 100%
rename from debian/heroes-common.docs
rename to debian/docs
diff --git a/debian/heroes-sdl.dirs b/debian/heroes-sdl.dirs
deleted file mode 100644
index 59d9fd8..0000000
--- a/debian/heroes-sdl.dirs
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/games
-usr/share/doc
-usr/share/man/man6
diff --git a/debian/heroes-sdl.menu b/debian/heroes-sdl.menu
deleted file mode 100644
index 7cef884..0000000
--- a/debian/heroes-sdl.menu
+++ /dev/null
@@ -1,7 +0,0 @@
-?package(heroes-sdl):needs="x11" section="Games/Action" \
-title="Heroes (SDL version)" command="/usr/games/heroes-sdl" \
-icon="/usr/share/pixmaps/heroes.xpm"
-
-?package(heroes-sdl):needs="vc" section="Games/Action" \
-title="Heroes (SDL version)" command="/usr/games/heroes-sdl" \
-icon="/usr/share/pixmaps/heroes.xpm"
diff --git a/debian/heroes-sdl.postinst b/debian/heroes-sdl.postinst
deleted file mode 100644
index 2d05247..0000000
--- a/debian/heroes-sdl.postinst
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-#
-#  The heroes postinst has to do some update-alternatives magic.
-#  SDL is set higher-priority than GGI by default because it works better on
-# average.
-
-if [ "$1" = configure ]; then
-  update-alternatives --install /usr/games/heroes heroes /usr/games/heroes-sdl 60
-
-  # dpkg doesn't like to replace a directory with a symlink
-  if [ -d /usr/share/doc/heroes-sdl ]; then
-    rm -fr /usr/share/doc/heroes-sdl
-    ln -s heroes-common /usr/share/doc/heroes-sdl
-  fi
-fi
-
-#DEBHELPER#
\ No newline at end of file
diff --git a/debian/heroes-sdl.prerm b/debian/heroes-sdl.prerm
deleted file mode 100644
index 5ad120d..0000000
--- a/debian/heroes-sdl.prerm
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-#
-#  Contains the magic to deregister the package.
-
-if [ "$1" = remove ]; then
-  update-alternatives --remove heroes /usr/games/heroes-sdl
-fi
-
-#DEBHELPER#
\ No newline at end of file
diff --git a/debian/heroes-common.install b/debian/install
similarity index 59%
rename from debian/heroes-common.install
rename to debian/install
index 7660755..dcd0ca1 100644
--- a/debian/heroes-common.install
+++ b/debian/install
@@ -1,7 +1,3 @@
 debian/heroes.desktop usr/share/applications
 debian/heroes.xpm usr/share/pixmaps
 src/etc/heroesrc      etc
-usr/games/heroeslvl
-usr/share/games/locale
-usr/share/info
-usr/share/man
diff --git a/debian/menu b/debian/menu
new file mode 100644
index 0000000..31bcc2a
--- /dev/null
+++ b/debian/menu
@@ -0,0 +1,7 @@
+?package(heroes):needs="x11" section="Games/Action" \
+title="Heroes" command="/usr/games/heroes" \
+icon="/usr/share/pixmaps/heroes.xpm"
+
+?package(heroes):needs="vc" section="Games/Action" \
+title="Heroes" command="/usr/games/heroes" \
+icon="/usr/share/pixmaps/heroes.xpm"
diff --git a/debian/heroes-common.postinst b/debian/postinst
similarity index 100%
rename from debian/heroes-common.postinst
rename to debian/postinst
diff --git a/debian/heroes-common.postrm b/debian/postrm
similarity index 100%
rename from debian/heroes-common.postrm
rename to debian/postrm
diff --git a/debian/rules b/debian/rules
index 62088a7..cbd9775 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,7 +7,7 @@ override_dh_auto_configure:
 	LDFLAGS="$$(sdl-config --libs)" dh_auto_configure -- --datadir=/usr/share/games --bindir=/usr/games --without-ggi --with-sdl --without-mikmod --with-sdl-mixer
 
 override_dh_autoreconf:
-# The code uses an old gettext Makefile.in.in which nees mkinstalldirs
+# The code uses an old gettext Makefile.in.in which needs mkinstalldirs
 	cp tools/mkinstalldirs .
 	dh_autoreconf
 	mv mkinstalldirs tools
@@ -18,19 +18,16 @@ override_dh_autoreconf_clean:
 	mv mkinstalldirs tools
 
 override_dh_fixperms:
-	dh_fixperms -Xheroes-sdl
+	dh_fixperms -Xheroes
 
 override_dh_auto_install:
 	dh_auto_install
-	mv debian/tmp/usr/games/heroes debian/heroes-sdl/usr/games/heroes-sdl
-	chown root:games debian/heroes-sdl/usr/games/heroes-sdl
-	chmod g+s debian/heroes-sdl/usr/games/heroes-sdl
-	ln -sf heroes-common debian/heroes-sdl/usr/share/doc/heroes-sdl
-	ln -sf heroes.6.gz debian/heroes-sdl/usr/share/man/man6/heroes-sdl.6.gz
-	rm -f debian/heroes-common/usr/share/games/heroes/etc/heroesrc
-	mkdir -p debian/heroes-common/usr/share/games/heroes/etc
-	ln -sf /etc/heroesrc debian/heroes-common/usr/share/games/heroes/etc/heroesrc
-	rm -f debian/heroes-common/usr/share/info/dir
+	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
+	mkdir -p debian/heroes/usr/share/games/heroes/etc
+	ln -sf /etc/heroesrc debian/heroes/usr/share/games/heroes/etc/heroesrc
+	rm -f debian/heroes/usr/share/info/dir
 
 override_dh_auto_test:
 	srcdir=$(CURDIR)/tests VERBOSE=1 dh_auto_test

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

More information about the Pkg-games-commits mailing list