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

[jwilk at users.alioth.debian.org]

    Date: Saturday, December 18, 2010 @ 12:27:55
  Author: jwilk
Revision: 15113

Finish the 3.0 (quilt) conversion.

Modified:
  packages/sphinx/branches/1.0/debian/changelog
  packages/sphinx/branches/1.0/debian/control
  packages/sphinx/branches/1.0/debian/rules

Modified: packages/sphinx/branches/1.0/debian/changelog
===================================================================
--- packages/sphinx/branches/1.0/debian/changelog	2010-12-18 12:15:55 UTC (rev 15112)
+++ packages/sphinx/branches/1.0/debian/changelog	2010-12-18 12:27:55 UTC (rev 15113)
@@ -8,6 +8,8 @@
   * Switch to source format 3.0 (quilt).
     + Drop README.source.
     + Refresh patches.
+    + Update debian/rules.
+    + Drop quilt from build-depends.
 
   [ Stefano Rivera ]
   * Improve language and clarify options in manpages.

Modified: packages/sphinx/branches/1.0/debian/control
===================================================================
--- packages/sphinx/branches/1.0/debian/control	2010-12-18 12:15:55 UTC (rev 15112)
+++ packages/sphinx/branches/1.0/debian/control	2010-12-18 12:27:55 UTC (rev 15113)
@@ -4,7 +4,7 @@
 Maintainer: Mikhail Gusarov <dottedmag at dottedmag.net>
 Uploaders: Jakub Wilk <jwilk at debian.org>, Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Homepage: http://sphinx.pocoo.org/
-Build-Depends: debhelper (>= 7), python-all (>= 2.5.4-1~), python-setuptools (>= 0.6c5-1~), quilt (>= 0.40)
+Build-Depends: debhelper (>= 7), python-all (>= 2.5.4-1~), python-setuptools (>= 0.6c5-1~)
 Build-Depends-Indep: python-support (>= 0.6.4), python-docutils, python-pygments (>= 0.8), python-jinja2 (>= 2.1)
 Standards-Version: 3.9.1
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/sphinx/branches/1.0/

Modified: packages/sphinx/branches/1.0/debian/rules
===================================================================
--- packages/sphinx/branches/1.0/debian/rules	2010-12-18 12:15:55 UTC (rev 15112)
+++ packages/sphinx/branches/1.0/debian/rules	2010-12-18 12:27:55 UTC (rev 15113)
@@ -1,7 +1,6 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
 
-include /usr/share/quilt/quilt.make
 include /usr/share/python/python.mk
 
 PACKAGE_NAME=python-sphinx
@@ -16,19 +15,16 @@
 	python sphinx-build.py doc _build/html
 	touch build-stamp
 
-clean: clean-patched unpatch
+clean:
 	dh_testdir
 	dh_testroot
+	python setup.py clean
 	find . -name '*.py[co]' -delete
 	rm -rf _build build
 	dh_clean sphinx/pycode/*.pickle
 
-clean-patched: patch
+install: build
 	dh_testdir
-	python setup.py clean
-
-install: build patch
-	dh_testdir
 	dh_testroot
 	dh_installdirs