[Python-apps-commits] r2751 - in packages/s3cmd/trunk/debian (4 files)

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

    Date: Wednesday, April 15, 2009 @ 11:17:45
  Author: dottedmag-guest
Revision: 2751

Install s3cmd directly in /usr/share/s3cmd

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

Modified: packages/s3cmd/trunk/debian/changelog
===================================================================
--- packages/s3cmd/trunk/debian/changelog	2009-04-14 22:21:36 UTC (rev 2750)
+++ packages/s3cmd/trunk/debian/changelog	2009-04-15 11:17:45 UTC (rev 2751)
@@ -3,7 +3,6 @@
   * 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

Modified: packages/s3cmd/trunk/debian/patches/series
===================================================================
--- packages/s3cmd/trunk/debian/patches/series	2009-04-14 22:21:36 UTC (rev 2750)
+++ packages/s3cmd/trunk/debian/patches/series	2009-04-15 11:17:45 UTC (rev 2751)
@@ -1,2 +1 @@
 do-not-check-elementtree-at-build-time.patch
-use-share-directory-for-private-modules.patch

Deleted: packages/s3cmd/trunk/debian/patches/use-share-directory-for-private-modules.patch
===================================================================
--- packages/s3cmd/trunk/debian/patches/use-share-directory-for-private-modules.patch	2009-04-14 22:21:36 UTC (rev 2750)
+++ packages/s3cmd/trunk/debian/patches/use-share-directory-for-private-modules.patch	2009-04-15 11:17:45 UTC (rev 2751)
@@ -1,13 +0,0 @@
-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)

Modified: packages/s3cmd/trunk/debian/rules
===================================================================
--- packages/s3cmd/trunk/debian/rules	2009-04-14 22:21:36 UTC (rev 2750)
+++ packages/s3cmd/trunk/debian/rules	2009-04-15 11:17:45 UTC (rev 2751)
@@ -6,6 +6,8 @@
 PACKAGE_NAME=s3cmd
 PACKAGE_DIR=$(CURDIR)/debian/$(PACKAGE_NAME)
 
+SHARE_DIR=/usr/share/s3cmd
+
 clean: clean-patched unpatch
 	dh_testdir
 	dh_testroot
@@ -30,7 +32,9 @@
 	dh_installdirs
 
 	S3CMD_PACKAGING=1 python setup.py install --no-compile \
-		 --root $(PACKAGE_DIR) --install-lib /usr/share/s3cmd
+		 --root $(PACKAGE_DIR) \
+		 --install-lib $(SHARE_DIR) \
+		 --install-scripts $(SHARE_DIR)
 	rm -rf $(PACKAGE_DIR)/usr/share/s3cmd/*.egg-info
 
 binary-indep: install
@@ -39,6 +43,7 @@
 	dh_installchangelogs NEWS
 	dh_installdocs
 	dh_installman
+	dh_link $(SHARE_DIR)/s3cmd /usr/bin/s3cmd
 	dh_pysupport
 	dh_compress -X.py
 	dh_fixperms