[Python-modules-commits] r4581 - in packages/migrate/trunk/debian (7 files)

Tue Feb 19 22:49:43 UTC 2008

Date: Tuesday, February 19, 2008 @ 22:49:41
  Author: piotr
Revision: 4581

* Add disable_py patch to prevent downloading "Py" Egg
  + python-codespeak-lib and dpatch added to Build-Depends
* remove usr/lib *after* calling dh_pycentral

Added:
  packages/migrate/trunk/debian/patches/
  packages/migrate/trunk/debian/patches/00dpatch.conf
  packages/migrate/trunk/debian/patches/00list
  packages/migrate/trunk/debian/patches/disable_py.dpatch
Modified:
  packages/migrate/trunk/debian/changelog
  packages/migrate/trunk/debian/control
  packages/migrate/trunk/debian/rules

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

--- packages/migrate/trunk/debian/changelog	2008-02-19 19:59:03 UTC (rev 4580)
+++ packages/migrate/trunk/debian/changelog	2008-02-19 22:49:41 UTC (rev 4581)
@@ -1,9 +1,15 @@
 migrate (0.4.2-1) unstable; urgency=low
 
+  [ Jan Dittberner ]
   * New upstream release
   * debian/watch changed due to renamed upstream source archive
   * changed debian/rules to use the new .egg-info name
 
+  [ Piotr OÅ¼arowski ]
+  * Add disable_py patch to prevent downloading "Py" Egg
+    + python-codespeak-lib and dpatch added to Build-Depends
+  * remove usr/lib *after* calling dh_pycentral
+
  -- Jan Dittberner <jan at dittberner.info>  Tue, 19 Feb 2008 19:45:35 +0100
 
 migrate (0.4.1-1) unstable; urgency=medium

Modified: packages/migrate/trunk/debian/control
===================================================================
--- packages/migrate/trunk/debian/control	2008-02-19 19:59:03 UTC (rev 4580)
+++ packages/migrate/trunk/debian/control	2008-02-19 22:49:41 UTC (rev 4581)
@@ -3,8 +3,8 @@
 Priority: optional
 Maintainer: Jan Dittberner <jan at dittberner.info>
 Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
-Build-Depends: debhelper (>= 5.0.38)
-Build-Depends-Indep: python (>= 2.4), python-all-dev, python-central (>= 0.5.6), python-setuptools (>= 0.6b3), python-docutils
+Build-Depends: debhelper (>= 5.0.38), dpatch
+Build-Depends-Indep: python (>= 2.4), python-all-dev, python-central (>= 0.5.6), python-setuptools (>= 0.6b3), python-docutils, python-codespeak-lib
 Standards-Version: 3.7.3
 XS-Python-Version: >= 2.4
 Homepage: http://code.google.com/p/sqlalchemy-migrate/

Added: packages/migrate/trunk/debian/patches/00dpatch.conf
===================================================================
--- packages/migrate/trunk/debian/patches/00dpatch.conf	                        (rev 0)
+++ packages/migrate/trunk/debian/patches/00dpatch.conf	2008-02-19 22:49:41 UTC (rev 4581)
@@ -0,0 +1,2 @@
+conf_debianonly=1
+conf_origtargzpath=../tarballs

Added: packages/migrate/trunk/debian/patches/00list
===================================================================
--- packages/migrate/trunk/debian/patches/00list	                        (rev 0)
+++ packages/migrate/trunk/debian/patches/00list	2008-02-19 22:49:41 UTC (rev 4581)
@@ -0,0 +1 @@
+disable_py.dpatch

Added: packages/migrate/trunk/debian/patches/disable_py.dpatch
===================================================================
--- packages/migrate/trunk/debian/patches/disable_py.dpatch	                        (rev 0)
+++ packages/migrate/trunk/debian/patches/disable_py.dpatch	2008-02-19 22:49:41 UTC (rev 4581)
@@ -0,0 +1,24 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## disable_py.dpatch by  <Piotr OÅ¼arowski <piotr at debian.org>>
+##
+## DP: disable downloading "Py" Egg, it's in Build-Depends-Indep
+
+ at DPATCH@
+diff -urNad sqlalchemy-migrate-0.4.2~/setup.py sqlalchemy-migrate-0.4.2/setup.py
+--- sqlalchemy-migrate-0.4.2~/setup.py	2008-02-19 19:59:03.000000000 +0100
++++ sqlalchemy-migrate-0.4.2/setup.py	2008-02-19 23:30:26.000000000 +0100
+@@ -20,10 +20,10 @@
+ """,
+ 
+     install_requires = ['sqlalchemy >= 0.3.10'],
+-    setup_requires = ['py >= 0.9.0-beta'],
+-    dependency_links = [
+-        "http://codespeak.net/download/py/",
+-    ],
++#    setup_requires = ['py >= 0.9.0-beta'],
++#    dependency_links = [
++#        "http://codespeak.net/download/py/",
++#    ],
+ 
+     author = "Evan Rosson",
+     author_email = "evan.rosson at gmail.com",


Property changes on: packages/migrate/trunk/debian/patches/disable_py.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Modified: packages/migrate/trunk/debian/rules
===================================================================
--- packages/migrate/trunk/debian/rules	2008-02-19 19:59:03 UTC (rev 4580)
+++ packages/migrate/trunk/debian/rules	2008-02-19 22:49:41 UTC (rev 4581)
@@ -7,7 +7,9 @@
 PYVERS=$(shell pyversions -vr)
 DOCS=$(shell find docs/ -name "*.rst" -printf "%p "| sed "s/.rst//g")
 
-clean:
+include /usr/share/dpatch/dpatch.make
+
+clean: unpatch
 	dh_testdir
 	dh_testroot
 	rm -rf dist build
@@ -15,7 +17,7 @@
 	rm -f docs/reference.txt
 	dh_clean build-*
 
-build: build-indep
+build: patch build-indep
 
 build-indep:
 	dh_installdirs -i
@@ -37,7 +39,6 @@
 	   debian/python-migrate/usr/lib/python$*/site-packages/sqlalchemy_migrate-${DEB_UPSTREAM_VERSION}.egg-info
 	# make lintian happy
 	chmod +x debian/python-migrate/usr/lib/python$*/site-packages/migrate/versioning/templates/manage.py_tmpl
-	rm -rf debian/python-migrate/usr/lib
 	# default Python version in hashbang
 	sed -i -e '1s/python.*/python/' debian/python-migrate/usr/bin/migrate
 
@@ -48,6 +49,7 @@
 	dh_installdocs -i
 	dh_installman -i
 	dh_pycentral -i
+	rm -rf debian/python-migrate/usr/lib
 	dh_compress -i -X.py
 	dh_fixperms -i
 	dh_installdeb -i


