r10513 - in packages/trunk/powermanga/debian: . patches

Barry deFreese bdefreese at alioth.debian.org
Fri Nov 13 20:12:29 UTC 2009 

Author: bdefreese
Date: 2009-11-13 20:12:28 +0000 (Fri, 13 Nov 2009)
New Revision: 10513

Added:
   packages/trunk/powermanga/debian/README.source
   packages/trunk/powermanga/debian/patches/005_link_libm.diff
   packages/trunk/powermanga/debian/patches/030_manpage_typo.diff
Modified:
   packages/trunk/powermanga/debian/changelog
   packages/trunk/powermanga/debian/control
   packages/trunk/powermanga/debian/patches/series
   packages/trunk/powermanga/debian/powermanga.postinst
   packages/trunk/powermanga/debian/powermanga.postrm
   packages/trunk/powermanga/debian/rules
   packages/trunk/powermanga/debian/watch
Log:
  * Update my e-mail address.
  * 005_link_libm.diff - Add -lm to LDFLAGS. (Closes: #556072).
  * 030_manpage_typo.diff - Fix typo in manpage. (Closes: #455227).
  * Update postinst to make powermanga setgid games. (Closes: #419572).
    + Thanks to Javier Fernández-Sanguino Peña for the fix.
  * Add dversionmangle in watch file to remove -dfsg version.
  * Add set -e to postrm.
  * Clean the quilt dir on clean.
  * Add README.source for quilt.
  * Bump Standards Version to 3.8.3. (No changes needed).
Refresh the changelog.


Added: packages/trunk/powermanga/debian/README.source
===================================================================
--- packages/trunk/powermanga/debian/README.source	                        (rev 0)
+++ packages/trunk/powermanga/debian/README.source	2009-11-13 20:12:28 UTC (rev 10513)
@@ -0,0 +1,58 @@
+This package uses quilt to manage all modifications to the upstream
+source.  Changes are stored in the source package as diffs in
+debian/patches and applied during the build.
+
+To configure quilt to use debian/patches instead of patches, you want
+either to export QUILT_PATCHES=debian/patches in your environment
+or use this snippet in your ~/.quiltrc:
+
+    for where in ./ ../ ../../ ../../../ ../../../../ ../../../../../; do
+        if [ -e ${where}debian/rules -a -d ${where}debian/patches ]; then
+                export QUILT_PATCHES=debian/patches
+                break
+        fi
+    done
+
+To get the fully patched source after unpacking the source package, cd to
+the root level of the source package and run:
+
+    quilt push -a
+
+The last patch listed in debian/patches/series will become the current
+patch.
+
+To add a new set of changes, first run quilt push -a, and then run:
+
+    quilt new <patch>
+
+where <patch> is a descriptive name for the patch, used as the filename in
+debian/patches.  Then, for every file that will be modified by this patch,
+run:
+
+    quilt add <file>
+
+before editing those files.  You must tell quilt with quilt add what files
+will be part of the patch before making changes or quilt will not work
+properly.  After editing the files, run:
+
+    quilt refresh
+
+to save the results as a patch.
+
+Alternately, if you already have an external patch and you just want to
+add it to the build system, run quilt push -a and then:
+
+    quilt import -P <patch> /path/to/patch
+    quilt push -a
+
+(add -p 0 to quilt import if needed). <patch> as above is the filename to
+use in debian/patches.  The last quilt push -a will apply the patch to
+make sure it works properly.
+
+To remove an existing patch from the list of patches that will be applied,
+run:
+
+    quilt delete <patch>
+
+You may need to run quilt pop -a to unapply patches first before running
+this command.

Modified: packages/trunk/powermanga/debian/changelog
===================================================================
--- packages/trunk/powermanga/debian/changelog	2009-11-13 19:14:47 UTC (rev 10512)
+++ packages/trunk/powermanga/debian/changelog	2009-11-13 20:12:28 UTC (rev 10513)
@@ -1,11 +1,24 @@
 powermanga (0.90-dfsg-2) unstable; urgency=low
 
+  [ Cyril Brulebois ]
   * Add missing context to the 020_copyright.diff patch, so as to prevent
     an FTBFS with the new “3.0 (quilt)” source package format, thanks to
     Raphaël Hertzog for the notice (Closes: #485021).
 
- -- Cyril Brulebois <kibi at debian.org>  Sun, 08 Jun 2008 06:22:38 +0200
+  [ Barry deFreese ]
+  * Update my e-mail address.
+  * 005_link_libm.diff - Add -lm to LDFLAGS. (Closes: #556072).
+  * 030_manpage_typo.diff - Fix typo in manpage. (Closes: #455227).
+  * Update postinst to make powermanga setgid games. (Closes: #419572).
+    + Thanks to Javier Fernández-Sanguino Peña for the fix.
+  * Add dversionmangle in watch file to remove -dfsg version.
+  * Add set -e to postrm.
+  * Clean the quilt dir on clean.
+  * Add README.source for quilt.
+  * Bump Standards Version to 3.8.3. (No changes needed).
 
+ -- Barry deFreese <bdefreese at debian.org>  Fri, 13 Nov 2009 14:28:30 -0500
+
 powermanga (0.90-dfsg-1) unstable; urgency=low
 
   [ Gonéri Le Bouder ]

Modified: packages/trunk/powermanga/debian/control
===================================================================
--- packages/trunk/powermanga/debian/control	2009-11-13 19:14:47 UTC (rev 10512)
+++ packages/trunk/powermanga/debian/control	2009-11-13 20:12:28 UTC (rev 10513)
@@ -2,9 +2,9 @@
 Section: games
 Priority: optional
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
-Uploaders: Sam Hocevar (Debian packages) <sam+deb at zoy.org>, Barry deFreese <bddebian at comcast.net>
+Uploaders: Sam Hocevar (Debian packages) <sam+deb at zoy.org>, Barry deFreese <bdefreese at debian.org>
 Build-Depends: debhelper (>= 5.0), quilt, libx11-dev, libxext-dev, libxxf86dga-dev, libxxf86vm-dev, libsdl1.2-dev (>= 1.2.2-3.1), libsdl-mixer1.2-dev, zlib1g-dev
-Standards-Version: 3.7.3
+Standards-Version: 3.8.3
 Homepage: http://linux.tlk.fr/games/Powermanga/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/powermanga/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/powermanga/?op=log

Added: packages/trunk/powermanga/debian/patches/005_link_libm.diff
===================================================================
--- packages/trunk/powermanga/debian/patches/005_link_libm.diff	                        (rev 0)
+++ packages/trunk/powermanga/debian/patches/005_link_libm.diff	2009-11-13 20:12:28 UTC (rev 10513)
@@ -0,0 +1,25 @@
+Index: powermanga-0.90-dfsg/configure.ac
+===================================================================
+--- powermanga-0.90-dfsg.orig/configure.ac	2009-11-13 14:46:56.000000000 -0500
++++ powermanga-0.90-dfsg/configure.ac	2009-11-13 14:48:55.000000000 -0500
+@@ -14,6 +14,7 @@
+ dnl  Default flags
+ #CXXFLAGS="-O3 -Wall -g"
+ CFLAGS="-O3 -Wall -std=c99"
++LDFLAGS="-lm"
+ 
+ dnl  Check for X
+ AC_PATH_X
+Index: powermanga-0.90-dfsg/configure
+===================================================================
+--- powermanga-0.90-dfsg.orig/configure	2009-11-13 14:48:58.000000000 -0500
++++ powermanga-0.90-dfsg/configure	2009-11-13 14:49:34.000000000 -0500
+@@ -3413,7 +3413,7 @@
+ 
+ #CXXFLAGS="-O3 -Wall -g"
+ CFLAGS="-O3 -Wall -std=c99"
+-
++LDFLAGS="-lm"
+ 
+ ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'

Added: packages/trunk/powermanga/debian/patches/030_manpage_typo.diff
===================================================================
--- packages/trunk/powermanga/debian/patches/030_manpage_typo.diff	                        (rev 0)
+++ packages/trunk/powermanga/debian/patches/030_manpage_typo.diff	2009-11-13 20:12:28 UTC (rev 10513)
@@ -0,0 +1,13 @@
+Index: powermanga-0.90-dfsg/powermanga.6
+===================================================================
+--- powermanga-0.90-dfsg.orig/powermanga.6	2009-11-13 14:57:17.000000000 -0500
++++ powermanga-0.90-dfsg/powermanga.6	2009-11-13 14:57:28.000000000 -0500
+@@ -74,7 +74,7 @@
+ .B \--version
+ prints version information and exit
+ .TP
+-.B \---window
++.B \--window
+ windowed mode (full screen by default)
+ .TP
+ .B \--2x

Modified: packages/trunk/powermanga/debian/patches/series
===================================================================
--- packages/trunk/powermanga/debian/patches/series	2009-11-13 19:14:47 UTC (rev 10512)
+++ packages/trunk/powermanga/debian/patches/series	2009-11-13 20:12:28 UTC (rev 10513)
@@ -1,2 +1,4 @@
+005_link_libm.diff
 010_scoredir_path.diff
 020_copyright.diff
+030_manpage_typo.diff

Modified: packages/trunk/powermanga/debian/powermanga.postinst
===================================================================
--- packages/trunk/powermanga/debian/powermanga.postinst	2009-11-13 19:14:47 UTC (rev 10512)
+++ packages/trunk/powermanga/debian/powermanga.postinst	2009-11-13 20:12:28 UTC (rev 10513)
@@ -15,9 +15,16 @@
     then
         dpkg-statoverride --remove "/usr/games/powermanga"
     fi
+    if !  dpkg-statoverride --list /usr/games/powermanga > /dev/null; then
+        chown root:games /usr/games/powermanga
+        chmod 2755 /usr/games/powermanga
+    fi
+
+    if !  dpkg-statoverride --list $SCOREDIR > /dev/null; then
     # Fix permissions
-    chown root:root $SCOREDIR
-    chmod 0755 $SCOREDIR
+        chown root:games $SCOREDIR
+        chmod 2755 $SCOREDIR
+    fi
     for x in hi-easy hi hi-hard; do
       test -f $SCOREDIR/powermanga.$x || touch $SCOREDIR/powermanga.$x
       chown root:games $SCOREDIR/powermanga.$x

Modified: packages/trunk/powermanga/debian/powermanga.postrm
===================================================================
--- packages/trunk/powermanga/debian/powermanga.postrm	2009-11-13 19:14:47 UTC (rev 10512)
+++ packages/trunk/powermanga/debian/powermanga.postrm	2009-11-13 20:12:28 UTC (rev 10513)
@@ -1,4 +1,5 @@
 #! /bin/sh
+set -e
 
 # These ones are not needed anymore. Make sure they disappear forever
 if dpkg-statoverride --list /var/games/powermanga >/dev/null; then

Modified: packages/trunk/powermanga/debian/rules
===================================================================
--- packages/trunk/powermanga/debian/rules	2009-11-13 19:14:47 UTC (rev 10512)
+++ packages/trunk/powermanga/debian/rules	2009-11-13 20:12:28 UTC (rev 10513)
@@ -39,6 +39,7 @@
 	[ ! -f Makefile ] || [ ! -f config.status ] || $(MAKE) distclean
 	QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2
 	rm -f config.log config.status
+	rm -rf .pc
 	dh_clean
 
 install: DH_OPTIONS=

Modified: packages/trunk/powermanga/debian/watch
===================================================================
--- packages/trunk/powermanga/debian/watch	2009-11-13 19:14:47 UTC (rev 10512)
+++ packages/trunk/powermanga/debian/watch	2009-11-13 20:12:28 UTC (rev 10513)
@@ -1,3 +1,4 @@
 version=3
 
+opts="dversionmangle=s/\-dfsg//" \
 http://linux.tlk.fr/games/Powermanga/download/powermanga-([\d.]+)\.tgz

More information about the Pkg-games-commits mailing list