[Python-modules-commits] r8263 - in packages/elementtree/trunk/debian (9 files)

Thu Apr 16 10:01:14 UTC 2009

Date: Thursday, April 16, 2009 @ 10:01:13
  Author: bzed
Revision: 8263

* Medium urgency as the package can't be upgraded in testing.
  - Replace CDBS by dh(7). 

Added:
  packages/elementtree/trunk/debian/patches/00dpatch.conf
  packages/elementtree/trunk/debian/patches/00list
  packages/elementtree/trunk/debian/patches/eggify.dpatch
  packages/elementtree/trunk/debian/python-elementtree.install
Modified:
  packages/elementtree/trunk/debian/changelog
  packages/elementtree/trunk/debian/compat
  packages/elementtree/trunk/debian/control
  packages/elementtree/trunk/debian/rules
Deleted:
  packages/elementtree/trunk/debian/patches/eggify.diff

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

--- packages/elementtree/trunk/debian/changelog	2009-04-16 09:14:48 UTC (rev 8262)
+++ packages/elementtree/trunk/debian/changelog	2009-04-16 10:01:13 UTC (rev 8263)
@@ -1,4 +1,4 @@
-elementtree (1.2.6-14) UNRELEASED; urgency=high
+elementtree (1.2.6-14) UNRELEASED; urgency=medium
 
   [ Josselin Mouette ]
   * Manually bump build-dependency and dependency on python-support to 
@@ -6,11 +6,12 @@
     a dependency on python (<< 2.5). Closes: #524303.
 
   [ Bernd Zeimetz ]
-  * High urgency as the package can't be upgraded in testing.
+  * Medium urgency as the package can't be upgraded in testing.
   * debian/rules, debian/control:
     - Create python-support version dependency automatically.
+    - Replace CDBS by dh(7). 
 
- -- Bernd Zeimetz <bzed at debian.org>  Thu, 16 Apr 2009 11:11:07 +0200
+ -- Bernd Zeimetz <bzed at debian.org>  Thu, 16 Apr 2009 12:02:13 +0200
 
 elementtree (1.2.6-13) unstable; urgency=medium
 

Modified: packages/elementtree/trunk/debian/compat
===================================================================
--- packages/elementtree/trunk/debian/compat	2009-04-16 09:14:48 UTC (rev 8262)
+++ packages/elementtree/trunk/debian/compat	2009-04-16 10:01:13 UTC (rev 8263)
@@ -1 +1 @@
-5
+7

Modified: packages/elementtree/trunk/debian/control
===================================================================
--- packages/elementtree/trunk/debian/control	2009-04-16 09:14:48 UTC (rev 8262)
+++ packages/elementtree/trunk/debian/control	2009-04-16 10:01:13 UTC (rev 8263)
@@ -4,7 +4,7 @@
 Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org> 
 Uploaders: Torsten Marek <shlomme at debian.org>, Bernd Zeimetz <bzed at debian.org>
 Build-Depends-Indep: python-setuptools (>= 0.6b3)
-Build-Depends: debhelper (>= 5.0.38), cdbs (>= 0.4.43), python2.4-dev, python-support (>= 1.0), patchutils (>= 0.2.25)
+Build-Depends: debhelper (>= 7.0.50), python2.4-dev, python-support (>= 1.0), dpatch
 Standards-Version: 3.8.1
 Homepage: http://effbot.org/zone/element-index.htm
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/elementtree/trunk/
@@ -12,7 +12,7 @@
 
 Package: python-elementtree
 Architecture: all
-Depends: ${misc:Depends}, ${pysupport:Depends}
+Depends: ${misc:Depends}, ${python:Depends}
 Provides: ${python:Provides}
 Replaces: python2.3-elementtree, python2.4-elementtree
 Conflicts: python2.3-elementtree, python2.4-elementtree

Added: packages/elementtree/trunk/debian/patches/00dpatch.conf
===================================================================
--- packages/elementtree/trunk/debian/patches/00dpatch.conf	                        (rev 0)
+++ packages/elementtree/trunk/debian/patches/00dpatch.conf	2009-04-16 10:01:13 UTC (rev 8263)
@@ -0,0 +1,2 @@
+conf_debianonly=1
+conf_origtargzpath=../tarballs

Added: packages/elementtree/trunk/debian/patches/00list
===================================================================
--- packages/elementtree/trunk/debian/patches/00list	                        (rev 0)
+++ packages/elementtree/trunk/debian/patches/00list	2009-04-16 10:01:13 UTC (rev 8263)
@@ -0,0 +1 @@
+eggify.dpatch

Deleted: packages/elementtree/trunk/debian/patches/eggify.diff
===================================================================
--- packages/elementtree/trunk/debian/patches/eggify.diff	2009-04-16 09:14:48 UTC (rev 8262)
+++ packages/elementtree/trunk/debian/patches/eggify.diff	2009-04-16 10:01:13 UTC (rev 8263)
@@ -1,10 +0,0 @@
---- elementtree-1.2.6.old/setup.py	2006-04-18 12:25:33.000000000 +0000
-+++ elementtree-1.2.6/setup.py	2006-04-18 12:26:30.000000000 +0000
-@@ -7,6 +7,7 @@
- #
- 
- from distutils.core import setup
-+from setuptools import setup
- 
- try:
-     # add download_url syntax to distutils

Added: packages/elementtree/trunk/debian/patches/eggify.dpatch
===================================================================
--- packages/elementtree/trunk/debian/patches/eggify.dpatch	                        (rev 0)
+++ packages/elementtree/trunk/debian/patches/eggify.dpatch	2009-04-16 10:01:13 UTC (rev 8263)
@@ -0,0 +1,17 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## eggify.dpatch by Bernd Zeimetz <bzed at debian.org>
+##
+## DP: eggify the package.
+
+ at DPATCH@
+diff -urNad elementtree~/setup.py elementtree/setup.py
+--- elementtree~/setup.py	2005-03-25 10:42:42.000000000 +0100
++++ elementtree/setup.py	2009-04-16 11:49:24.000000000 +0200
+@@ -7,6 +7,7 @@
+ #
+ 
+ from distutils.core import setup
++from setuptools import setup
+ 
+ try:
+     # add download_url syntax to distutils


Property changes on: packages/elementtree/trunk/debian/patches/eggify.dpatch
___________________________________________________________________
Added: svn:executable
   + *

Added: packages/elementtree/trunk/debian/python-elementtree.install
===================================================================
--- packages/elementtree/trunk/debian/python-elementtree.install	                        (rev 0)
+++ packages/elementtree/trunk/debian/python-elementtree.install	2009-04-16 10:01:13 UTC (rev 8263)
@@ -0,0 +1 @@
+debian/tmp/usr/* usr

Modified: packages/elementtree/trunk/debian/rules
===================================================================
--- packages/elementtree/trunk/debian/rules	2009-04-16 09:14:48 UTC (rev 8262)
+++ packages/elementtree/trunk/debian/rules	2009-04-16 10:01:13 UTC (rev 8263)
@@ -1,17 +1,25 @@
 #!/usr/bin/make -f
 
-DEB_PYTHON_SYSTEM=pysupport
+include /usr/share/dpatch/dpatch.make
 
-pysupport_version := $(shell dpkg -s python-support | awk '/^Version/ {print $2}')
+build: $(DPATCH_STAMPFN) build-stamp
+build-stamp:
+	dh build
+	touch $@
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/python-distutils.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+%:
+	dh $@
 
-# Install egg-info directories
-DEB_PYTHON_INSTALL_ARGS_ALL += --single-version-externally-managed
-DEB_DESTDIR=debian/python-elementtree
+override_dh_pysupport:
+	dh_pysupport
+	#dh_pysupport adds wrong dependencies here, we strip all of them
+	#except python-support
+	sed -i '/^python:Depends/ s,\(^[^=]*=\).*\(python-support ([^)]*)\).*,\1\2,' \
+	      debian/python-elementtree.substvars
 
-binary/python-elementtree::
-	echo 'pysupport:Depends=python-support (>= $(pysupport_version))' >> debian/python-elementtree.substvars
+clean: clean-patched unpatch
+clean-patched:
+	dh clean
+	rm -f build-stamp
 
+.PHONY: patch unpatch clean clean-patched build override_dh_pysupport


