[Python-modules-commits] r19406 - in packages/cssutils/trunk/debian (12 files)
cjsmo-guest at users.alioth.debian.org
cjsmo-guest at users.alioth.debian.org
Tue Nov 22 01:07:00 UTC 2011
Date: Tuesday, November 22, 2011 @ 01:06:58
Author: cjsmo-guest
Revision: 19406
more update-alternative changes to correct remove and purge
Added:
packages/cssutils/trunk/debian/patches/01_setup_fix.patch
packages/cssutils/trunk/debian/patches/02_combine_typo_fix.patch
Modified:
packages/cssutils/trunk/debian/changelog
packages/cssutils/trunk/debian/control
packages/cssutils/trunk/debian/patches/series
packages/cssutils/trunk/debian/python-cssutils.postinst
packages/cssutils/trunk/debian/python-cssutils.prerm
packages/cssutils/trunk/debian/python3-cssutils.postinst
packages/cssutils/trunk/debian/python3-cssutils.prerm
packages/cssutils/trunk/debian/rules
packages/cssutils/trunk/debian/watch
Deleted:
packages/cssutils/trunk/debian/patches/01_csscombine_typo_fix.patch
Modified: packages/cssutils/trunk/debian/changelog
===================================================================
--- packages/cssutils/trunk/debian/changelog 2011-11-21 20:26:40 UTC (rev 19405)
+++ packages/cssutils/trunk/debian/changelog 2011-11-22 01:06:58 UTC (rev 19406)
@@ -18,8 +18,8 @@
- B-D on python3, and python3-setuptools.
- No longer Depend on python-encutils.
- No longer Recommend python-cssutils-doc package.
- - Added Provides, Conflicts and Replaces so python-cssutils-0.9.8~a1 is
- completely removed from the system.
+ - Added Replaces and Breaks so python-cssutils-0.9.8~a1 is completely
+ removed from the system.
* debian/rules
- Removed dh_install override, no longer needed.
- Added rules to build python2 and python3 packages
@@ -27,9 +27,6 @@
update alternative can be used.
- Added dh_installman override and make copies of manpages to be used in
python2 and python3 packages.
- - Added dh_links override to make the update-alternatives sym links.
- - Added rules to rename python3 executables shebang to python3.
- - Added dh_fixperms override to make our executables executable.
* 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.
@@ -39,10 +36,10 @@
python-cssutils package.
* Added python3-cssutils.doc, python3-cssutils.examples, to install docs,
and examples into the python3 package.
- * Update to use update-alternatives, added python-cssutils.links,
- python-cssutils.postinst, python-cssutils.prerm, python3-cssutils.links,
- python3-cssutils.postinst, python3-cssutils.prerm.
- * Added 01_csscombine_typo_fix.patch to correct a typo in csscombine.py.
+ * Update to use update-alternatives, python-cssutils.postinst,
+ python-cssutils.prerm, python3-cssutils.postinst, python3-cssutils.prerm.
+ * Added 01_setup_fix.patch to create py2 and py3 executables.
+ * Added 02_csscombine_typo_fix.patch to correct a typo in csscombine.py.
-- Charlie Smotherman <cjsmo at cableone.net> Sun, 15 Nov 2011 22:16:42 -0500
Modified: packages/cssutils/trunk/debian/control
===================================================================
--- packages/cssutils/trunk/debian/control 2011-11-21 20:26:40 UTC (rev 19405)
+++ packages/cssutils/trunk/debian/control 2011-11-22 01:06:58 UTC (rev 19406)
@@ -22,9 +22,8 @@
Depends: ${misc:Depends},
${python:Depends},
python-pkg-resources
-Provides: python-cssutils
-Conflicts: python-cssutils (<< 0.9.8~a3), python-encutils (<= 0.9.8~a1)
-Replaces: python-cssutils (<= 0.9.8~a1), python-encutils (<= 0.9.8~a1)
+Replaces: python-cssutils (<< 0.9.8~a3), python-encutils, python-cssutils-doc
+Breaks: python-cssutils (<< 0.9.8~a3)
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
@@ -44,9 +43,7 @@
Depends: ${misc:Depends},
${python3:Depends},
python3-pkg-resources
-Provides: python3-cssutils
-Conflicts: python-cssutils (<< 0.9.8~a3), python-encutils (<= 0.9.8~a1)
-Replaces: python-cssutils (<= 0.9.8~a1), python-encutils (<= 0.9.8~a1)
+Replaces: python-cssutils (<< 0.9.8~a3), python-encutils, python-cssutils-doc
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
Deleted: packages/cssutils/trunk/debian/patches/01_csscombine_typo_fix.patch
===================================================================
--- packages/cssutils/trunk/debian/patches/01_csscombine_typo_fix.patch 2011-11-21 20:26:40 UTC (rev 19405)
+++ packages/cssutils/trunk/debian/patches/01_csscombine_typo_fix.patch 2011-11-22 01:06:58 UTC (rev 19406)
@@ -1,24 +0,0 @@
-Description: Fix for a typo in csscombine.py
-Author: Charlie Smotherman <cjsmo at cableone.net>
-
-Index: cssutils-0.9.8~a3/src/cssutils/scripts/csscombine.py
-===================================================================
---- cssutils-0.9.8~a3.orig/src/cssutils/scripts/csscombine.py 2011-11-18 12:51:53.370764669 -0600
-+++ cssutils-0.9.8~a3/src/cssutils/scripts/csscombine.py 2011-11-18 12:52:55.698764881 -0600
-@@ -54,7 +54,7 @@
- __docformat__ = 'restructuredtext'
- __version__ = '$Id$'
-
--from cssutils.script import csscombine
-+from cssutils.scripts import csscombine
- import optparse
- import sys
-
-@@ -91,4 +91,5 @@
-
-
- if __name__ == '__main__':
-- sys.exit(main())
-\ No newline at end of file
-+ sys.exit(main())
-+
Added: packages/cssutils/trunk/debian/patches/01_setup_fix.patch
===================================================================
--- packages/cssutils/trunk/debian/patches/01_setup_fix.patch (rev 0)
+++ packages/cssutils/trunk/debian/patches/01_setup_fix.patch 2011-11-22 01:06:58 UTC (rev 19406)
@@ -0,0 +1,25 @@
+Description: Create our py2 and py3 executables to use with
+update-alternatives, this way we can have py2 and py3 packages installed at
+the same time
+Author: Charlie Smotherman <cjsmo at cableone.net>
+
+Index: cssutils-0.9.8~a3/setup.py
+===================================================================
+--- cssutils-0.9.8~a3.orig/setup.py 2011-11-21 08:18:16.510405301 -0600
++++ cssutils-0.9.8~a3/setup.py 2011-11-21 08:21:55.970405736 -0600
+@@ -58,9 +58,12 @@
+ tests_require='mock',
+ entry_points={
+ 'console_scripts': [
+- 'csscapture = cssutils.scripts.csscapture:main',
+- 'csscombine = cssutils.scripts.csscombine:main',
+- 'cssparse = cssutils.scripts.cssparse:main'
++ 'csscapture_py2 = cssutils.scripts.csscapture:main',
++ 'csscombine_py2 = cssutils.scripts.csscombine:main',
++ 'cssparse_py2 = cssutils.scripts.cssparse:main',
++ 'csscapture_py3 = cssutils.scripts.csscapture:main',
++ 'csscombine_py3 = cssutils.scripts.csscombine:main',
++ 'cssparse_py3 = cssutils.scripts.cssparse:main'
+ ]
+ },
+ description='A CSS Cascading Style Sheets library for Python',
Added: packages/cssutils/trunk/debian/patches/02_combine_typo_fix.patch
===================================================================
--- packages/cssutils/trunk/debian/patches/02_combine_typo_fix.patch (rev 0)
+++ packages/cssutils/trunk/debian/patches/02_combine_typo_fix.patch 2011-11-22 01:06:58 UTC (rev 19406)
@@ -0,0 +1,23 @@
+Description: Corrects a typo in csscombine.py
+Author: Charlie Smotherman <cjsmo at cableone.net>
+
+Index: cssutils-0.9.8~a3/src/cssutils/scripts/csscombine.py
+===================================================================
+--- cssutils-0.9.8~a3.orig/src/cssutils/scripts/csscombine.py 2011-11-21 13:28:12.882442102 -0600
++++ cssutils-0.9.8~a3/src/cssutils/scripts/csscombine.py 2011-11-21 13:28:48.466442172 -0600
+@@ -54,7 +54,7 @@
+ __docformat__ = 'restructuredtext'
+ __version__ = '$Id$'
+
+-from cssutils.script import csscombine
++from cssutils.scripts import csscombine
+ import optparse
+ import sys
+
+@@ -91,4 +91,4 @@
+
+
+ if __name__ == '__main__':
+- sys.exit(main())
+\ No newline at end of file
++ sys.exit(main())
Modified: packages/cssutils/trunk/debian/patches/series
===================================================================
--- packages/cssutils/trunk/debian/patches/series 2011-11-21 20:26:40 UTC (rev 19405)
+++ packages/cssutils/trunk/debian/patches/series 2011-11-22 01:06:58 UTC (rev 19406)
@@ -1 +1,2 @@
-01_csscombine_typo_fix.patch
+01_setup_fix.patch
+02_combine_typo_fix.patch
Modified: packages/cssutils/trunk/debian/python-cssutils.postinst
===================================================================
--- packages/cssutils/trunk/debian/python-cssutils.postinst 2011-11-21 20:26:40 UTC (rev 19405)
+++ packages/cssutils/trunk/debian/python-cssutils.postinst 2011-11-22 01:06:58 UTC (rev 19406)
@@ -4,18 +4,33 @@
case "$1" in
configure)
+ if [ -f /usr/bin/cssparse ] && [ ! -h /usr/bin/cssparse ]; then
+ if [ -e /usr/bin/csspase_py2 ]; then
+ rm /usr/bin/cssparse
+ fi
+ fi
+ if [ -f /usr/bin/csscombine ] && [ ! -h /usr/bin/csscombine ]; then
+ if [ -e /usr/bin/csscombine_py2 ]; then
+ rm /usr/bin/csscombine
+ fi
+ fi
+ if [ -f /usr/bin/csscapture ] && [ ! -h /usr/bin/csscapture ]; then
+ if [ -e /usr/bin/csscapture_py2 ]; then
+ rm /usr/bin/csscapture
+ fi
+ fi
update-alternatives --install /usr/bin/cssparse cssparse \
- /usr/bin/cssparse.py2 20 \
+ /usr/bin/cssparse_py2 20 \
--slave /usr/share/man/man1/cssparse.1.gz \
cssparse.1.gz \
/usr/share/man/man1/cssparse.py2.1.gz
update-alternatives --install /usr/bin/csscombine csscombine \
- /usr/bin/csscombine.py2 21 \
+ /usr/bin/csscombine_py2 21 \
--slave /usr/share/man/man1/csscombine.1.gz \
csscombine.1.gz \
/usr/share/man/man1/csscombine.py2.1.gz
update-alternatives --install /usr/bin/csscapture csscapture \
- /usr/bin/csscapture.py2 22 \
+ /usr/bin/csscapture_py2 22 \
--slave /usr/share/man/man1/csscapture.1.gz \
csscapture.1.gz \
/usr/share/man/man1/csscapture.py2.1.gz
Modified: packages/cssutils/trunk/debian/python-cssutils.prerm
===================================================================
--- packages/cssutils/trunk/debian/python-cssutils.prerm 2011-11-21 20:26:40 UTC (rev 19405)
+++ packages/cssutils/trunk/debian/python-cssutils.prerm 2011-11-22 01:06:58 UTC (rev 19406)
@@ -4,9 +4,9 @@
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
+ update-alternatives --remove cssparse /usr/bin/cssparse_py2
+ update-alternatives --remove csscombine /usr/bin/csscombine_py2
+ update-alternatives --remove csscapture /usr/bin/csscapture_py2
;;
upgrade|failed-upgrade)
Modified: packages/cssutils/trunk/debian/python3-cssutils.postinst
===================================================================
--- packages/cssutils/trunk/debian/python3-cssutils.postinst 2011-11-21 20:26:40 UTC (rev 19405)
+++ packages/cssutils/trunk/debian/python3-cssutils.postinst 2011-11-22 01:06:58 UTC (rev 19406)
@@ -4,18 +4,33 @@
case "$1" in
configure)
+ if [ -f /usr/bin/cssparse ] && [ ! -h /usr/bin/cssparse ]; then
+ if [ -e /usr/bin/csspase_py3 ]; then
+ rm /usr/bin/cssparse
+ fi
+ fi
+ if [ -f /usr/bin/csscombine ] && [ ! -h /usr/bin/csscombine ]; then
+ if [ -e /usr/bin/csscombine_py3 ]; then
+ rm /usr/bin/csscombine
+ fi
+ fi
+ if [ -f /usr/bin/csscapture ] && [ ! -h /usr/bin/csscapture ]; then
+ if [ -e /usr/bin/csscapture_py3 ]; then
+ rm /usr/bin/csscapture
+ fi
+ fi
update-alternatives --install /usr/bin/cssparse cssparse \
- /usr/bin/cssparse.py3 10 \
+ /usr/bin/cssparse_py3 10 \
--slave /usr/share/man/man1/cssparse.1.gz \
cssparse.1.gz \
/usr/share/man/man1/cssparse.py3.1.gz
update-alternatives --install /usr/bin/csscombine csscombine \
- /usr/bin/csscombine.py3 11 \
+ /usr/bin/csscombine_py3 10 \
--slave /usr/share/man/man1/csscombine.1.gz \
csscombine.1.gz \
/usr/share/man/man1/csscombine.py3.1.gz
update-alternatives --install /usr/bin/csscapture csscapture \
- /usr/bin/csscapture.py3 12 \
+ /usr/bin/csscapture_py3 10 \
--slave /usr/share/man/man1/csscapture.1.gz \
csscapture.1.gz \
/usr/share/man/man1/csscapture.py3.1.gz
Modified: packages/cssutils/trunk/debian/python3-cssutils.prerm
===================================================================
--- packages/cssutils/trunk/debian/python3-cssutils.prerm 2011-11-21 20:26:40 UTC (rev 19405)
+++ packages/cssutils/trunk/debian/python3-cssutils.prerm 2011-11-22 01:06:58 UTC (rev 19406)
@@ -4,9 +4,9 @@
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
+ update-alternatives --remove cssparse /usr/bin/cssparse_py3
+ update-alternatives --remove csscombine /usr/bin/csscombine_py3
+ update-alternatives --remove csscapture /usr/bin/csscapture_py3
;;
upgrade|failed-upgrade)
Modified: packages/cssutils/trunk/debian/rules
===================================================================
--- packages/cssutils/trunk/debian/rules 2011-11-21 20:26:40 UTC (rev 19405)
+++ packages/cssutils/trunk/debian/rules 2011-11-22 01:06:58 UTC (rev 19406)
@@ -19,17 +19,19 @@
$$py setup.py install --skip-build --root debian/python-cssutils \
--install-layout deb; \
done
- rm $(CURDIR)/debian/python-cssutils/usr/bin/cssparse
- rm $(CURDIR)/debian/python-cssutils/usr/bin/csscombine
- rm $(CURDIR)/debian/python-cssutils/usr/bin/csscapture
+ #remove py3 executables from py2 package
+ rm $(CURDIR)/debian/python-cssutils/usr/bin/cssparse_py3
+ rm $(CURDIR)/debian/python-cssutils/usr/bin/csscombine_py3
+ rm $(CURDIR)/debian/python-cssutils/usr/bin/csscapture_py3
set -e; \
for py in $(PY3VERS); do \
$$py setup.py install --skip-build --root debian/python3-cssutils \
--install-layout deb; \
done
- rm $(CURDIR)/debian/python3-cssutils/usr/bin/cssparse
- rm $(CURDIR)/debian/python3-cssutils/usr/bin/csscombine
- rm $(CURDIR)/debian/python3-cssutils/usr/bin/csscapture
+ #remove py2 executables from py3 package
+ rm $(CURDIR)/debian/python3-cssutils/usr/bin/cssparse_py2
+ rm $(CURDIR)/debian/python3-cssutils/usr/bin/csscombine_py2
+ rm $(CURDIR)/debian/python3-cssutils/usr/bin/csscapture_py2
override_dh_installman:
cp debian/man/cssparse.manpage1 debian/man/cssparse.py2.1
@@ -45,35 +47,6 @@
cp debian/man/csscapture.manpage1 debian/man/csscapture.py3.1
dh_installman -p python3-cssutils debian/man/csscapture.py3.1
-override_dh_link:
- dh_link -p python-cssutils /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
- dh_link -p python3-cssutils /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
- sed -i '1s,python$$,python3,' \
- debian/python3-cssutils/usr/lib/python3/dist-packages/cssutils/scripts/cssparse.py
- sed -i '1s,python$$,python3,' \
- debian/python3-cssutils/usr/lib/python3/dist-packages/cssutils/scripts/csscombine.py
- sed -i '1s,python$$,python3,' \
- debian/python3-cssutils/usr/lib/python3/dist-packages/cssutils/scripts/csscapture.py
-
-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
rm -f debian/man/cssparse.py2.1 debian/man/csscombine.py2.1 debian/man/csscapture.py2.1
Modified: packages/cssutils/trunk/debian/watch
===================================================================
--- packages/cssutils/trunk/debian/watch 2011-11-21 20:26:40 UTC (rev 19405)
+++ packages/cssutils/trunk/debian/watch 2011-11-22 01:06:58 UTC (rev 19406)
@@ -1,2 +1,3 @@
version=3
+opts="dversionmangle=s/\~//" \
https://bitbucket.org/cthedot/cssutils/downloads/cssutils-([0-9.a-z]+).zip
More information about the Python-modules-commits
mailing list