[Python-modules-commits] r19324 - in packages/cssutils/trunk/debian (5 files)
cjsmo-guest at users.alioth.debian.org
cjsmo-guest at users.alioth.debian.org
Mon Nov 14 04:14:35 UTC 2011
Date: Monday, November 14, 2011 @ 04:14:32
Author: cjsmo-guest
Revision: 19324
drop python-encutils package upstream bundles it into python-cssutils now
Modified:
packages/cssutils/trunk/debian/changelog
packages/cssutils/trunk/debian/control
packages/cssutils/trunk/debian/rules
Deleted:
packages/cssutils/trunk/debian/python-encutils.manpages
packages/cssutils/trunk/debian/python3-encutils.manpages
Modified: packages/cssutils/trunk/debian/changelog
===================================================================
--- packages/cssutils/trunk/debian/changelog 2011-11-14 00:35:54 UTC (rev 19323)
+++ packages/cssutils/trunk/debian/changelog 2011-11-14 04:14:32 UTC (rev 19324)
@@ -14,30 +14,31 @@
- Added myself to Uploaders field.
- Removed python-cssutils-doc stanza, upstream no longer ships any doc
files.
- - Added python3-cssutils and python3-encutils stanzas.
- - B-D on python-all, python3-all, and python3-setuptools.
+ - 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 Recommend python-cssutils-doc package.
+ - Add Conflict: 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 python3-cssutils and python3-encutils packages.
+ - 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.
* 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
+ python-cssutils.install, python-encutils.install, no longer needed.
* Added python-cssutils.doc to install README.txt as part of the
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
* Added python3-cssutils.doc, python3-cssutils.examples,
python3-cssutils.manpages, python3-encutils.manpages to install docs,
manpages and examples into the python3 package.
- -- Charlie Smotherman <cjsmo at cableone.net> Fri, 11 Nov 2011 02:30:24 -0500
+ -- Charlie Smotherman <cjsmo at cableone.net> Sun, 13 Nov 2011 21:57:42 -0500
cssutils (0.9.8~a1-1) unstable; urgency=low
Modified: packages/cssutils/trunk/debian/control
===================================================================
--- packages/cssutils/trunk/debian/control 2011-11-14 00:35:54 UTC (rev 19323)
+++ packages/cssutils/trunk/debian/control 2011-11-14 04:14:32 UTC (rev 19324)
@@ -6,9 +6,9 @@
Martin Pitt <mpitt at debian.org>,
Charlie Smotherman <cjsmo at cableone.net>
Build-Depends: debhelper (>= 7.0.50~),
- python-all (>= 2.6.6-3~),
+ python (>= 2.6.6-3~),
python-setuptools,
- python3-all,
+ python3,
python3-setuptools
Standards-Version: 3.9.2
Homepage: https://bitbucket.org/cthedot/cssutils
@@ -21,8 +21,8 @@
Architecture: all
Depends: ${misc:Depends},
${python:Depends},
- python-encutils,
python-pkg-resources
+Conflicts: python-cssutils (<= 0.9.8~a1), 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
@@ -41,8 +41,8 @@
Architecture: all
Depends: ${misc:Depends},
${python3:Depends},
- python3-encutils,
python3-pkg-resources
+Conflicts: python-cssutils (<= 0.9.8~a1), 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
@@ -56,19 +56,3 @@
* MediaQueries
* Namespaces
* Selectors
-
-Package: python-encutils
-Architecture: all
-Depends: ${misc:Depends},
- ${python:Depends}
-Description: Encoding detection collection for Python
- A collection of helper functions to detect encodings of text
- files (like HTML, XHTML, XML, CSS, etc.) retrieved via HTTP, file or string.
-
-Package: python3-encutils
-Architecture: all
-Depends: ${misc:Depends},
- ${python3:Depends}
-Description: Encoding detection collection for Python3
- A collection of Python3 helper functions to detect encodings of text
- files (like HTML, XHTML, XML, CSS, etc.) retrieved via HTTP, file or string.
Deleted: packages/cssutils/trunk/debian/python-encutils.manpages
===================================================================
--- packages/cssutils/trunk/debian/python-encutils.manpages 2011-11-14 00:35:54 UTC (rev 19323)
+++ packages/cssutils/trunk/debian/python-encutils.manpages 2011-11-14 04:14:32 UTC (rev 19324)
@@ -1,3 +0,0 @@
-debian/man/csscapture.manpage1
-debian/man/csscombine.manpage1
-debian/man/cssparse.manpage1
Deleted: packages/cssutils/trunk/debian/python3-encutils.manpages
===================================================================
--- packages/cssutils/trunk/debian/python3-encutils.manpages 2011-11-14 00:35:54 UTC (rev 19323)
+++ packages/cssutils/trunk/debian/python3-encutils.manpages 2011-11-14 04:14:32 UTC (rev 19324)
@@ -1,3 +0,0 @@
-debian/man/csscapture3.manpage1
-debian/man/csscombine3.manpage1
-debian/man/cssparse3.manpage1
Modified: packages/cssutils/trunk/debian/rules
===================================================================
--- packages/cssutils/trunk/debian/rules 2011-11-14 00:35:54 UTC (rev 19323)
+++ packages/cssutils/trunk/debian/rules 2011-11-14 04:14:32 UTC (rev 19324)
@@ -1,19 +1,18 @@
#!/usr/bin/make -f
-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
+#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
@@ -29,20 +28,15 @@
for py in $(PYVERS); do \
$$py setup.py install --skip-build --root debian/python-cssutils \
--install-layout deb; \
- $$py setup.py install --skip-build --root debian/python-encutils \
- --install-layout deb; \
done
set -e; \
for py in $(PY3VERS); do \
$$py setup.py install --skip-build --root debian/python3-cssutils \
--install-layout deb; \
- $$py setup.py install --skip-build --root debian/python3-encutils \
- --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); \
- mv $(P3ENCCAP) $(P3ENCCAP3); \
- mv $(P3ENCCOM) $(P3ENCCOM3); \
- mv $(P3ENCPAR) $(P3ENCPAR3); \
More information about the Python-modules-commits
mailing list