[prboom+] 01/01: Various packaging refinements

Fabian Greffrath fabian-guest at moszumanska.debian.org
Wed May 6 07:11:56 UTC 2015 

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

fabian-guest pushed a commit to branch master
in repository prboom+.

commit 1503cfa5a9c05c16f201d20afdc11434587a8484
Author: Fabian Greffrath <fabian+debian at greffrath.com>
Date:   Wed May 6 09:08:03 2015 +0200

    Various packaging refinements
    
    * debian/README.source
      + turn into an actual shell script
      + turn package name string into a variable
    * debian/control
      + add Breaks and Replaces against obsolete prboom package
    * debian/copyright
      + update Source location URI
      + update Debian packaging copyright years
    * debian/prboom-plus.menu
      + remove menu entry for playing on a vc
    * debian/prboom-plus.postinst, debian/prboom-plus.prerm
      + shorten shebang line
      + remove comment
      + only install alternatives upon abort-upgrade or configure
      + fix indentation
    * debian/rules
      + remove obsolete forced xz compression
---
 debian/README.source        | 10 ++++++----
 debian/control              |  4 ++++
 debian/copyright            |  4 ++--
 debian/prboom-plus.menu     |  8 --------
 debian/prboom-plus.postinst | 19 +++++++++++--------
 debian/prboom-plus.prerm    |  7 +++----
 debian/rules                |  3 ---
 7 files changed, 26 insertions(+), 29 deletions(-)

diff --git a/debian/README.source b/debian/README.source
index 945b0ed..8087602 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -1,12 +1,14 @@
+#!/bin/bash
 # This is how the Debian source tarball was created:
 
+PACKAGE=prboom-plus
 VERSION=2.5.1.4~
 SVNREV=4425
 DFSG=1
 
 pushd ..
-svn export -r ${SVNREV} https://svn.prboom.org/repos/branches/prboom-plus-24/prboom2/ prboom-plus-${VERSION}svn${SVNREV}
-pushd prboom-plus-${VERSION}svn${SVNREV}
+svn export -r ${SVNREV} https://svn.prboom.org/repos/branches/${PACKAGE}-24/prboom2/ ${PACKAGE}-${VERSION}svn${SVNREV}
+pushd ${PACKAGE}-${VERSION}svn${SVNREV}
 
 # Filter out non-free graphics and sound lumps
 BADLUMPS="$(sed -n '/^if NONFREE_GRAPHICS/,/^else\|^endif/p' data/Makefile.am | sed -e '/^if\|^else\|^endif\|^SPRITEP/d' | cut -d '=' -f 2)"
@@ -19,7 +21,7 @@ done
 rm -rf src/MUSIC/dll src/MUSIC/include src/MUSIC/lib src/PCRELIB tests
 
 popd
-mv prboom-plus-${VERSION}svn${SVNREV} prboom-plus-${VERSION}svn${SVNREV}+dfsg${DFSG}
+mv ${PACKAGE}-${VERSION}svn${SVNREV} ${PACKAGE}-${VERSION}svn${SVNREV}+dfsg${DFSG}
 
-tar cJfv prboom-plus_${VERSION}svn${SVNREV}+dfsg${DFSG}.orig.tar.xz prboom-plus-${VERSION}svn${SVNREV}+dfsg${DFSG}
+tar cJfv ${PACKAGE}_${VERSION}svn${SVNREV}+dfsg${DFSG}.orig.tar.xz ${PACKAGE}-${VERSION}svn${SVNREV}+dfsg${DFSG}
 popd
diff --git a/debian/control b/debian/control
index 183d9be..e52d0eb 100644
--- a/debian/control
+++ b/debian/control
@@ -41,6 +41,10 @@ Suggests:
 Provides:
  boom-engine,
  doom-engine
+Breaks:
+ prboom (<< 2:2.5.1.4~svn4425+dfsg1-2~)
+Replaces:
+ prboom  (<< 2:2.5.1.4~svn4425+dfsg1-2~)
 Description: enhanced clone of the classic first-person shooter Doom
  PrBoom+ is an enhanced source port of the classic 3D first-person
  shooter game Doom, first released by id Software in 1993. It uses
diff --git a/debian/copyright b/debian/copyright
index c1a7ce5..2a26282 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,7 +1,7 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: PrBoom+
 Upstream-Contact: http://sourceforge.net/projects/prboom-plus/
-Source: https://www.crowproductions.de/repos/prboom/branches/prboom-plus-24/prboom2/
+Source: https://svn.prboom.org/repos/branches/prboom-plus-24/prboom2/
 
 Files: *
 Copyright:
@@ -153,7 +153,7 @@ Copyright:
   © 2000-2003, Arthur Korn <arthur at korn.ch>
   © 2004-2006, Moritz Muehlenhoff <jmm at inutil.org>
   © 2006-2013, Jon Dowland <jon at alcopop.org>, Debian Games Team
-  © 2012-2013, Fabian Greffrath <fabian+debian at greffrath.com>, Debian Games Team
+  © 2012-2015, Fabian Greffrath <fabian+debian at greffrath.com>, Debian Games Team
 License: GPL-2+
 
 License: BSD-3-clause
diff --git a/debian/prboom-plus.menu b/debian/prboom-plus.menu
index e3f32b2..c2439d1 100644
--- a/debian/prboom-plus.menu
+++ b/debian/prboom-plus.menu
@@ -5,11 +5,3 @@
   title="PrBoom+"\
   command="/usr/games/prboom-plus"\
   icon="/usr/share/pixmaps/prboom-plus.xpm"
-
-?package(prboom-plus):\
-  needs="vc"\
-  section="Games/Action"\
-  hints="Doom,First person"\
-  title="PrBoom+"\
-  command="/usr/games/prboom-plus"\
-  icon="/usr/share/pixmaps/prboom-plus.xpm"
diff --git a/debian/prboom-plus.postinst b/debian/prboom-plus.postinst
index 8be6a23..4602f58 100644
--- a/debian/prboom-plus.postinst
+++ b/debian/prboom-plus.postinst
@@ -1,14 +1,17 @@
-#! /bin/sh
-# postinst script for prboom-plus
+#!/bin/sh
 
 set -e
 
-update-alternatives --install /usr/games/doom doom /usr/games/prboom-plus 50 \
-                    --slave /usr/share/man/man6/doom.6.gz \
-                        doom.6.gz /usr/share/man/man6/prboom-plus.6.gz
-update-alternatives --install /usr/games/boom boom /usr/games/prboom-plus 50 \
-                    --slave /usr/share/man/man6/boom.6.gz \
-                        boom.6.gz /usr/share/man/man6/prboom-plus.6.gz
+if [ "$1" = "abort-upgrade" ] || [ "$1" = "configure" ]
+then
+  update-alternatives \
+  --install /usr/games/doom doom /usr/games/prboom-plus 50 \
+  --slave /usr/share/man/man6/doom.6.gz doom.6.gz /usr/share/man/man6/prboom-plus.6.gz
+
+  update-alternatives \
+  --install /usr/games/boom boom /usr/games/prboom-plus 50 \
+  --slave /usr/share/man/man6/boom.6.gz boom.6.gz /usr/share/man/man6/prboom-plus.6.gz
+fi
 
 #DEBHELPER#
 
diff --git a/debian/prboom-plus.prerm b/debian/prboom-plus.prerm
index 3c637e4..f6cfb27 100644
--- a/debian/prboom-plus.prerm
+++ b/debian/prboom-plus.prerm
@@ -1,12 +1,11 @@
-#! /bin/sh
-# prerm script for prboom-plus
+#!/bin/sh
 
 set -e
 
 if [ "$1" = "remove" ] || [ "$1" = "deconfigure" ]
 then
-    update-alternatives --remove doom /usr/games/prboom-plus
-    update-alternatives --remove boom /usr/games/prboom-plus
+  update-alternatives --remove doom /usr/games/prboom-plus
+  update-alternatives --remove boom /usr/games/prboom-plus
 fi
 
 #DEBHELPER#
diff --git a/debian/rules b/debian/rules
index 1adbed3..dd6a572 100755
--- a/debian/rules
+++ b/debian/rules
@@ -22,9 +22,6 @@ override_dh_auto_install:
 		docdir=/usr/share/doc/prboom-plus \
 		doc_DATA="AUTHORS README TODO"
 
-override_dh_builddeb:
-	dh_builddeb -- -Zxz
-
 override_dh_install:
 	dh_install -p prboom-plus -X prboom-plus-game-server
 	dh_install -N prboom-plus

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

More information about the Pkg-games-commits mailing list