Package: xpilot-ng
Severity: wishlist

To assist in transition to the to new Quilt 3.0 format that is
encouraged by release goal[*], please see if the following patch can help.

Thank you for maintaining the package,
Jari

[*] Release Goals / * New source package format support
    http://lists.debian.org/debian-devel-announce/2010/04/msg00001.html

-- System Information:
Debian Release: squeeze/sid
  APT prefers testing
  APT policy: (990, 'testing'), (500, 'unstable'), (1, 'experimental')
Architecture: amd64 (x86_64)

Kernel: Linux 2.6.32-3-amd64 (SMP w/2 CPU cores)
Locale: LANG=en_DK.UTF-8, LC_CTYPE=en_DK.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
 debian/changelog                 |   22 ++++++++++++++++++++++
 debian/control                   |   30 ++++++++++--------------------
 debian/source/format             |    1 +
 debian/watch                     |    2 ++
 debian/xpilot-ng-common.postinst |    2 ++
 debian/xpilot-ng-common.postrm   |    2 ++
 debian/xpilot-ng-server.postinst |   38 ++++++++++++++++++++------------------
 debian/xpilot-ng-server.postrm   |    2 ++
 8 files changed, 61 insertions(+), 38 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 27294a7..c6cb48f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,25 @@
+xpilot-ng (1:4.7.3-1.1) unstable; urgency=low
+
+  [ Jari Aalto ]
+  * Non-maintainer upload.
+    - Move to packaging format "3.0 (quilt)".
+  * debian/compat
+    - Update to 7.
+  * debian/control
+    - (Build-Depends): Update to debhelper 7.1.
+    - (Depends): Add ${misc:Depends}.
+    - (Homepage): Add new field; lift from Description.
+    - (Standards-Version): Update to 3.8.4.
+  * debian/{postrm,postinst}
+    - Fix Lintian maintainer-script-ignores-errors.
+  * debian/source/format
+    - New file.
+  * debian/watch
+    - New file (Closes: 549382#).
+      Thanks to Daniel Leidert <[email protected]>.
+
+ -- Jari Aalto <[email protected]>  Fri, 07 May 2010 16:20:15 +0300
+
 xpilot-ng (1:4.7.3-1) unstable; urgency=low
 
   * Upstream release.
diff --git a/debian/control b/debian/control
index 23937ae..343f99d 100644
--- a/debian/control
+++ b/debian/control
@@ -4,11 +4,12 @@ Priority: extra
 Maintainer: Ben Armstrong <[email protected]>
 Build-Conflicts: autoconf2.13, automake1.4, x11proto-xf86misc-dev
 Build-Depends: autoconf, automake1.11, debhelper (>= 7), libx11-dev, 
libxext-dev, x11proto-core-dev, zlib1g-dev, libexpat1-dev, libsdl1.2-dev, 
libsdl-image1.2-dev, libsdl-ttf2.0-dev, libgl1-mesa-dev, libglu1-mesa-dev, 
libalut-dev, libopenal-dev (>= 1:1.10.622), help2man, python-support
-Standards-Version: 3.8.2
+Standards-Version: 3.8.4
+Homepage: http://xpilot.sf.net
 
 Package: xpilot-ng
-Architecture: all
-Depends: xpilot-ng-client-x11 (>= ${source:Version}), xpilot-ng-client-sdl (>= 
${source:Version}), xpilot-ng-server (>= ${source:Version}), xpilot-ng-utils 
(>= ${source:Version})
+Architecture: allx
+Depends: ${misc:Depends}, xpilot-ng-client-x11 (>= ${source:Version}), 
xpilot-ng-client-sdl (>= ${source:Version}), xpilot-ng-server (>= 
${source:Version}), xpilot-ng-utils (>= ${source:Version})
 Description: Multi-player tactical game for X (NG version)
  XPilot is a multi-player tactical manoeuvring game for X.  Each
  player controls their own fighter equipped with a variety of weapons
@@ -19,12 +20,10 @@ Description: Multi-player tactical game for X (NG version)
  .
  This package is a complete XPilot installation, including the
  XPilot client, server and utilities.
- .
- This package is for the "Next Generation" (NG) fork at http://xpilot.sf.net
 
 Package: xpilot-ng-common
 Architecture: all
-Depends: ${python:Depends}, python-wxgtk2.6, python-irclib, ttf-freefont, 
ttf-bitstream-vera
+Depends: ${misc:Depends}, ${python:Depends}, python-wxgtk2.6, python-irclib, 
ttf-freefont, ttf-bitstream-vera
 Suggests: xpilot-ng-server, xpilot-ng-utils, xpilot-ng-client-x11, 
xpilot-ng-client-sdl
 Description: Common files for XPilot NG
  XPilot is a multi-player tactical manoeuvring game for X.  Each
@@ -36,12 +35,10 @@ Description: Common files for XPilot NG
  .
  This package contains the common files for the server, clients and
  utilities including both data and documentation.
- .
- This package is for the "Next Generation" (NG) fork at http://xpilot.sf.net
 
 Package: xpilot-ng-client-x11
 Architecture: any
-Depends: ${shlibs:Depends}, xpilot-ng-common (= ${source:Version})
+Depends: ${misc:Depends}, ${shlibs:Depends}, xpilot-ng-common (= 
${source:Version})
 Description: Client for XPilot NG
  XPilot is a multi-player tactical manoeuvring game for X.  Each
  player controls their own fighter equipped with a variety of weapons
@@ -53,12 +50,10 @@ Description: Client for XPilot NG
  This package contains the classic client needed to play the game.
  Because it is X11-based, it is has a very basic, clean look-and-feel,
  and is suitable for use on older, less powerful systems.
- .
- This package is for the "Next Generation" (NG) fork at http://xpilot.sf.net
 
 Package: xpilot-ng-client-sdl
 Architecture: any
-Depends: ${shlibs:Depends}, xpilot-ng-common (= ${source:Version})
+Depends: ${misc:Depends}, ${shlibs:Depends}, xpilot-ng-common (= 
${source:Version})
 Description: Client for XPilot NG
  XPilot is a multi-player tactical manoeuvring game for X.  Each
  player controls their own fighter equipped with a variety of weapons
@@ -70,12 +65,10 @@ Description: Client for XPilot NG
  This package contains a modern client with fancier graphics.  It is 
  suitable for use on modern systems with sufficient resources to run SDL 
  and GL.
- .
- This package is for the "Next Generation" (NG) fork at http://xpilot.sf.net
 
 Package: xpilot-ng-utils
 Architecture: any
-Depends: ${shlibs:Depends}, xpilot-ng-common (= ${source:Version})
+Depends: ${misc:Depends}, ${shlibs:Depends}, xpilot-ng-common (= 
${source:Version})
 Description: Utilities for XPilot NG
  XPilot is a multi-player tactical manoeuvring game for X.  Each
  player controls their own fighter equipped with a variety of weapons
@@ -86,12 +79,10 @@ Description: Utilities for XPilot NG
  .
  This package contains utilities for making XPilot maps and playing
  back recordings of XPilot games.
- .
- This package is for the "Next Generation" (NG) fork at http://xpilot.sf.net
 
 Package: xpilot-ng-server
 Architecture: any
-Depends: adduser (>=3.34), ${shlibs:Depends}
+Depends: ${misc:Depends}, adduser (>=3.34), ${shlibs:Depends}
 Conflicts: xpilot-ng-common (<< 1:4.7.3~cvs20070805-1)
 Replaces: xpilot-ng-common (<< 1:4.7.3~cvs20070805-1)
 Description: Server for hosting XPilot NG games
@@ -104,6 +95,5 @@ Description: Server for hosting XPilot NG games
  .
  This package contains the server daemon you need in order to host
  your own game of XPilot.
- .
- This package is for the "Next Generation" (NG) fork at http://xpilot.sf.net
+
 
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 0000000..e172350
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,2 @@
+version=3
+http://sf.net/xpilot/xpilot-ng-([\d.]+)\.tar\.gz
diff --git a/debian/xpilot-ng-common.postinst b/debian/xpilot-ng-common.postinst
old mode 100644
new mode 100755
index 537a715..5ad103f
--- a/debian/xpilot-ng-common.postinst
+++ b/debian/xpilot-ng-common.postinst
@@ -1,3 +1,5 @@
 #!/bin/bash
 
+set -e
+
 #DEBHELPER#
diff --git a/debian/xpilot-ng-common.postrm b/debian/xpilot-ng-common.postrm
old mode 100644
new mode 100755
index 537a715..5ad103f
--- a/debian/xpilot-ng-common.postrm
+++ b/debian/xpilot-ng-common.postrm
@@ -1,3 +1,5 @@
 #!/bin/bash
 
+set -e
+
 #DEBHELPER#
diff --git a/debian/xpilot-ng-server.postinst b/debian/xpilot-ng-server.postinst
old mode 100644
new mode 100755
index dabbd53..9696966
--- a/debian/xpilot-ng-server.postinst
+++ b/debian/xpilot-ng-server.postinst
@@ -1,16 +1,18 @@
 #!/bin/bash
 
+set -e
+
 # create xpilotng user/group if they do not exist
 if [ "$1" = "configure" ] && ! getent passwd | grep -q "^xpilotng:"; then
     echo "Adding xpilotng group and user..."
     adduser --quiet --system --home /var/run/xpilot-ng-server --group \
        --shell /bin/sh --disabled-password xpilotng || true
 fi
-       
+
 chmod 700 /var/run/xpilot-ng-server
 chown -R xpilotng:xpilotng /etc/xpilot-ng
 chmod -f 600 /etc/xpilot-ng/password.txt
-    
+
 DEFAULTFILE=/etc/default/xpilot-ng-server
 
 if [ ! -e $DEFAULTFILE ]; then
@@ -34,14 +36,14 @@ EOF
 grep -q REPORTMETA $DEFAULTFILE || cat >>$DEFAULTFILE <<EOF
 
 # Set REPORTMETA to "YES" and the XPilot NG server will automatically
-# declare itself to the metasever when it boots so other players outside 
+# declare itself to the metasever when it boots so other players outside
 # of your local network can find and connect to it.
 # ----------
-# IMPORTANT: If you are behind a firewall, to allow outside users to 
+# IMPORTANT: If you are behind a firewall, to allow outside users to
 #            connect to your server, you will need to:
 # ----------
 # 1. set the -clientPortStart and -clientPortEnd options below
-# 2. configure your firewall to forward the specified UDP ports as well 
+# 2. configure your firewall to forward the specified UDP ports as well
 #    as the contact port (15345/udp) to the XPilot server host
 REPORTMETA="NO"
 EOF
@@ -52,21 +54,21 @@ grep -q OTHEROPTIONS $DEFAULTFILE || cat >>$DEFAULTFILE 
<<EOF
 # server starts, e.g.
 #
 # -timerResolution 100
-#      This hack attempts to make the frame rate more accurate.
-#      Without it, the server will be a fraction of a frame per second
-#      slower than the specified value.  However, on a loaded system
-#      (e.g. running the distributed.net client) it has been found
-#      that -timerResolution is not effective, and ends up further
-#      slowing down the framerate.
+#       This hack attempts to make the frame rate more accurate.
+#       Without it, the server will be a fraction of a frame per second
+#       slower than the specified value.  However, on a loaded system
+#       (e.g. running the distributed.net client) it has been found
+#       that -timerResolution is not effective, and ends up further
+#       slowing down the framerate.
 #
 # -clientPortStart 40000 -clientPortEnd 40009
-#      If the server is run behind an IP masquerading firewall which is
-#      set up to port-forward a range of UDP ports to the server machine,
-#      this pair of switches establishes that range of ports which is
-#      used between each client and the server after a connection is
-#      negotiated (as distinct from the XPilot NG server port, which
-#      defaults to 15345/udp and is only used to initially establish 
-#      the connection).
+#       If the server is run behind an IP masquerading firewall which is
+#       set up to port-forward a range of UDP ports to the server machine,
+#       this pair of switches establishes that range of ports which is
+#       used between each client and the server after a connection is
+#       negotiated (as distinct from the XPilot NG server port, which
+#       defaults to 15345/udp and is only used to initially establish
+#       the connection).
 #
 OTHEROPTIONS="-timerResolution 100"
 EOF
diff --git a/debian/xpilot-ng-server.postrm b/debian/xpilot-ng-server.postrm
old mode 100644
new mode 100755
index 7cb5ea8..cf3853b
--- a/debian/xpilot-ng-server.postrm
+++ b/debian/xpilot-ng-server.postrm
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+set -e
+
 case "$1" in
        purge)
            rm -f /etc/default/xpilot-ng-server

Reply via email to