[Python-apps-commits] r2724 - in packages/s3cmd/trunk/debian (7 files)

[dottedmag-guest at users.alioth.debian.org]

    Date: Sunday, April 12, 2009 @ 22:26:11
  Author: dottedmag-guest
Revision: 2724

* Switched to debian-support.
* Standards-Version bumped to 3.8.1, no changes needed.
* Private python modules were moved to /usr/share/s3cmd:
  - patches/use-share-directory-for-private-modules.patch
  - debian/s3cmd.dirs
  - debian/rules changed accordingly
* debian/rules cleanup

Added:
  packages/s3cmd/trunk/debian/patches/use-share-directory-for-private-modules.patch
  packages/s3cmd/trunk/debian/s3cmd.dirs
Modified:
  packages/s3cmd/trunk/debian/changelog
  packages/s3cmd/trunk/debian/control
  packages/s3cmd/trunk/debian/patches/series
  packages/s3cmd/trunk/debian/rules
Deleted:
  packages/s3cmd/trunk/debian/pycompat

Modified: packages/s3cmd/trunk/debian/changelog
===================================================================
--- packages/s3cmd/trunk/debian/changelog	2009-04-11 16:24:44 UTC (rev 2723)
+++ packages/s3cmd/trunk/debian/changelog	2009-04-12 22:26:11 UTC (rev 2724)
@@ -1,3 +1,15 @@
+s3cmd (0.9.9-2) UNRELEASED; urgency=low
+
+  * Switched to debian-support.
+  * Standards-Version bumped to 3.8.1, no changes needed.
+  * Private python modules were moved to /usr/share/s3cmd:
+    - patches/use-share-directory-for-private-modules.patch
+    - debian/s3cmd.dirs
+    - debian/rules changed accordingly
+  * debian/rules cleanup
+
+ -- Mikhail Gusarov <dottedmag at dottedmag.net>  Mon, 13 Apr 2009 05:08:02 +0700
+
 s3cmd (0.9.9-1) unstable; urgency=low
 
   * New upstream release.

Modified: packages/s3cmd/trunk/debian/control
===================================================================
--- packages/s3cmd/trunk/debian/control	2009-04-11 16:24:44 UTC (rev 2723)
+++ packages/s3cmd/trunk/debian/control	2009-04-12 22:26:11 UTC (rev 2724)
@@ -4,8 +4,8 @@
 Maintainer: Mikhail Gusarov <dottedmag at dottedmag.net>
 Uploaders: Python Applications Packaging Team <python-apps-team at lists.alioth.debian.org>
 Build-Depends: debhelper (>= 7), quilt (>= 0.40), python-all-dev (>= 2.3.5-11)
-Build-Depends-Indep: python-central (>= 0.6)
-Standards-Version: 3.8.0
+Build-Depends-Indep: python-support (>= 0.6.4)
+Standards-Version: 3.8.1
 XS-Python-Version: >=2.4
 Vcs-Svn: svn://svn.debian.org/svn/python-apps/packages/s3cmd/trunk
 Vcs-Browser: http://svn.debian.org/viewsvn/python-apps/packages/s3cmd/trunk/

Modified: packages/s3cmd/trunk/debian/patches/series
===================================================================
--- packages/s3cmd/trunk/debian/patches/series	2009-04-11 16:24:44 UTC (rev 2723)
+++ packages/s3cmd/trunk/debian/patches/series	2009-04-12 22:26:11 UTC (rev 2724)
@@ -1 +1,2 @@
 do-not-check-elementtree-at-build-time.patch
+use-share-directory-for-private-modules.patch

Added: packages/s3cmd/trunk/debian/patches/use-share-directory-for-private-modules.patch
===================================================================
--- packages/s3cmd/trunk/debian/patches/use-share-directory-for-private-modules.patch	                        (rev 0)
+++ packages/s3cmd/trunk/debian/patches/use-share-directory-for-private-modules.patch	2009-04-12 22:26:11 UTC (rev 2724)
@@ -0,0 +1,13 @@
+Private python modules were moved to /usr/share/s3cmd to avoid polluting global
+namespace.
+--- s3cmd/s3cmd.orig	2009-04-13 05:13:21.000000000 +0700
++++ s3cmd/s3cmd	2009-04-13 05:13:41.000000000 +0700
+@@ -7,6 +7,8 @@
+ 
+ import sys
+ 
++sys.path.insert(0, '/usr/share/s3cmd')
++
+ if float("%d.%d" %(sys.version_info[0], sys.version_info[1])) < 2.4:
+ 	sys.stderr.write("ERROR: Python 2.4 or higher required, sorry.\n")
+ 	sys.exit(1)

Deleted: packages/s3cmd/trunk/debian/pycompat
===================================================================
--- packages/s3cmd/trunk/debian/pycompat	2009-04-11 16:24:44 UTC (rev 2723)
+++ packages/s3cmd/trunk/debian/pycompat	2009-04-12 22:26:11 UTC (rev 2724)
@@ -1 +0,0 @@
-2

Modified: packages/s3cmd/trunk/debian/rules
===================================================================
--- packages/s3cmd/trunk/debian/rules	2009-04-11 16:24:44 UTC (rev 2723)
+++ packages/s3cmd/trunk/debian/rules	2009-04-12 22:26:11 UTC (rev 2724)
@@ -2,8 +2,10 @@
 # -*- makefile -*-
 
 include /usr/share/quilt/quilt.make
+include /usr/share/python/python.mk
 
 PACKAGE_NAME=s3cmd
+PACKAGE_DIR=$(CURDIR)/debian/$(PACKAGE_NAME)
 
 clean: clean-patched unpatch
 	dh_testdir
@@ -26,9 +28,13 @@
 	dh_testdir
 	dh_testroot
 	dh_prep
+	dh_installdirs
 
-	S3CMD_PACKAGING=1 python setup.py install --no-compile --root $(CURDIR)/debian/$(PACKAGE_NAME)
-	rm -rf debian/$(PACKAGE_NAME)/usr/lib/python*/site-packages/*.egg-info
+	S3CMD_PACKAGING=1 python setup.py install --no-compile --root $(PACKAGE_DIR)
+	rm -rf $(PACKAGE_DIR)/usr/lib/python*/site-packages/*.egg-info
+	mv $(PACKAGE_DIR)/usr/lib/python*/site-packages/S3 $(PACKAGE_DIR)/usr/share/s3cmd
+	rmdir $(PACKAGE_DIR)/usr/lib/python*/site-packages
+	rmdir $(PACKAGE_DIR)/usr/lib/python*
 
 binary-indep: install
 	dh_testdir
@@ -36,7 +42,7 @@
 	dh_installchangelogs NEWS
 	dh_installdocs
 	dh_installman
-	dh_pycentral
+	dh_pysupport
 	dh_compress -X.py
 	dh_fixperms
 	dh_installdeb

Added: packages/s3cmd/trunk/debian/s3cmd.dirs
===================================================================
--- packages/s3cmd/trunk/debian/s3cmd.dirs	                        (rev 0)
+++ packages/s3cmd/trunk/debian/s3cmd.dirs	2009-04-12 22:26:11 UTC (rev 2724)
@@ -0,0 +1 @@
+usr/share/s3cmd