[Python-apps-commits] r7273 - in packages/s3ql/trunk/debian (4 files)

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

    Date: Sunday, July 3, 2011 @ 15:55:04
  Author: nikratio-guest
Revision: 7273

Install pcp as parallel-cp to avoid file name conflict with pcp package.

Modified:
  packages/s3ql/trunk/debian/README.Debian
  packages/s3ql/trunk/debian/changelog
  packages/s3ql/trunk/debian/rules
  packages/s3ql/trunk/debian/s3ql.links

Modified: packages/s3ql/trunk/debian/README.Debian
===================================================================
--- packages/s3ql/trunk/debian/README.Debian	2011-07-03 14:43:28 UTC (rev 7272)
+++ packages/s3ql/trunk/debian/README.Debian	2011-07-03 15:55:04 UTC (rev 7273)
@@ -6,9 +6,11 @@
    upstream tarball?
 
 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.
+   /usr/bin as expire_backups and parallel-cp respectively (renaming
+   of pcp was necessary to avoid conflict with the pcp "Performance
+   Co-Pilot" package). 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.

Modified: packages/s3ql/trunk/debian/changelog
===================================================================
--- packages/s3ql/trunk/debian/changelog	2011-07-03 14:43:28 UTC (rev 7272)
+++ packages/s3ql/trunk/debian/changelog	2011-07-03 15:55:04 UTC (rev 7273)
@@ -1,3 +1,11 @@
+s3ql (1.0.1-2) UNRELEASED; urgency=low
+
+  * NOT RELEASED YET
+  * Install pcp as parallel-cp to avoid file name conflict with
+    pcp ("Performance Co-Pilot") package. Closes: #632473.
+
+ -- Nikolaus Rath <Nikolaus at rath.org>  Sun, 03 Jul 2011 10:44:00 -0400
+
 s3ql (1.0.1-1) unstable; urgency=low
 
   * First official debian release. Closes: #626651

Modified: packages/s3ql/trunk/debian/rules
===================================================================
--- packages/s3ql/trunk/debian/rules	2011-07-03 14:43:28 UTC (rev 7272)
+++ packages/s3ql/trunk/debian/rules	2011-07-03 15:55:04 UTC (rev 7273)
@@ -28,6 +28,11 @@
                   "debian/s3ql/usr/bin/`basename \"$$entry\"`"; \
         done
 
+override dh_install:
+	dh_install
+	# Rename to avoid conflict with pcp package
+	(cd debian/s3ql/usr/share/man/man1/; mv pcp.1 parallel-cp.1)
+
 override_dh_auto_clean:
 	# We don't want to call setup.py clean, because this
 	# requires a number of (potentially uninstalled) build-dependencies.

Modified: packages/s3ql/trunk/debian/s3ql.links
===================================================================
--- packages/s3ql/trunk/debian/s3ql.links	2011-07-03 14:43:28 UTC (rev 7272)
+++ packages/s3ql/trunk/debian/s3ql.links	2011-07-03 15:55:04 UTC (rev 7273)
@@ -1,3 +1,3 @@
 /usr/share/javascript/jquery/jquery.js /usr/share/doc/s3ql/html/_static/jquery.js
-/usr/share/s3ql/pcp.py /usr/bin/pcp
+/usr/share/s3ql/pcp.py /usr/bin/parallel-cp
 /usr/share/s3ql/expire_backups.py /usr/bin/expire_backups