[Python-apps-commits] r2871 - in packages/osc/trunk/debian (5 files)

[nijel at users.alioth.debian.org]

    Date: Wednesday, May 6, 2009 @ 11:54:44
  Author: nijel
Revision: 2871

Drop patches merged upstream, no need for quilt anymore.

Modified:
  packages/osc/trunk/debian/changelog
  packages/osc/trunk/debian/control
  packages/osc/trunk/debian/rules
Deleted:
  packages/osc/trunk/debian/README.source
  packages/osc/trunk/debian/patches/

Deleted: packages/osc/trunk/debian/README.source
===================================================================
--- packages/osc/trunk/debian/README.source	2009-05-05 17:50:12 UTC (rev 2870)
+++ packages/osc/trunk/debian/README.source	2009-05-06 11:54:44 UTC (rev 2871)
@@ -1,57 +0,0 @@
-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
-        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/osc/trunk/debian/changelog
===================================================================
--- packages/osc/trunk/debian/changelog	2009-05-05 17:50:12 UTC (rev 2870)
+++ packages/osc/trunk/debian/changelog	2009-05-06 11:54:44 UTC (rev 2871)
@@ -1,8 +1,9 @@
 osc (0.117-3) UNRELEASED; urgency=low
 
   * NOT RELEASED YET
+  * Drop patches merged upstream, no need for quilt anymore.
 
- -- Michal ÄŒihaÅ™ <nijel at debian.org>  Tue, 05 May 2009 14:20:53 +0200
+ -- Michal ÄŒihaÅ™ <nijel at debian.org>  Wed, 06 May 2009 13:54:17 +0200
 
 osc (0.117-2) unstable; urgency=low
 

Modified: packages/osc/trunk/debian/control
===================================================================
--- packages/osc/trunk/debian/control	2009-05-05 17:50:12 UTC (rev 2870)
+++ packages/osc/trunk/debian/control	2009-05-06 11:54:44 UTC (rev 2871)
@@ -3,7 +3,7 @@
 Priority: extra
 Maintainer: Michal ÄŒihaÅ™ <nijel at debian.org>
 Uploaders: Python Applications Packaging Team <python-apps-team at lists.alioth.debian.org>
-Build-Depends: debhelper (>= 7.0.50), quilt (>= 0.40)
+Build-Depends: debhelper (>= 7.0.50)
 Build-Depends-Indep: python-dev, python-support (>= 0.5.3)
 Standards-Version: 3.8.1
 Vcs-Svn: svn://svn.debian.org/svn/python-apps/packages/osc/trunk

Modified: packages/osc/trunk/debian/rules
===================================================================
--- packages/osc/trunk/debian/rules	2009-05-05 17:50:12 UTC (rev 2870)
+++ packages/osc/trunk/debian/rules	2009-05-06 11:54:44 UTC (rev 2871)
@@ -9,18 +9,16 @@
 VERSION = $(shell dpkg-parsechangelog | grep Version | sed "s/Version: //")
 UPSTREAM_VERSION = $(shell echo $(VERSION) | sed 's/\([^-].*\)-.*/\1/')
 
-include /usr/share/quilt/quilt.make
-
 override_dh_installchangelogs:
 	dh_installchangelogs NEWS
 
 build: build-stamp
 
-build-stamp: $(QUILT_STAMPFN)
+build-stamp:
 	dh build
 	touch $@
 
-clean: unpatch
+clean:
 	dh clean
 
 install: build