[Python-apps-commits] r7253 - in packages/s3ql/trunk/debian (9 files)
nikratio-guest at users.alioth.debian.org
nikratio-guest at users.alioth.debian.org
Thu Jun 30 01:02:04 UTC 2011
Date: Thursday, June 30, 2011 @ 01:02:01
Author: nikratio-guest
Revision: 7253
Install contrib/* files into appropriate locations instead
of /usr/share/doc/s3ql/contrib.
Added:
packages/s3ql/trunk/debian/s3ql.examples
packages/s3ql/trunk/debian/s3ql.install
Modified:
packages/s3ql/trunk/debian/README.Debian
packages/s3ql/trunk/debian/changelog
packages/s3ql/trunk/debian/patches/series
packages/s3ql/trunk/debian/rules
packages/s3ql/trunk/debian/s3ql.docs
packages/s3ql/trunk/debian/s3ql.links
Deleted:
packages/s3ql/trunk/debian/patches/fix-sys-path.patch
Modified: packages/s3ql/trunk/debian/README.Debian
===================================================================
--- packages/s3ql/trunk/debian/README.Debian 2011-06-30 00:14:05 UTC (rev 7252)
+++ packages/s3ql/trunk/debian/README.Debian 2011-06-30 01:02:01 UTC (rev 7253)
@@ -1,9 +1,17 @@
S3QL for Debian
---------------
-Note that the debian package installs links to pcp.py and
-expire_backups.py (from the contrib directory of the upstream tarball)
-in /usr/bin.
+F: Where do I find the contents of the contrib/ directory in the
+ upstream tarball?
- -- Nikolaus Rath <Nikolaus at rath.org> Wed, 15 Jun 2011 21:16:18 -0400
+A: The expire_backups.py and pcp.py scripts are installed into
+ /usr/bin as expire_backups and pcp respectively. Their manpages
+ have been placed in the proper system directory (/usr/man/man1) and
+ can be viewed with the standard `man` command.
+
+ The upstart script (s3ql.conf) and sample backup script
+ (s3ql_backup.sh) are installed in /usr/share/doc/s3ql/examples.
+
+ benchmark.py and make_dummy.py are installed into /usr/share/s3ql.
+
Modified: packages/s3ql/trunk/debian/changelog
===================================================================
--- packages/s3ql/trunk/debian/changelog 2011-06-30 00:14:05 UTC (rev 7252)
+++ packages/s3ql/trunk/debian/changelog 2011-06-30 01:02:01 UTC (rev 7253)
@@ -2,8 +2,10 @@
* Package now resides in the Python Apps repository on Alioth.
* New co-maintainer: Laszlo Boszormenyi <gcs at debian.hu>
+ * Move files in contrib/ (previously shipped as /usr/share/doc/s3ql/contrib)
+ into appropriate locations individually.
- -- Nikolaus Rath <Nikolaus at rath.org> Wed, 29 Jun 2011 20:12:55 -0400
+ -- Nikolaus Rath <Nikolaus at rath.org> Wed, 29 Jun 2011 20:54:35 -0400
s3ql (1.0.1-1) unstable; urgency=low
Deleted: packages/s3ql/trunk/debian/patches/fix-sys-path.patch
===================================================================
--- packages/s3ql/trunk/debian/patches/fix-sys-path.patch 2011-06-30 00:14:05 UTC (rev 7252)
+++ packages/s3ql/trunk/debian/patches/fix-sys-path.patch 2011-06-30 01:02:01 UTC (rev 7253)
@@ -1,85 +0,0 @@
-Description: Add /usr/share/s3ql to module load path.
- Since the debian package installs S3QL's modules into
- /usr/share/s3ql, which is not in the standard Python
- module search path, the scripts in contrib/ need to be
- updated to manually add this directory to sys.path.
-Author: Nikolaus Rath <Nikolaus at rath.org>
-Forwarded: not-needed
-Last-Update: 2011-06-17
---- a/contrib/benchmark.py
-+++ b/contrib/benchmark.py
-@@ -21,7 +21,10 @@
- import zlib
- import bz2
-
--# We are running from the S3QL source directory, make sure
-+# Add private S3QL modules to search path
-+sys.path.append("/usr/share/s3ql")
-+
-+# If we are running from the S3QL source directory, make sure
- # that we use modules from this directory
- basedir = os.path.abspath(os.path.join(os.path.dirname(sys.argv[0]), '..'))
- if (os.path.exists(os.path.join(basedir, 'setup.py')) and
---- a/contrib/expire_backups.py
-+++ b/contrib/expire_backups.py
-@@ -20,13 +20,16 @@
- from datetime import datetime, timedelta
- from collections import defaultdict
-
--# We are running from the S3QL source directory, make sure
-+# Add private S3QL modules to search path
-+sys.path.append("/usr/share/s3ql")
-+
-+# If we are running from the S3QL source directory, make sure
- # that we use modules from this directory
- basedir = os.path.abspath(os.path.join(os.path.dirname(sys.argv[0]), '..'))
- if (os.path.exists(os.path.join(basedir, 'setup.py')) and
- os.path.exists(os.path.join(basedir, 'src', 's3ql', '__init__.py'))):
- sys.path = [os.path.join(basedir, 'src')] + sys.path
--
-+
- from s3ql.common import setup_logging, QuietError
- from s3ql.parse_args import ArgumentParser
- from s3ql.cli.remove import main as s3qlrm
-@@ -283,4 +286,4 @@
-
- if __name__ == '__main__':
- #simulate(sys.argv[1:])
-- main(sys.argv[1:])
-\ No newline at end of file
-+ main(sys.argv[1:])
---- a/contrib/make_dummy.py
-+++ b/contrib/make_dummy.py
-@@ -20,7 +20,10 @@
- import logging
- import tempfile
-
--# We are running from the S3QL source directory, make sure
-+# Add private S3QL modules to search path
-+sys.path.append("/usr/share/s3ql")
-+
-+# If we are running from the S3QL source directory, make sure
- # that we use modules from this directory
- basedir = os.path.abspath(os.path.join(os.path.dirname(sys.argv[0]), '..'))
- if (os.path.exists(os.path.join(basedir, 'setup.py')) and
---- a/contrib/pcp.py
-+++ b/contrib/pcp.py
-@@ -17,7 +17,10 @@
- import logging
- import subprocess
-
--# We are running from the S3QL source directory, make sure
-+# Add private S3QL modules to search path
-+sys.path.append("/usr/share/s3ql")
-+
-+# If we are running from the S3QL source directory, make sure
- # that we use modules from this directory
- basedir = os.path.abspath(os.path.join(os.path.dirname(sys.argv[0]), '..'))
- if (os.path.exists(os.path.join(basedir, 'setup.py')) and
-@@ -97,4 +100,4 @@
-
-
- if __name__ == '__main__':
-- main(sys.argv[1:])
-\ No newline at end of file
-+ main(sys.argv[1:])
Modified: packages/s3ql/trunk/debian/patches/series
===================================================================
--- packages/s3ql/trunk/debian/patches/series 2011-06-30 00:14:05 UTC (rev 7252)
+++ packages/s3ql/trunk/debian/patches/series 2011-06-30 01:02:01 UTC (rev 7253)
@@ -1 +0,0 @@
-fix-sys-path.patch
Modified: packages/s3ql/trunk/debian/rules
===================================================================
--- packages/s3ql/trunk/debian/rules 2011-06-30 00:14:05 UTC (rev 7252)
+++ packages/s3ql/trunk/debian/rules 2011-06-30 01:02:01 UTC (rev 7253)
@@ -9,28 +9,19 @@
override_dh_installchangelogs:
dh_installchangelogs Changes.txt
-override_dh_compress:
- dh_compress -X.txt -X.py
-
- # Force compression of manpages
- gzip debian/s3ql/usr/share/doc/s3ql/contrib/*.1
-
override_dh_auto_build:
- python setup.py build_sphinx
+ python setup.py build_sphinx build
override_dh_auto_install:
python setup.py install --root=debian/s3ql --install-layout=deb \
--install-lib=/usr/share/s3ql --install-scripts=/usr/share/s3ql
-override_dh_fixperms:
- dh_fixperms
- chmod +x debian/s3ql/usr/share/doc/s3ql/contrib/*.py \
- debian/s3ql/usr/share/doc/s3ql/contrib/*.sh
-
override_dh_link:
dh_link
+ # Don't link scripts ending in .py
for entry in debian/s3ql/usr/share/s3ql/*; do \
- if [ -d "$$entry" ] || [ ! -x "$$entry" ]; then \
+ if [ -d "$$entry" ] || [ ! -x "$$entry" ] \
+ || [ "$${entry%.py}" != "$$entry" ]; then \
continue; \
fi; \
ln -s ../share/s3ql/`basename "$$entry"` \
Modified: packages/s3ql/trunk/debian/s3ql.docs
===================================================================
--- packages/s3ql/trunk/debian/s3ql.docs 2011-06-30 00:14:05 UTC (rev 7252)
+++ packages/s3ql/trunk/debian/s3ql.docs 2011-06-30 01:02:01 UTC (rev 7253)
@@ -1,3 +1,2 @@
doc/html/
doc/manual.pdf
-contrib/
Added: packages/s3ql/trunk/debian/s3ql.examples
===================================================================
--- packages/s3ql/trunk/debian/s3ql.examples (rev 0)
+++ packages/s3ql/trunk/debian/s3ql.examples 2011-06-30 01:02:01 UTC (rev 7253)
@@ -0,0 +1,2 @@
+contrib/s3ql.conf
+contrib/s3ql_backup.sh
Added: packages/s3ql/trunk/debian/s3ql.install
===================================================================
--- packages/s3ql/trunk/debian/s3ql.install (rev 0)
+++ packages/s3ql/trunk/debian/s3ql.install 2011-06-30 01:02:01 UTC (rev 7253)
@@ -0,0 +1,2 @@
+contrib/*.py /usr/share/s3ql/
+contrib/*.1 /usr/share/man/man1/
Modified: packages/s3ql/trunk/debian/s3ql.links
===================================================================
--- packages/s3ql/trunk/debian/s3ql.links 2011-06-30 00:14:05 UTC (rev 7252)
+++ packages/s3ql/trunk/debian/s3ql.links 2011-06-30 01:02:01 UTC (rev 7253)
@@ -1,5 +1,3 @@
/usr/share/javascript/jquery/jquery.js /usr/share/doc/s3ql/html/_static/jquery.js
-/usr/share/doc/s3ql/contrib/pcp.py /usr/bin/pcp
-/usr/share/doc/s3ql/contrib/expire_backups.py /usr/bin/expire_backups
-/usr/share/doc/s3ql/contrib/pcp.1.gz /usr/share/man/man1/pcp.1.gz
-/usr/share/doc/s3ql/contrib/expire_backups.1.gz /usr/share/man/man1/expire_backups.1.gz
+/usr/share/s3ql/pcp.py /usr/bin/pcp
+/usr/share/s3ql/expire_backups.py /usr/bin/expire_backups
More information about the Python-apps-commits
mailing list