[Python-apps-commits] r9753 - in packages/s3ql-beta/trunk/debian (control rules)

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

    Date: Saturday, June 15, 2013 @ 22:39:43
  Author: nikratio-guest
Revision: 9753

Temporarily disable use of dh_sphinxdoc (doesn't work), and  create .js links
manually.

Add -beta suffix to /usr/bin files so that we don't clash with s3ql.

Fix Python dependency substvars.

Modified:
  packages/s3ql-beta/trunk/debian/control
  packages/s3ql-beta/trunk/debian/rules

Modified: packages/s3ql-beta/trunk/debian/control
===================================================================
--- packages/s3ql-beta/trunk/debian/control	2013-06-15 22:16:46 UTC (rev 9752)
+++ packages/s3ql-beta/trunk/debian/control	2013-06-15 22:39:43 UTC (rev 9753)
@@ -30,14 +30,11 @@
 Package: s3ql-beta
 Architecture: any
 Depends: ${misc:Depends},
-         ${python:Depends},
+         ${python3:Depends},
          ${shlibs:Depends},
          ${sphinxdoc:Depends},
-         libsqlite3-0 (>= 3.7.0),
          fuse [linux-any] | fuse4bsd [kfreebsd-any],
          psmisc,
-         python3-llfuse (>= 0.37),
-         python3-apsw (>= 3.7.0),
          python3-pkg-resources
 Description: Full-featured file system for online data storage (beta)
  S3QL is a file system that stores all its data online. It supports
@@ -70,7 +67,7 @@
             python3-apsw-dbg,
             python3-crypto-dbg,
 Depends: s3ql-beta (= ${binary:Version}),
-         ${python:Depends},
+         ${python3:Depends},
          ${shlibs:Depends},
          ${misc:Depends}
 Description: Full-featured file system for online data storage (debugging symbols)

Modified: packages/s3ql-beta/trunk/debian/rules
===================================================================
--- packages/s3ql-beta/trunk/debian/rules	2013-06-15 22:16:46 UTC (rev 9752)
+++ packages/s3ql-beta/trunk/debian/rules	2013-06-15 22:39:43 UTC (rev 9753)
@@ -28,6 +28,14 @@
 	python3 setup.py build_sphinx
 	touch $@
 
+# Sphinxdoc currently crashes, so we have to do the work ourselves :-(
+override_dh_sphinxdoc:
+	ln -sf ../../../../javascript/jquery/jquery.min.js \
+               debian/s3ql-beta/usr/share/doc/s3ql-beta/html/_static/jquery.js
+	ln -sf ../../../../javascript/underscore/underscore.min.js \
+               debian/s3ql-beta/usr/share/doc/s3ql-beta/html/_static/underscore.js
+
+
 override_dh_auto_install: 
 	dh_testdir
 	dh_testroot
@@ -60,20 +68,25 @@
 	           -printf "%P\0" -delete) \
 	| xargs -0 dh_install --autodest -ps3ql-beta-dbg
 
-override_dh_link:
-	rm -rf debian/s3ql-beta-dbg/usr/share/doc/s3ql-beta-dbg
-	dh_link
-
-	# Link all executable files not ending in .py into /usr/bin
+	# Link all executable files not ending in .py into /usr/bin with
+        # beta suffix, and adjust manpage name
+	mkdir -p debian/s3ql-beta/usr/bin/
 	for entry in debian/s3ql-beta/usr/lib/s3ql-beta/*; do \
 	    if [ -d "$$entry" ] || [ ! -x "$$entry" ] \
                || [ "$${entry%.py}" != "$$entry" ]; then \
                continue; \
             fi; \
             ln -s ../lib/s3ql-beta/`basename "$$entry"` \
-                  "debian/s3ql/usr/bin/`basename \"$$entry\"`"; \
+                  "debian/s3ql-beta/usr/bin/`basename \"$$entry\"`-beta"; \
+	    mv debian/s3ql-beta/usr/share/man/man1/`basename "$$entry"`.1 \
+	       debian/s3ql-beta/usr/share/man/man1/`basename "$$entry"`-beta.1; \
         done
 
+override_dh_link:
+	rm -rf debian/s3ql-beta-dbg/usr/share/doc/s3ql-beta-dbg
+	dh_link
+
+
 override_dh_auto_clean:
 	# We don't want to call setup.py clean, because this
 	# requires a number of (potentially uninstalled) build-dependencies.