[Python-modules-commits] r19335 - in packages/cssutils/trunk/debian (9 files)

cjsmo-guest at users.alioth.debian.org cjsmo-guest at users.alioth.debian.org
Wed Nov 16 04:13:40 UTC 2011


    Date: Wednesday, November 16, 2011 @ 04:13:07
  Author: cjsmo-guest
Revision: 19335

update to use update-alternatives

Added:
  packages/cssutils/trunk/debian/python-cssutils.links
  packages/cssutils/trunk/debian/python-cssutils.postinst
  packages/cssutils/trunk/debian/python-cssutils.prerm
  packages/cssutils/trunk/debian/python3-cssutils.links
  packages/cssutils/trunk/debian/python3-cssutils.postinst
  packages/cssutils/trunk/debian/python3-cssutils.prerm
Modified:
  packages/cssutils/trunk/debian/changelog
  packages/cssutils/trunk/debian/control
  packages/cssutils/trunk/debian/rules

Modified: packages/cssutils/trunk/debian/changelog
===================================================================
--- packages/cssutils/trunk/debian/changelog	2011-11-16 02:29:51 UTC (rev 19334)
+++ packages/cssutils/trunk/debian/changelog	2011-11-16 04:13:07 UTC (rev 19335)
@@ -4,11 +4,10 @@
   * Add Vcs-* fields.
 
   [ Charlie Smotherman ]
-  * Team upload.
   * New upstream release.
   * Updated debian/watch.  Upstream now uses bitbucket for code hosting.
   * debian/control
-    - Added python-pkg-resources to python-cssutils Depends field. 
+    - Added python-pkg-resources to python-cssutils Depends field.
       Closes: #645251
     - Updated Homepage field to new bitbucket URL.
     - Added myself to Uploaders field.
@@ -17,14 +16,15 @@
     - Removed python-encutils stanza, upstream now bundles it into cssutils.
     - Added python3-cssutils stanzas.
     - B-D on python3, and python3-setuptools.
-    - No longer Depend on python-encutils
+    - No longer Depend on python-encutils.
     - No longer Recommend python-cssutils-doc package.
-    - Add Conflict: python-cssutils (<= 0.9.8~a1), python-encutils (<= 0.9.8~a1)
+    - Add Replaces and Breaks on python-cssutils (<= 0.9.8~a1),
+      python-encutils (<= 0.9.8~a1)
   * debian/rules
     - Removed dh_install override, no longer needed.
     - Added rules to build python2 and python3 packages
-    - Added rules to rename cssparse, csscombine and csscapture to csspase3,
-      csscombine3, csscapture3 to resovle a naming conflict in /usr/bin.
+    - Added rules to rename cssparse, csscombine and csscapture to cssparse3,
+      csscombine3, csscapture3 to resolve a naming conflict in /usr/bin.
   * Removed python-cssutils-doc.links, python-cssutils-doc.doc-base,
     python-cssutils-doc.docs, python-cssutils-doc.examples,
     python-cssutils.install, python-encutils.install, no longer needed.
@@ -38,7 +38,7 @@
     python3-cssutils.manpages, python3-encutils.manpages to install docs,
     manpages and examples into the python3 package.
 
- -- Charlie Smotherman <cjsmo at cableone.net>  Sun, 13 Nov 2011 21:57:42 -0500
+ -- Charlie Smotherman <cjsmo at cableone.net>  Sun, 14 Nov 2011 06:47:42 -0500
 
 cssutils (0.9.8~a1-1) unstable; urgency=low
 

Modified: packages/cssutils/trunk/debian/control
===================================================================
--- packages/cssutils/trunk/debian/control	2011-11-16 02:29:51 UTC (rev 19334)
+++ packages/cssutils/trunk/debian/control	2011-11-16 04:13:07 UTC (rev 19335)
@@ -22,7 +22,8 @@
 Depends: ${misc:Depends},
          ${python:Depends},
          python-pkg-resources
-Conflicts: python-cssutils (<= 0.9.8~a1), python-encutils (<= 0.9.8~a1)
+Replaces: python-encutils (<< 0.9.8~a1)
+Breaks: python-encutils (<< 0.9.8~a1)
 Description: CSS Cascading Style Sheets parser and builder
  Package to parse and build CSS Cascading Style Sheets. DOM only, not any
  rendering facilities! Base upon and partly implements the following
@@ -42,7 +43,8 @@
 Depends: ${misc:Depends},
          ${python3:Depends},
          python3-pkg-resources
-Conflicts: python-cssutils (<= 0.9.8~a1), python-encutils (<= 0.9.8~a1)
+Replaces: python-encutils (<< 0.9.8~a1)
+Breaks: python-encutils (<< 0.9.8~a1)
 Description: Python3 CSS Cascading Style Sheets parser and builder
  Python3 package to parse and build CSS Cascading Style Sheets. DOM only, not
  any rendering facilities! Base upon and partly implements the following

Added: packages/cssutils/trunk/debian/python-cssutils.links
===================================================================
--- packages/cssutils/trunk/debian/python-cssutils.links	                        (rev 0)
+++ packages/cssutils/trunk/debian/python-cssutils.links	2011-11-16 04:13:07 UTC (rev 19335)
@@ -0,0 +1,3 @@
+/usr/share/pyshared/cssutils/scripts/cssparse.py /usr/bin/cssparse.py2
+/usr/share/pyshared/cssutils/scripts/csscombine.py /usr/bin/csscombine.py2
+/usr/share/pyshared/cssutils/scripts/csscapture.py /usr/bin/csscapture.py2

Added: packages/cssutils/trunk/debian/python-cssutils.postinst
===================================================================
--- packages/cssutils/trunk/debian/python-cssutils.postinst	                        (rev 0)
+++ packages/cssutils/trunk/debian/python-cssutils.postinst	2011-11-16 04:13:07 UTC (rev 19335)
@@ -0,0 +1,26 @@
+#!/bin/sh
+
+set -e
+
+case "$1" in
+    configure)
+        update-alternatives --install /usr/bin/cssparse cssparse \
+                                      /usr/bin/cssparse.py2 20 \
+                            --slave /usr/bin/csscombine csscombine \
+                                      /usr/bin/csscombine.py2 21 \
+                            --slave /usr/bin/csscapture csscombine \
+                                      /usr/bin/csscapture.py2 22
+    ;;
+
+    abort-upgrade|abort-remove|abort-deconfigure)
+    ;;
+
+    *)
+        echo "postinst called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+#DEBHELPER#
+
+exit 0

Added: packages/cssutils/trunk/debian/python-cssutils.prerm
===================================================================
--- packages/cssutils/trunk/debian/python-cssutils.prerm	                        (rev 0)
+++ packages/cssutils/trunk/debian/python-cssutils.prerm	2011-11-16 04:13:07 UTC (rev 19335)
@@ -0,0 +1,23 @@
+#!/bin/sh
+
+set -e
+
+case "$1" in
+    remove|deconfigure)
+        update-alternatives --remove cssparse /usr/bin/cssparse.py2 \
+                            --remove csscombine /usr/bin/csscombine.py2 \
+                            --remove csscapture /usr/bin/csscapture.py2
+    ;;
+
+    upgrade|failed-upgrade)
+    ;;
+
+    *)
+        echo "prerm called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+#DEBHELPER#
+
+exit 0

Added: packages/cssutils/trunk/debian/python3-cssutils.links
===================================================================
--- packages/cssutils/trunk/debian/python3-cssutils.links	                        (rev 0)
+++ packages/cssutils/trunk/debian/python3-cssutils.links	2011-11-16 04:13:07 UTC (rev 19335)
@@ -0,0 +1,3 @@
+/usr/lib/python3/dist-packages/cssutils/scripts/cssparse.py /usr/bin/cssparse.py3
+/usr/lib/python3/dist-packages/cssutils/scripts/csscombine.py /usr/bin/csscombine.py3
+/usr/lib/python3/dist-packages/cssutils/scripts/csscapture.py /usr/bin/csscapture.py3

Added: packages/cssutils/trunk/debian/python3-cssutils.postinst
===================================================================
--- packages/cssutils/trunk/debian/python3-cssutils.postinst	                        (rev 0)
+++ packages/cssutils/trunk/debian/python3-cssutils.postinst	2011-11-16 04:13:07 UTC (rev 19335)
@@ -0,0 +1,26 @@
+#!/bin/sh
+
+set -e
+
+case "$1" in
+    configure)
+        update-alternatives --install /usr/bin/cssparse cssparse \
+                                      /usr/bin/cssparse.py3 10 \
+                            --install /usr/bin/csscombine csscombine \
+                                      /usr/bin/csscombine.py3 11 \
+                            --install /usr/bin/csscapture csspature \
+                                      /usr/bin/csscapture.py3 12
+    ;;
+
+    abort-upgrade|abort-remove|abort-deconfigure)
+    ;;
+
+    *)
+        echo "postinst called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+#DEBHELPER#
+
+exit 0

Added: packages/cssutils/trunk/debian/python3-cssutils.prerm
===================================================================
--- packages/cssutils/trunk/debian/python3-cssutils.prerm	                        (rev 0)
+++ packages/cssutils/trunk/debian/python3-cssutils.prerm	2011-11-16 04:13:07 UTC (rev 19335)
@@ -0,0 +1,23 @@
+#!/bin/sh
+
+set -e
+
+case "$1" in
+    remove|deconfigure)
+        update-alternatives --remove cssparse /usr/bin/cssparse.py3 \
+                            --remove csscombine /usr/bin/csscombine.py3 \
+                            --remove csscapture /usr/bin/csscapture.py3
+    ;;
+
+    upgrade|failed-upgrade)
+    ;;
+
+    *)
+        echo "prerm called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+#DEBHELPER#
+
+exit 0

Modified: packages/cssutils/trunk/debian/rules
===================================================================
--- packages/cssutils/trunk/debian/rules	2011-11-16 02:29:51 UTC (rev 19334)
+++ packages/cssutils/trunk/debian/rules	2011-11-16 04:13:07 UTC (rev 19335)
@@ -3,16 +3,6 @@
 #get our python versions
 PYVERS    := $(shell pyversions -r)
 PY3VERS   := $(shell py3versions -r)
-#set our Destination Dirs
-DESTDIR    := $(CURDIR)/debian/python3-cssutils
-#set vars for our rename for the python3 package, this prevents a naming
-#confict in /usr/bin
-P3CSSCAP  := $(DESTDIR)/usr/bin/csscapture
-P3CSSCOM  := $(DESTDIR)/usr/bin/csscombine
-P3CSSPAR  := $(DESTDIR)/usr/bin/cssparse
-P3CSSCAP3 := $(DESTDIR)/usr/bin/csscapture3
-P3CSSCOM3 := $(DESTDIR)/usr/bin/csscombine3
-P3CSSPAR3 := $(DESTDIR)/usr/bin/cssparse3
 
 %:
 	dh $@ --with python2,python3
@@ -34,9 +24,16 @@
 		$$py setup.py install --skip-build --root debian/python3-cssutils \
 			--install-layout deb; \
 	done
-	#rename cssparse, csscombine, and csscapture to cssparse3 etc... for the
-	#python3 package.
-	mv $(P3CSSCAP) $(P3CSSCAP3); \
-	mv $(P3CSSCOM) $(P3CSSCOM3); \
-	mv $(P3CSSPAR) $(P3CSSPAR3); \
 
+override_dh_fixperms:
+	dh_fixperms
+	chmod +x debian/python-cssutils/usr/share/pyshared/cssutils/scripts/cssparse.py
+	chmod +x debian/python-cssutils/usr/share/pyshared/cssutils/scripts/csscombine.py
+	chmod +x debian/python-cssutils/usr/share/pyshared/cssutils/scripts/csscapture.py
+	chmod +x debian/python3-cssutils/usr/lib/python3/dist-packages/cssutils/scripts/cssparse.py
+	chmod +x debian/python3-cssutils/usr/lib/python3/dist-packages/cssutils/scripts/csscombine.py
+	chmod +x debian/python3-cssutils/usr/lib/python3/dist-packages/cssutils/scripts/csscapture.py
+
+override_dh_auto_clean:
+	rm -rf build *.egg-info
+




More information about the Python-modules-commits mailing list