Hi,

The following is the diff for my softgun 0.16-2.1 NMU.

diff -u softgun-0.16/debian/changelog softgun-0.16/debian/changelog
--- softgun-0.16/debian/changelog
+++ softgun-0.16/debian/changelog
@@ -1,3 +1,20 @@
+softgun (0.16-2.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * debian/rules:
+    + Don't ignore errors on $(MAKE) clean
+    + Don't reset CFLAGS if not empty
+    + Call un/patch
+  * Fix bashisms in Makefile (Closes: #453473)
+    - Thanks to Michael Bienia for the report and patch
+    - Stored as debian/patches/bashisms.patch
+  * debian/watch: added
+  * debian/control:
+    + Added Homepage field
+    + B-D on quilt
+
+ -- Raphael Geissert <[EMAIL PROTECTED]>  Tue, 01 Jul 2008 15:34:56 -0500
+
 softgun (0.16-2) unstable; urgency=low
 
   * Fixed build dependency against zlib library (Closes: #439655)  
diff -u softgun-0.16/debian/control softgun-0.16/debian/control
--- softgun-0.16/debian/control
+++ softgun-0.16/debian/control
@@ -2,8 +2,9 @@
 Section: misc
 Priority: optional
 Maintainer: Murat Demirten <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>= 5), zlib1g-dev
+Build-Depends: debhelper (>= 5), zlib1g-dev, quilt
 Standards-Version: 3.7.2
+Homepage: http://softgun.sourceforge.net/
 
 Package: softgun
 Architecture: any
diff -u softgun-0.16/debian/rules softgun-0.16/debian/rules
--- softgun-0.16/debian/rules
+++ softgun-0.16/debian/rules
@@ -9,19 +9,21 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+include /usr/share/quilt/quilt.make
 
 
+CFLAGS := -Wall -g
 
-CFLAGS = -Wall -g
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
        CFLAGS += -O0
 else
        CFLAGS += -O2
 endif
 
+export CFLAGS
+
 configure: configure-stamp
-configure-stamp:
+configure-stamp: patch
        dh_testdir
        # Add here commands to configure the package.
 
@@ -39,13 +41,13 @@
 
        touch $@
 
-clean:
+clean: unpatch
        dh_testdir
        dh_testroot
        rm -f build-stamp configure-stamp
 
        # Add here commands to clean up after the build process.
-       -$(MAKE) clean
+       $(MAKE) clean
 
        dh_clean 
 
only in patch2:
unchanged:
--- softgun-0.16.orig/debian/watch
+++ softgun-0.16/debian/watch
@@ -0,0 +1,3 @@
+version=3
+
+http://sf.net/softgun/softgun-(.+)\.tgz
only in patch2:
unchanged:
--- softgun-0.16.orig/debian/patches/series
+++ softgun-0.16/debian/patches/series
@@ -0,0 +1 @@
+bashisms.patch
only in patch2:
unchanged:
--- softgun-0.16.orig/debian/patches/bashisms.patch
+++ softgun-0.16/debian/patches/bashisms.patch
@@ -0,0 +1,19 @@
+Index: softgun-0.16/Makefile
+===================================================================
+--- softgun-0.16.orig/Makefile
++++ softgun-0.16/Makefile
+@@ -56,10 +56,10 @@ $(SUBDIRS):
+       @if [ -d $@ ]; then make -C $@; fi
+       
+ version.c:
+-      $(shell echo -ne "/*\n * This file is automatically generated\n */\n" > 
$@;) \
+-      $(shell echo -ne "#include <version.h>\nconst char *softgun_version = 
\"" 
>> $@;) \
+-      $(shell x=$(CURDIR); echo -n $${x##*/} >> $@;) \
+-      $(shell echo "\";" >> $@;) 
++      $(shell printf "/*\n * This file is automatically generated\n */\n" > 
$@;) 
\
++      $(shell printf "#include <version.h>\nconst char *softgun_version = \"" 
>> 
$@;) \
++      $(shell x=$(CURDIR); printf $${x##*/} >> $@;) \
++      $(shell printf "\";\n" >> $@;) 
+ 
+ install: $(INSTALL_BINS)
+       @for f in $(INSTALL_BINS); do \

Attachment: signature.asc
Description: This is a digitally signed message part.

Reply via email to