[Python-modules-commits] r19216 - in packages/cssutils/trunk/debian (changelog rules)
cjsmo-guest at users.alioth.debian.org
cjsmo-guest at users.alioth.debian.org
Fri Nov 11 08:10:48 UTC 2011
Date: Friday, November 11, 2011 @ 08:10:45
Author: cjsmo-guest
Revision: 19216
renamed cssparse, csscombine, csscapture in python3 package to resolve naming conflict in /usr/bin
Modified:
packages/cssutils/trunk/debian/changelog
packages/cssutils/trunk/debian/rules
Modified: packages/cssutils/trunk/debian/changelog
===================================================================
--- packages/cssutils/trunk/debian/changelog 2011-11-11 07:33:31 UTC (rev 19215)
+++ packages/cssutils/trunk/debian/changelog 2011-11-11 08:10:45 UTC (rev 19216)
@@ -27,6 +27,12 @@
python-cssutils package.
* Added python-cssutils.examples to install the examples as part of
python-cssutils package.
+ * Added cssparse3.manpage1, csscombine3.manpage1 and csscapture3.manpage1
+ for the python3 package.
+ * debian/rules
+ - added rules to rename cssparse, csscombine, csscapture to cssparse3,
+ csscombine3, and csscapture3 in the python3 package. This prevents a
+ naming conflict in /usr/bin
-- Charlie Smotherman <cjsmo at cableone.net> Sun, 31 Oct 2011 08:32:48 -0500
Modified: packages/cssutils/trunk/debian/rules
===================================================================
--- packages/cssutils/trunk/debian/rules 2011-11-11 07:33:31 UTC (rev 19215)
+++ packages/cssutils/trunk/debian/rules 2011-11-11 08:10:45 UTC (rev 19216)
@@ -2,6 +2,18 @@
PYVERS := $(shell pyversions -r)
PY3VERS := $(shell py3versions -r)
+P3CSSCAP := $(CURDIR)/debian/python3-cssutils/usr/bin/csscapture
+P3CSSCOM := $(CURDIR)/debian/python3-cssutils/usr/bin/csscombine
+P3CSSPAR := $(CURDIR)/debian/python3-cssutils/usr/bin/cssparse
+P3CSSCAP3 := $(CURDIR)/debian/python3-cssutils/usr/bin/csscapture3
+P3CSSCOM3 := $(CURDIR)/debian/python3-cssutils/usr/bin/csscombine3
+P3CSSPAR3 := $(CURDIR)/debian/python3-cssutils/usr/bin/cssparse3
+P3ENCCAP := $(CURDIR)/debian/python3-encutils/usr/bin/csscapture
+P3ENCCOM := $(CURDIR)/debian/python3-encutils/usr/bin/csscombine
+P3ENCPAR := $(CURDIR)/debian/python3-encutils/usr/bin/cssparse
+P3ENCCAP3 := $(CURDIR)/debian/python3-encutils/usr/bin/csscapture3
+P3ENCCOM3 := $(CURDIR)/debian/python3-encutils/usr/bin/csscombine3
+P3ENCPAR3 := $(CURDIR)/debian/python3-encutils/usr/bin/cssparse3
%:
dh $@ --with python2,python3
@@ -17,8 +29,6 @@
for py in $(PYVERS); do \
$$py setup.py install --skip-build --root debian/python-cssutils \
--install-layout deb; \
- done
- for py in $(PYVERS); do \
$$py setup.py install --skip-build --root debian/python-encutils \
--install-layout deb; \
done
@@ -26,10 +36,13 @@
for py in $(PY3VERS); do \
$$py setup.py install --skip-build --root debian/python3-cssutils \
--install-layout deb; \
- done
- set -e; \
- for py in $(PY3VERS); do \
$$py setup.py install --skip-build --root debian/python3-encutils \
--install-layout deb; \
done
+ mv $(P3CSSCAP) $(P3CSSCAP3); \
+ mv $(P3CSSCOM) $(P3CSSCOM3); \
+ mv $(P3CSSPAR) $(P3CSSPAR3); \
+ mv $(P3ENCCAP) $(P3ENCCAP3); \
+ mv $(P3ENCCOM) $(P3ENCCOM3); \
+ mv $(P3ENCPAR) $(P3ENCPAR3); \
More information about the Python-modules-commits
mailing list