[Python-apps-commits] r2778 - in packages/osc/trunk/debian (README.source changelog)

[nijel at users.alioth.debian.org]

    Date: Monday, April 20, 2009 @ 10:45:08
  Author: nijel
Revision: 2778

* Update README.source:
  - Mention quilt (it replaced dpatch in 0.114-1).
  - No need to extract sources from rpm.

Modified:
  packages/osc/trunk/debian/README.source
  packages/osc/trunk/debian/changelog

Modified: packages/osc/trunk/debian/README.source
===================================================================
--- packages/osc/trunk/debian/README.source	2009-04-20 10:43:26 UTC (rev 2777)
+++ packages/osc/trunk/debian/README.source	2009-04-20 10:45:08 UTC (rev 2778)
@@ -1,20 +1,57 @@
-OSC source package
-==================
+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.
 
-This package does not have proper upstream tarballs. They are directly
-accessible only for people having account in SUSE Build Service. However
-source rpms are publicly available and they do contain tarball.
-Target get-orig-source from debian/rules does download rpm and extract
-tarball from it.
+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:
 
-The used patch system is dpatch.
+    for where in ./ ../ ../../ ../../../ ../../../../ ../../../../../; do
+        if [ -e ${where}debian/rules -a -d ${where}debian/patches ]; then
+                export QUILT_PATCHES=debian/patches
+        fi
+    done
 
-To patch the source:
- * debian/rules patch
-To add a new patch:
- * put it under debian/patches
- * add it to debian/patches/00list
+To get the fully patched source after unpacking the source package, cd to
+the root level of the source package and run:
 
-See /usr/share/doc/dpatch for more information.
+    quilt push -a
 
- -- Michal ÄŒihaÅ™ <nijel at debian.org>  Tue, 29 Apr 2008 15:38:44 +0200
+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-04-20 10:43:26 UTC (rev 2777)
+++ packages/osc/trunk/debian/changelog	2009-04-20 10:45:08 UTC (rev 2778)
@@ -2,8 +2,11 @@
 
   * NOT RELEASED YET
   * Change watch file to use tarballs now exported by buildservice.
+  * Update README.source:
+    - Mention quilt (it replaced dpatch in 0.114-1).
+    - No need to extract sources from rpm.
 
- -- Michal ÄŒihaÅ™ <nijel at debian.org>  Mon, 20 Apr 2009 12:43:06 +0200
+ -- Michal ÄŒihaÅ™ <nijel at debian.org>  Mon, 20 Apr 2009 12:44:20 +0200
 
 osc (0.116-1) unstable; urgency=low