[Python-modules-commits] r17477 - in packages/python-llfuse/trunk/debian (15 files)

nikratio-guest at users.alioth.debian.org nikratio-guest at users.alioth.debian.org
Thu Jun 16 18:18:43 UTC 2011


    Date: Thursday, June 16, 2011 @ 18:18:42
  Author: nikratio-guest
Revision: 17477

Create separate -doc package. Make more use of debhelper.

Added:
  packages/python-llfuse/trunk/debian/python-llfuse-dbg.links
  packages/python-llfuse/trunk/debian/python-llfuse-doc.doc-base
  packages/python-llfuse/trunk/debian/python-llfuse-doc.docs
  packages/python-llfuse/trunk/debian/python-llfuse-doc.install
  packages/python-llfuse/trunk/debian/python-llfuse-doc.links
  packages/python-llfuse/trunk/debian/python-llfuse.install
  packages/python-llfuse/trunk/debian/python3-llfuse-dbg.links
  packages/python-llfuse/trunk/debian/python3-llfuse.install
Modified:
  packages/python-llfuse/trunk/debian/changelog
  packages/python-llfuse/trunk/debian/control
  packages/python-llfuse/trunk/debian/rules
Deleted:
  packages/python-llfuse/trunk/debian/python-llfuse.doc-base
  packages/python-llfuse/trunk/debian/python-llfuse.docs
  packages/python-llfuse/trunk/debian/python3-llfuse.doc-base
  packages/python-llfuse/trunk/debian/python3-llfuse.docs

Modified: packages/python-llfuse/trunk/debian/changelog
===================================================================
--- packages/python-llfuse/trunk/debian/changelog	2011-06-16 13:30:58 UTC (rev 17476)
+++ packages/python-llfuse/trunk/debian/changelog	2011-06-16 18:18:42 UTC (rev 17477)
@@ -1,3 +1,9 @@
+python-llfuse (0.32-2) UNRELEASED; urgency=low
+
+  * Created separate -doc package for documentation. Closes: 630632
+
+ -- Nikolaus Rath <Nikolaus at rath.org>  Wed, 15 Jun 2011 14:23:58 -0400
+
 python-llfuse (0.32-1) unstable; urgency=low
 
   * First official debian release. Closes: 626658

Modified: packages/python-llfuse/trunk/debian/control
===================================================================
--- packages/python-llfuse/trunk/debian/control	2011-06-16 13:30:58 UTC (rev 17476)
+++ packages/python-llfuse/trunk/debian/control	2011-06-16 18:18:42 UTC (rev 17477)
@@ -26,8 +26,7 @@
 Architecture: any
 Depends: ${misc:Depends},
          ${python:Depends},
-         ${shlibs:Depends},
-         libjs-jquery
+         ${shlibs:Depends}
 Replaces: s3ql (<= 0.28)
 Breaks: s3ql (<= 0.28)
 Provides: ${python:Provides}
@@ -65,8 +64,7 @@
 Architecture: any
 Depends: ${misc:Depends},
          ${python3:Depends},
-         ${shlibs:Depends},
-         libjs-jquery
+         ${shlibs:Depends}
 Provides: ${python3:Provides}
 Description: Python 3 bindings for the low-level FUSE API
  Python3-llfuse is a set of Python 3 bindings for the low level
@@ -96,3 +94,22 @@
  .
  This package contains the extension built for the Python 3 debug 
  interpreter.
+
+Package: python-llfuse-doc
+Architecture: all
+Recommends: python-llfuse | python3-llfuse
+Depends: libjs-jquery,
+         ${shlibs:Depends},
+         ${misc:Depends}
+Description: Python bindings for the low-level FUSE API (documentation)
+ Python-llfuse is a set of Python bindings for the low level
+ FUSE API. Bindings for the high level API are provided
+ by the python-fuse package.
+ .
+ FUSE (Filesystem in USErspace) is a simple interface for userspace
+ programs to export a virtual filesystem to the Linux kernel. FUSE
+ also aims to provide a secure method for non privileged users to
+ create and mount their own filesystem implementations.
+ .
+ This package contains the documentation.
+

Added: packages/python-llfuse/trunk/debian/python-llfuse-dbg.links
===================================================================
--- packages/python-llfuse/trunk/debian/python-llfuse-dbg.links	                        (rev 0)
+++ packages/python-llfuse/trunk/debian/python-llfuse-dbg.links	2011-06-16 18:18:42 UTC (rev 17477)
@@ -0,0 +1 @@
+/usr/share/doc/python-llfuse /usr/share/doc/python-llfuse-dbg

Added: packages/python-llfuse/trunk/debian/python-llfuse-doc.doc-base
===================================================================
--- packages/python-llfuse/trunk/debian/python-llfuse-doc.doc-base	                        (rev 0)
+++ packages/python-llfuse/trunk/debian/python-llfuse-doc.doc-base	2011-06-16 18:18:42 UTC (rev 17477)
@@ -0,0 +1,8 @@
+Document: python-llfuse
+Title: Python-llfuse API Documentation
+Author: Nikolaus Rath <Nikolaus at rath.org>
+Section: Programming/Python
+
+Format: HTML
+Index: /usr/share/doc/python-llfuse/html/index.html
+Files: /usr/share/doc/python-llfuse/html/*.html

Added: packages/python-llfuse/trunk/debian/python-llfuse-doc.docs
===================================================================
--- packages/python-llfuse/trunk/debian/python-llfuse-doc.docs	                        (rev 0)
+++ packages/python-llfuse/trunk/debian/python-llfuse-doc.docs	2011-06-16 18:18:42 UTC (rev 17477)
@@ -0,0 +1,2 @@
+doc/html/
+contrib/

Added: packages/python-llfuse/trunk/debian/python-llfuse-doc.install
===================================================================
Added: packages/python-llfuse/trunk/debian/python-llfuse-doc.links
===================================================================
--- packages/python-llfuse/trunk/debian/python-llfuse-doc.links	                        (rev 0)
+++ packages/python-llfuse/trunk/debian/python-llfuse-doc.links	2011-06-16 18:18:42 UTC (rev 17477)
@@ -0,0 +1 @@
+/usr/share/javascript/jquery/jquery.js /usr/share/doc/python-llfuse-doc/html/_static/jquery.js

Deleted: packages/python-llfuse/trunk/debian/python-llfuse.doc-base
===================================================================
--- packages/python-llfuse/trunk/debian/python-llfuse.doc-base	2011-06-16 13:30:58 UTC (rev 17476)
+++ packages/python-llfuse/trunk/debian/python-llfuse.doc-base	2011-06-16 18:18:42 UTC (rev 17477)
@@ -1,8 +0,0 @@
-Document: python-llfuse
-Title: Python-llfuse API Documentation
-Author: Nikolaus Rath <Nikolaus at rath.org>
-Section: Programming/Python
-
-Format: HTML
-Index: /usr/share/doc/python-llfuse/html/index.html
-Files: /usr/share/doc/python-llfuse/html/*.html

Deleted: packages/python-llfuse/trunk/debian/python-llfuse.docs
===================================================================
--- packages/python-llfuse/trunk/debian/python-llfuse.docs	2011-06-16 13:30:58 UTC (rev 17476)
+++ packages/python-llfuse/trunk/debian/python-llfuse.docs	2011-06-16 18:18:42 UTC (rev 17477)
@@ -1,2 +0,0 @@
-doc/html/
-contrib/

Added: packages/python-llfuse/trunk/debian/python-llfuse.install
===================================================================
--- packages/python-llfuse/trunk/debian/python-llfuse.install	                        (rev 0)
+++ packages/python-llfuse/trunk/debian/python-llfuse.install	2011-06-16 18:18:42 UTC (rev 17477)
@@ -0,0 +1 @@
+usr/lib/python2*

Added: packages/python-llfuse/trunk/debian/python3-llfuse-dbg.links
===================================================================
--- packages/python-llfuse/trunk/debian/python3-llfuse-dbg.links	                        (rev 0)
+++ packages/python-llfuse/trunk/debian/python3-llfuse-dbg.links	2011-06-16 18:18:42 UTC (rev 17477)
@@ -0,0 +1 @@
+/usr/share/doc/python3-llfuse /usr/share/doc/python3-llfuse-dbg

Deleted: packages/python-llfuse/trunk/debian/python3-llfuse.doc-base
===================================================================
--- packages/python-llfuse/trunk/debian/python3-llfuse.doc-base	2011-06-16 13:30:58 UTC (rev 17476)
+++ packages/python-llfuse/trunk/debian/python3-llfuse.doc-base	2011-06-16 18:18:42 UTC (rev 17477)
@@ -1,8 +0,0 @@
-Document: python3-llfuse
-Title: Python-LLFUSE API Documentation (Python 3)
-Author: Nikolaus Rath <Nikolaus at rath.org>
-Section: Programming/Python
-
-Format: HTML
-Index: /usr/share/doc/python3-llfuse/html/index.html
-Files: /usr/share/doc/python3-llfuse/html/*.html

Deleted: packages/python-llfuse/trunk/debian/python3-llfuse.docs
===================================================================
--- packages/python-llfuse/trunk/debian/python3-llfuse.docs	2011-06-16 13:30:58 UTC (rev 17476)
+++ packages/python-llfuse/trunk/debian/python3-llfuse.docs	2011-06-16 18:18:42 UTC (rev 17477)
@@ -1,2 +0,0 @@
-doc/html/
-contrib/

Added: packages/python-llfuse/trunk/debian/python3-llfuse.install
===================================================================
--- packages/python-llfuse/trunk/debian/python3-llfuse.install	                        (rev 0)
+++ packages/python-llfuse/trunk/debian/python3-llfuse.install	2011-06-16 18:18:42 UTC (rev 17477)
@@ -0,0 +1 @@
+usr/lib/python3*

Modified: packages/python-llfuse/trunk/debian/rules
===================================================================
--- packages/python-llfuse/trunk/debian/rules	2011-06-16 13:30:58 UTC (rev 17476)
+++ packages/python-llfuse/trunk/debian/rules	2011-06-16 18:18:42 UTC (rev 17477)
@@ -5,12 +5,15 @@
 
 PYVERS=$(shell pyversions -vr) $(shell py3versions -vr) 
 
-build: build-stamp
+%:
+	dh $@ --with python2,python3,quilt
 
+override_dh_auto_build: build-stamp
+
 build-stamp: build_cython \
              build_sphinx \
 	     $(PYVERS:%=build-python%) \
-             $(PYVERS:%=build-dbg-python%)
+	     $(PYVERS:%=build-python%-dbg)
 	touch $@
 
 build_cython:
@@ -30,74 +33,45 @@
 	python$* setup.py build -g
 	touch $@
 
-build-dbg-python%:
-	dh_testdir
-	python$*-dbg setup.py build -g
-	touch $@
+override_dh_auto_install: build install-prereq\
+         $(PYVERS:%=install-python%) \
+	 $(PYVERS:%=install-python%-dbg)
 
-install: build install-prereq $(PYVERS:%=install-python%) $(PYVERS:%=install-dbg-python%) 
-
 install-prereq:
 	dh_testdir
 	dh_testroot
 	dh_prep
 	dh_installdirs
 
-install-python3%: 
-	python3$* setup.py install --force --root=debian/python3-llfuse \
-                                   --no-compile -O0 --install-layout=deb
+install-python%: 
+	python$* setup.py install --force --root=debian/tmp \
+                                  --no-compile -O0 --install-layout=deb
 
-install-dbg-python3%: 
-	python3$*-dbg setup.py install --force --root=debian/python3-llfuse-dbg \
-                                       --no-compile -O0 --install-layout=deb
-	find debian/python3-llfuse-dbg ! -type d ! -name '*.so' | xargs rm -f
-	find debian/python3-llfuse-dbg -depth -empty -exec rmdir {} \;
+override_dh_link:
+	rm -rf debian/python-llfuse-dbg/usr/share/doc/python-llfuse-dbg
+	rm -rf debian/python3-llfuse-dbg/usr/share/doc/python3-llfuse-dbg
+	dh_link
 
-install-python2%: 
-	python2$* setup.py install --force --root=$(CURDIR)/debian/python-llfuse \
-                                   --no-compile -O0 --install-layout=deb
+override_dh_auto_clean:
+	dh_auto_clean
+	rm -rf build-python* build_cython build_sphinx build-stamp
 
-install-dbg-python2%: 
-	python2$*-dbg setup.py install --force --root=debian/python-llfuse-dbg \
-                                       --no-compile -O0 --install-layout=deb
-	find debian/python-llfuse-dbg ! -type d ! -name '*.so' | xargs rm -f
-	find debian/python-llfuse-dbg -depth -empty -exec rmdir {} \;
+override_dh_strip:
+	dh_strip -ppython-llfuse --dbg-package=python-llfuse-dbg
+	dh_strip -ppython3-llfuse --dbg-package=python3-llfuse-dbg
 
-clean:
-	python setup.py clean -a
-	dh_clean
-	rm -rf build-dbg-python* build-python* build-stamp
+override_dh_installchangelog:
+	dh_installchangelog Changes.txt
 
-binary: binary-arch binary-indep
+override_dh_install:
+	dh_install
 
-binary-arch: build install
-	dh_testroot -a
-	dh_testdir -a
-	dh_install -a
-	dh_installchangelogs -a Changes.txt
-	dh_installdocs -a
-	dh_fixperms -a
-	chmod +x debian/python-llfuse/usr/share/doc/python-llfuse/contrib/*.py 
-	chmod +x debian/python3-llfuse/usr/share/doc/python3-llfuse/contrib/*.py 
-	dh_python2 -a
-	dh_python3 -a
-	dh_lintian -a
-	for python in python python3; do \
-	   dh_strip -p$${python}-llfuse --dbg-package=$${python}-llfuse-dbg; \
-	   rm -rf debian/$${python}-llfuse-dbg/usr/share/doc/$${python}-llfuse-dbg; \
-	   ln -s $${python}-llfuse debian/$${python}-llfuse-dbg/usr/share/doc/$${python}-llfuse-dbg; \
-           ln -sf ../../../../javascript/jquery/jquery.js \
-              debian/$${python}-llfuse/usr/share/doc/$${python}-llfuse/html/_static/jquery.js; \
-	done
-	dh_compress -a -X.txt -X.js -X.py -X.json
-	dh_makeshlibs -a
-	dh_shlibdeps -a
-	dh_md5sums -a 
-	dh_installdeb -a
-	dh_gencontrol -a
-	dh_builddeb -a
+        # Install debugging extension and remove from regular package
+	(cd debian/python-llfuse; \
+            find . -name "*_d.so" -printf "%P\0" -delete) \
+            | xargs -0 dh_install --autodest -ppython-llfuse-dbg
 
-binary-indep: 
-
-
-.PHONY: build clean binary binary-arch binary-indep install 
+	(cd debian/python3-llfuse; \
+            find . -regextype posix-egrep -regex ".+-[a-z0-9]*d[a-z]*.so" \
+                -printf "%P\0" -delete) \
+	    | xargs -0 dh_install --autodest -ppython3-llfuse-dbg




More information about the Python-modules-commits mailing list