[Python-modules-commits] r7492 - in packages/quixote/trunk/debian (4 files)

Thu Feb 12 18:11:03 UTC 2009

Date: Thursday, February 12, 2009 @ 18:11:01
  Author: malex
Revision: 7492

Update for new policy and to fix #514762

Modified:
  packages/quixote/trunk/debian/changelog
  packages/quixote/trunk/debian/control
  packages/quixote/trunk/debian/rules
Deleted:
  packages/quixote/trunk/debian/pyversions

Modified: packages/quixote/trunk/debian/changelog
===================================================================

--- packages/quixote/trunk/debian/changelog	2009-02-12 10:35:57 UTC (rev 7491)
+++ packages/quixote/trunk/debian/changelog	2009-02-12 18:11:01 UTC (rev 7492)
@@ -1,6 +1,17 @@
-quixote (2.5-4) UNRELEASED; urgency=low
+quixote (2.5-4) unstable; urgency=low
 
-  [ Carlos Galisteo ]
+  [Oleksandr Moskalenko]
+  * Fix the build targets (Closes: #514762).
+  * debian/control:
+    - Updated Standards-Version to 3.8.0.
+    - Moved python-support to Build-Depends-Indep.
+    - Removed python from Build-Depends.
+    - Changed Architecture to all.
+  * debian/rules:
+    - Clean up the header.
+    - Rework the rules to conform to the current Debian python packaging
+      guidelines.
+
   [Carlos Galisteo]
   * debian/control
     - Added Homepage field.
@@ -9,7 +20,7 @@
   * debian/control
     - switch Vcs-Browser field to viewsvn
 
- -- Carlos Galisteo <cgalisteo at k-rolus.net>  Tue, 08 Jul 2008 10:58:03 +0000
+ -- Oleksandr Moskalenko <malex at debian.org>  Thu, 12 Feb 2009 09:40:34 -0700
 
 quixote (2.5-3) unstable; urgency=low
 

Modified: packages/quixote/trunk/debian/control
===================================================================
--- packages/quixote/trunk/debian/control	2009-02-12 10:35:57 UTC (rev 7491)
+++ packages/quixote/trunk/debian/control	2009-02-12 18:11:01 UTC (rev 7492)
@@ -3,21 +3,21 @@
 Priority: optional
 Maintainer: Oleksandr Moskalenko <malex at debian.org>
 Uploaders: Neil Schemenauer <nas at debian.org>, Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
-Build-Depends: dpatch, debhelper (>= 5.0.37.1), python (>= 2.3.3), python-all-dev (>= 2.3.5-11), python-support (>= 0.6.4), python-setuptools (>= 0.6b3-1)
-Standards-Version: 3.7.2
+Build-Depends: dpatch, debhelper (>= 5), python-all-dev, python-setuptools (>= 0.6b3), python-support (>= 0.6.4)
+Standards-Version: 3.8.0
 XS-Python-Version: all
+Homepage: http://www.mems-exchange.org/software/quixote/
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/quixote/trunk/
 Vcs-Browser: http://svn.debian.org/viewsvn/python-modules/packages/quixote/trunk/
-Homepage: http://www.mems-exchange.org/software/quixote/
 
 Package: python-quixote
 Architecture: any
-Depends: ${python:Depends}, python (>= 2.3.3)
-Recommends: python-quixote-doc
+Depends: ${python:Depends}, python
+Recommends: python-quixote-doc, python (>=2.4)
 Replaces: quixote (<< 2.4-6), python2.3-quixote (<< 2.4-6), python2.4-quixote (<< 2.4-6)
 Conflicts: quixote (<< 2.4-6), python2.3-quixote (<< 2.4-6), python2.4-quixote (<< 2.4-6)
+XB-Python-Version: ${python:Versions}
 Provides: ${python:Provides}
-XB-Python-Version: ${python:Versions}
 Description: A highly Pythonic Web application framework
  Quixote is yet another framework for developing Web applications in
  Python.  The design goals were:

Deleted: packages/quixote/trunk/debian/pyversions
===================================================================
--- packages/quixote/trunk/debian/pyversions	2009-02-12 10:35:57 UTC (rev 7491)
+++ packages/quixote/trunk/debian/pyversions	2009-02-12 18:11:01 UTC (rev 7492)
@@ -1 +0,0 @@
-2.4

Modified: packages/quixote/trunk/debian/rules
===================================================================
--- packages/quixote/trunk/debian/rules	2009-02-12 10:35:57 UTC (rev 7491)
+++ packages/quixote/trunk/debian/rules	2009-02-12 18:11:01 UTC (rev 7492)
@@ -1,39 +1,10 @@
 #!/usr/bin/make -f
-# GNU copyright 1997 to 1999 by Joey Hess.
+# -*- makefile -*-
 #export DH_VERBOSE=1
-
 package=python-quixote
-DEBIAN_DIR = $(shell pwd)/debian
-DEB_UPSTREAM_VERSION=$(shell dpkg-parsechangelog \
-	| grep ^Version: | cut -d ' ' -f 2 | cut -d '-' -f 1)
-PYVER=$(shell pyversions -vd)
-PYVERS=$(shell pyversions -vr)
 
+include /usr/share/dpatch/dpatch.make
 
-ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -g
-endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-	INSTALL_PROGRAM += -s
-endif
-
-build: patch-stamp build-stamp
-
-patch-stamp:
-	dpatch apply-all
-	touch patch-stamp
-
-build-stamp: $(PYVERS:%=build-ext-%)
-	touch $@
-build-ext-%:
-	dh_testdir
-	python$* setup.py build -g
-	touch $@
-
-unpatch:
-	dpatch deapply-all
-	rm -rf patch-stamp debian/patched
-
 clean: unpatch
 	dh_testdir
 	dh_testroot
@@ -43,45 +14,43 @@
 	find . -name '*.pyc' -exec rm {} \;
 	dh_clean
 
-install-prereq:
+build-stamp:
 	dh_testdir
+	python setup.py build
+	touch $@
+
+build: patch-stamp build-stamp
+
+install: build
+	dh_testdir
 	dh_testroot
 	dh_clean -k
 	dh_installdirs
-
-install-stamp: $(PYVERS:%=install-ext-%)
-	touch $@
-install-ext-%:
-	python$* setup.py install \
+	python setup.py install \
 		--no-compile \
 		--single-version-externally-managed \
-		--root $(DEBIAN_DIR)/$(package)
+		--root $(CURDIR)/debian/$(package)
 
-install: build install-prereq install-stamp
-
 binary-indep: build install
-
-binary-arch: build install
 	dh_testdir
 	dh_testroot
 	dh_installchangelogs CHANGES.txt
 	dh_installdocs
 	dh_installexamples
-	install -m 644 debian/python-quixote.lintian \
+	dh_compress -X.cgi -X.py -X.conf
+#	install -m 644 debian/python-quixote.lintian \
 		$(DEBIAN_DIR)/$(package)/usr/share/lintian/overrides/python-quixote
-	install -m 644 debian/python-quixote-doc.lintian \
+#	install -m 644 debian/python-quixote-doc.lintian \
 		$(DEBIAN_DIR)/$(package)-doc/usr/share/lintian/overrides/python-quixote-doc
-	dh_link
-	dh_strip
-	dh_compress -X.cgi -X.py -X.conf
 	dh_fixperms
-	rm -f $(DEBIAN_DIR)/python-quixote-doc/usr/share/doc/python-quixote-doc/INSTALL.*
 	dh_pysupport
-	dh_python
+	rm -f $(DEBIAN_DIR)/python-quixote-doc/usr/share/doc/python-quixote-doc/INSTALL.*
 	dh_installdeb
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb
 
+binary-arch:
+
 binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
+.PHONY: build clean binary-indep binary-arch binary install patch unpatch


