[Python-modules-commits] r15112 - in packages/sphinx/branches/1.0/debian (4 files)

[jwilk at users.alioth.debian.org]

    Date: Saturday, December 18, 2010 @ 12:15:55
  Author: jwilk
Revision: 15112

Switch to source format 3.0 (quilt).

Modified:
  packages/sphinx/branches/1.0/debian/changelog
  packages/sphinx/branches/1.0/debian/patches/move_static_files_outside_site-packages.patch
  packages/sphinx/branches/1.0/debian/source/format
Deleted:
  packages/sphinx/branches/1.0/debian/README.source

Deleted: packages/sphinx/branches/1.0/debian/README.source
===================================================================
--- packages/sphinx/branches/1.0/debian/README.source	2010-12-18 11:35:58 UTC (rev 15111)
+++ packages/sphinx/branches/1.0/debian/README.source	2010-12-18 12:15:55 UTC (rev 15112)
@@ -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/sphinx/branches/1.0/debian/changelog
===================================================================
--- packages/sphinx/branches/1.0/debian/changelog	2010-12-18 11:35:58 UTC (rev 15111)
+++ packages/sphinx/branches/1.0/debian/changelog	2010-12-18 12:15:55 UTC (rev 15112)
@@ -5,11 +5,14 @@
   * Fix formatting of the manual pages.
   * Update and significantly rewrite manual pages (closes: #593623).
   * Point Vcs-* fields to the 1.0 branch.
+  * Switch to source format 3.0 (quilt).
+    + Drop README.source.
+    + Refresh patches.
 
   [ Stefano Rivera ]
   * Improve language and clarify options in manpages.
 
- -- Jakub Wilk <jwilk at debian.org>  Mon, 30 Aug 2010 18:10:56 +0200
+ -- Jakub Wilk <jwilk at debian.org>  Sat, 18 Dec 2010 12:44:04 +0100
 
 sphinx (1.0.1-1) experimental; urgency=low
 

Modified: packages/sphinx/branches/1.0/debian/patches/move_static_files_outside_site-packages.patch
===================================================================
--- packages/sphinx/branches/1.0/debian/patches/move_static_files_outside_site-packages.patch	2010-12-18 11:35:58 UTC (rev 15111)
+++ packages/sphinx/branches/1.0/debian/patches/move_static_files_outside_site-packages.patch	2010-12-18 12:15:55 UTC (rev 15112)
@@ -1,12 +1,10 @@
 # move static files outside site-packages so that they can be shared between
 # different Python versions
-Index: sphinx-1.0~b1/sphinx/__init__.py
-===================================================================
---- sphinx-1.0~b1.orig/sphinx/__init__.py
-+++ sphinx-1.0~b1/sphinx/__init__.py
-@@ -15,7 +15,7 @@ from os import path
- __version__ = '1.0b1'
- __released__ = '1.0b1'  # used when Sphinx builds its own docs
+--- a/sphinx/__init__.py
++++ b/sphinx/__init__.py
+@@ -15,7 +15,7 @@
+ __version__  = '1.0.5'
+ __released__ = '1.0.5'  # used when Sphinx builds its own docs
  
 -package_dir = path.abspath(path.dirname(__file__))
 +package_dir = '/usr/share/sphinx/'

Modified: packages/sphinx/branches/1.0/debian/source/format
===================================================================
--- packages/sphinx/branches/1.0/debian/source/format	2010-12-18 11:35:58 UTC (rev 15111)
+++ packages/sphinx/branches/1.0/debian/source/format	2010-12-18 12:15:55 UTC (rev 15112)
@@ -1 +1 @@
-1.0
+3.0 (quilt)