[Pkg-gnupg-commit] r212 - in /gnupg/trunk/debian: README.source changelog control rules source/ source/format

[thijs at users.alioth.debian.org]

Author: thijs
Date: Mon Feb 20 20:29:34 2012
New Revision: 212

URL: http://svn.debian.org/wsvn/pkg-gnupg/?sc=1&rev=212
Log:
as we're now on 0 patches and dpatch is supposedly obsoleted, take
the opportunity to switch to src fmt 3.0

Added:
    gnupg/trunk/debian/source/
    gnupg/trunk/debian/source/format
Removed:
    gnupg/trunk/debian/README.source
Modified:
    gnupg/trunk/debian/changelog
    gnupg/trunk/debian/control
    gnupg/trunk/debian/rules

Modified: gnupg/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnupg/gnupg/trunk/debian/changelog?rev=212&op=diff
==============================================================================
--- gnupg/trunk/debian/changelog (original)
+++ gnupg/trunk/debian/changelog Mon Feb 20 20:29:34 2012
@@ -1,8 +1,9 @@
 gnupg (1.4.12-1) experimental; urgency=low
 
   * New upstream release.
-
- -- Thijs Kinkhorst <thijs at debian.org>  Mon, 20 Feb 2012 20:11:10 +0100
+  * Switch to dpkg-source 3.0 (quilt) format.
+
+ -- Thijs Kinkhorst <thijs at debian.org>  Mon, 20 Feb 2012 20:42:56 +0100
 
 gnupg (1.4.11-3) unstable; urgency=low
 

Modified: gnupg/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnupg/gnupg/trunk/debian/control?rev=212&op=diff
==============================================================================
--- gnupg/trunk/debian/control (original)
+++ gnupg/trunk/debian/control Mon Feb 20 20:29:34 2012
@@ -8,7 +8,7 @@
 Standards-Version: 3.9.2
 Build-Depends: debhelper (>> 7), libz-dev, libldap2-dev, libbz2-dev,
  libusb-dev [!hurd-i386],
- libreadline-dev, file, gettext, dpatch,
+ libreadline-dev, file, gettext, 
  libcurl4-gnutls-dev
 Build-Depends-Indep: mingw32
 Homepage: http://www.gnupg.org

Modified: gnupg/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnupg/gnupg/trunk/debian/rules?rev=212&op=diff
==============================================================================
--- gnupg/trunk/debian/rules (original)
+++ gnupg/trunk/debian/rules Mon Feb 20 20:29:34 2012
@@ -8,8 +8,6 @@
 # my name from the file itself.  (I assert my moral right of
 # paternity under the Copyright, Designs and Patents Act 1988.)
 # This file may have to be extensively modified
-
-include /usr/share/dpatch/dpatch.make
 
 ################################## variables #################################
 
@@ -60,7 +58,7 @@
 
 ##################################### build ##################################
 
-build-deb-stamp: patch-stamp build-deb/config.status
+build-deb-stamp: build-deb/config.status
 	dh_testdir
 	$(MAKE) -C build-deb/
 ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
@@ -68,7 +66,7 @@
 endif
 	touch $@
 
-build-deb-curl-stamp: patch-stamp build-deb-curl/config.status
+build-deb-curl-stamp: build-deb-curl/config.status
 	dh_testdir
 	$(MAKE) -C build-deb-curl/
 ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
@@ -76,12 +74,12 @@
 endif
 	touch $@
 
-build-udeb-stamp: patch-stamp build-udeb/config.status
+build-udeb-stamp: build-udeb/config.status
 	dh_testdir
 	$(MAKE) -C build-udeb/
 	touch $@
 
-build-win32-stamp: patch-stamp build-win32/config.status
+build-win32-stamp: build-win32/config.status
 	dh_testdir
 	$(MAKE) -C build-win32/
 	touch $@
@@ -92,12 +90,12 @@
 
 ##################################### clean ##################################
 
-clean: unpatch
+clean: 
 	dh_testdir
 	dh_testroot
 	rm -rf build-udeb/ build-deb-curl/ build-deb/ build-win32/
 	# find . -name \*~ | xargs rm -vf
-	dh_clean build-deb-stamp build-deb-curl-stamp build-udeb-stamp build-win32-stamp patch-stamp
+	dh_clean build-deb-stamp build-deb-curl-stamp build-udeb-stamp build-win32-stamp
 
 #################################### install #################################
 

Added: gnupg/trunk/debian/source/format
URL: http://svn.debian.org/wsvn/pkg-gnupg/gnupg/trunk/debian/source/format?rev=212&op=file
==============================================================================
--- gnupg/trunk/debian/source/format (added)
+++ gnupg/trunk/debian/source/format Mon Feb 20 20:29:34 2012
@@ -1,0 +1,1 @@
+3.0 (quilt)