tags 643489 + patch
thanks

Dear maintainer,

I've prepared an NMU for ploader (versioned as 1.6.0-1.1). The diff
is attached to this message.

Regards.
diff -Nru ploader-1.6.0/debian/changelog ploader-1.6.0/debian/changelog
--- ploader-1.6.0/debian/changelog	2010-06-15 14:18:06.000000000 +0200
+++ ploader-1.6.0/debian/changelog	2011-11-15 22:18:52.000000000 +0100
@@ -1,3 +1,15 @@
+ploader (1.6.0-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Don't mix source format 3.0 (quilt) and manual usage of quilt:
+    - Drop the --with quilt debhelper addon;
+    - Don't rename the binary by moving it around in the build process, rather
+      rename it after install;
+    - Drop superfluous quilt Build-Depends.
+    Closes: #643489.
+
+ -- Didier Raboud <o...@debian.org>  Tue, 15 Nov 2011 22:18:40 +0100
+
 ploader (1.6.0-1) unstable; urgency=low
   * New upstream release
 
diff -Nru ploader-1.6.0/debian/control ploader-1.6.0/debian/control
--- ploader-1.6.0/debian/control	2010-06-15 14:18:06.000000000 +0200
+++ ploader-1.6.0/debian/control	2011-11-15 22:06:48.000000000 +0100
@@ -2,7 +2,7 @@
 Section: utils
 Priority: optional
 Maintainer: Nicolas Roudaire <nikro...@gmail.com>
-Build-Depends: debhelper (>= 7.0.50), quilt (>= 0.46-7~)
+Build-Depends: debhelper (>= 7.0.50)
 Standards-Version: 3.8.4
 Homepage: http://piwigo.org
 
diff -Nru ploader-1.6.0/debian/install ploader-1.6.0/debian/install
--- ploader-1.6.0/debian/install	2010-06-15 14:18:06.000000000 +0200
+++ ploader-1.6.0/debian/install	2011-11-15 22:14:37.000000000 +0100
@@ -4,5 +4,5 @@
 src/properties.ini              usr/share/ploader/conf
 src/pLoader.ini                 usr/share/ploader/conf
 src/Uploader                    usr/share/perl5
-src/ploader                     usr/bin
+src/ploader.pl                  usr/bin
 debian/imgs/ploader.xpm         usr/share/pixmaps
diff -Nru ploader-1.6.0/debian/rules ploader-1.6.0/debian/rules
--- ploader-1.6.0/debian/rules	2010-06-15 14:18:06.000000000 +0200
+++ ploader-1.6.0/debian/rules	2011-11-15 22:18:36.000000000 +0100
@@ -9,17 +9,9 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-
-include /usr/share/quilt/quilt.make
-
 %:
-	dh --with quilt $@
-
-override_dh_quilt_patch:
-	dh_quilt_patch	
-	[ -f src/ploader ] || mv src/ploader.pl src/ploader
-
-override_dh_quilt_unpatch:
-	[ -f src/ploader.pl ] || mv src/ploader src/ploader.pl
-	dh_quilt_unpatch
+	dh $@
 
+override_dh_install:
+	dh_install
+	mv debian/ploader/usr/bin/ploader.pl debian/ploader/usr/bin/ploader

Reply via email to