[Python-modules-commits] r18956 - in packages/python-werkzeug/trunk/debian (7 files)

piotr at users.alioth.debian.org piotr at users.alioth.debian.org
Sun Oct 16 17:09:21 UTC 2011 

    Date: Sunday, October 16, 2011 @ 17:09:19
  Author: piotr
Revision: 18956

  - ubuntu.ttf removed from upstream tarball (canno regenerate this file
    using free tools), get-orig-source target added to debian/rules
* Let dh_sphinxdoc handle documentation files, python-sphinx build
  dependency bumped to 1.0.7+dfsg-1

Added:
  packages/python-werkzeug/trunk/debian/patches/
  packages/python-werkzeug/trunk/debian/patches/drop_ubuntu_font.patch
  packages/python-werkzeug/trunk/debian/patches/series
Modified:
  packages/python-werkzeug/trunk/debian/changelog
  packages/python-werkzeug/trunk/debian/control
  packages/python-werkzeug/trunk/debian/rules
  packages/python-werkzeug/trunk/debian/watch

Modified: packages/python-werkzeug/trunk/debian/changelog
===================================================================
--- packages/python-werkzeug/trunk/debian/changelog	2011-10-16 12:51:59 UTC (rev 18955)
+++ packages/python-werkzeug/trunk/debian/changelog	2011-10-16 17:09:19 UTC (rev 18956)
@@ -1,14 +1,18 @@
-python-werkzeug (0.7-1) UNRELEASED; urgency=low
+python-werkzeug (0.8.1+dfsg-1) unstable; urgency=low
 
   * New upstream release
     - no longer double quotes location header during redirects. Closes: #594172
+    - ubuntu.ttf removed from upstream tarball (canno regenerate this file
+      using free tools), get-orig-source target added to debian/rules
   * Bump minimum debhelper version to 8.1.0 (which no longer compresses
     objects.inv files, closes: #608751)
   * Switch from dh_pysupport to dh_python2
   * Source format changed to 3.0 (quilt)
+  * Let dh_sphinxdoc handle documentation files, python-sphinx build
+    dependency bumped to 1.0.7+dfsg-1
   * Standards-Version bumped to 3.9.2 (no changes needed)
 
- -- Piotr Ożarowski <piotr at debian.org>  Mon, 25 Jul 2011 11:56:30 +0200
+ -- Piotr Ożarowski <piotr at debian.org>  Sun, 16 Oct 2011 15:01:03 +0200
 
 python-werkzeug (0.6.2-1) unstable; urgency=low
 

Modified: packages/python-werkzeug/trunk/debian/control
===================================================================
--- packages/python-werkzeug/trunk/debian/control	2011-10-16 12:51:59 UTC (rev 18955)
+++ packages/python-werkzeug/trunk/debian/control	2011-10-16 17:09:19 UTC (rev 18956)
@@ -5,7 +5,7 @@
 Uploaders: Piotr Ożarowski <piotr at debian.org>,
  Python Modules Packaging Team <python-modules-team at lists.alioth.debian.org>
 Standards-Version: 3.9.2
-Build-Depends: debhelper (>= 8.1.0), python (>= 2.6.6-3), python-sphinx
+Build-Depends: debhelper (>= 8.1.0), python (>= 2.6.6-3), python-sphinx (>= 1.0.7+dfsg-1~)
 Build-Depends-Indep: python-setuptools (>= 0.6b3),
  python-simplejson, python-nose, python-lxml
 Homepage: http://werkzeug.pocoo.org/
@@ -17,7 +17,8 @@
 Architecture: all
 Depends: ${python:Depends}, ${misc:Depends}, libjs-jquery
 Recommends: python-simplejson | python (>= 2.6), python-openssl
-Suggests: ipython, python-genshi, python-pkg-resources, python-lxml, python-memcache
+Suggests: ipython, python-genshi, python-pkg-resources, python-lxml, python-memcache,
+ ${sphinxdoc:Depends}
 Description: collection of utilities for WSGI applications
  The Web Server Gateway Interface (WSGI) is a standard interface between web
  server software and web applications written in Python.

Added: packages/python-werkzeug/trunk/debian/patches/drop_ubuntu_font.patch
===================================================================
--- packages/python-werkzeug/trunk/debian/patches/drop_ubuntu_font.patch	                        (rev 0)
+++ packages/python-werkzeug/trunk/debian/patches/drop_ubuntu_font.patch	2011-10-16 17:09:19 UTC (rev 18956)
@@ -0,0 +1,16 @@
+# ubuntu.ttf has been removed from Debian package
+Index: python-werkzeug-0.8.1/werkzeug/debug/shared/style.css
+===================================================================
+--- python-werkzeug-0.8.1.orig/werkzeug/debug/shared/style.css
++++ python-werkzeug-0.8.1/werkzeug/debug/shared/style.css
+@@ -1,9 +1,7 @@
+ @font-face {
+-  font-family: 'Ubuntu';
++  font-family: 'Ubuntu', 'Lucida Grande', 'Lucida Sans Unicode', 'Geneva', 'Verdana';
+   font-style: normal;
+   font-weight: normal;
+-  src: local('Ubuntu'), local('Ubuntu-Regular'),
+-    url('?__debugger__=yes&cmd=resource&f=ubuntu.ttf') format('truetype');
+ }
+ 
+ body, input  { font-family: 'Lucida Grande', 'Lucida Sans Unicode', 'Geneva',

Added: packages/python-werkzeug/trunk/debian/patches/series
===================================================================
--- packages/python-werkzeug/trunk/debian/patches/series	                        (rev 0)
+++ packages/python-werkzeug/trunk/debian/patches/series	2011-10-16 17:09:19 UTC (rev 18956)
@@ -0,0 +1 @@
+drop_ubuntu_font.patch

Modified: packages/python-werkzeug/trunk/debian/rules
===================================================================
--- packages/python-werkzeug/trunk/debian/rules	2011-10-16 12:51:59 UTC (rev 18955)
+++ packages/python-werkzeug/trunk/debian/rules	2011-10-16 17:09:19 UTC (rev 18956)
@@ -6,14 +6,13 @@
 # permitted in any medium without royalty provided the copyright notice and this
 # notice are preserved.
 
-#export DH_VERBOSE=1
 export PYTHONPATH=$(abspath $(CURDIR))
 PKGDIR=$(CURDIR)/debian/python-werkzeug/
 
 include /usr/share/python/python.mk
 
 %:
-	dh $@ --with python2
+	dh $@ --with python2,sphinxdoc
 
 override_dh_auto_install:
 	python setup.py install \
@@ -22,8 +21,6 @@
 		--root $(PKGDIR)
 	dh_link usr/share/javascript/jquery/jquery.js \
 	  $(call py_libdir,$(shell pyversions -vd))/werkzeug/debug/shared/jquery.js
-	dh_link usr/share/javascript/jquery/jquery.js \
-	  /usr/share/doc/python-werkzeug/html/_static/jquery.js
 	dh_link /usr/share/doc/python-werkzeug/html/_sources \
 		/usr/share/doc/python-werkzeug/rst
 
@@ -37,3 +34,12 @@
 	make -C docs clean
 	find $(CURDIR) -name '*\.py[co]' -delete
 	find $(CURDIR) \( -name '\._*' -o -name '\.DS_Store' \) -delete
+
+get-orig-source:
+	trap 'rm -rf $(CURDIR)/.werkzeug-tarball' EXIT;\
+	VER=$(shell dpkg-parsechangelog | sed -rne 's,^Version: ([^-+]+).*,\1,p') &&\
+	mkdir -p .werkzeug-tarball &&\
+	uscan --force-download --rename --destdir=.werkzeug-tarball --upstream-version=$$VER &&\
+	cd .werkzeug-tarball &&\
+	tar xf python-werkzeug*tar.gz --exclude ubuntu.ttf --exclude FONT_LICENSE &&\
+	tar Jcf ../python-werkzeug_$$VER+dfsg.orig.tar.xz Werkzeug-$$VER

Modified: packages/python-werkzeug/trunk/debian/watch
===================================================================
--- packages/python-werkzeug/trunk/debian/watch	2011-10-16 12:51:59 UTC (rev 18955)
+++ packages/python-werkzeug/trunk/debian/watch	2011-10-16 17:09:19 UTC (rev 18956)
@@ -1,2 +1,3 @@
 version=3
+opts=dversionmangle=s/\+dfsg// \
 http://pypi.python.org/packages/source/W/Werkzeug/Werkzeug-(.*)\.tar\.gz

More information about the Python-modules-commits mailing list