[Python-modules-commits] r24472 - in packages/markupsafe/trunk/debian (4 files)

[piotr at users.alioth.debian.org]

    Date: Monday, May 20, 2013 @ 22:09:25
  Author: piotr
Revision: 24472

* New upstream release
* Harden extension (debian/rules updated to export hardening build flags)
* Standards-Version bumped to 3.9.4
  - add build-indep and build-arch targets in debian/rules
* debian/compat bumped to 9
* Package descriptions updated (thanks to Martin Eberhard Schauer and
  Justin B Rye, closes: #682835)

Modified:
  packages/markupsafe/trunk/debian/changelog
  packages/markupsafe/trunk/debian/compat
  packages/markupsafe/trunk/debian/control
  packages/markupsafe/trunk/debian/rules

Modified: packages/markupsafe/trunk/debian/changelog
===================================================================
--- packages/markupsafe/trunk/debian/changelog	2013-05-20 20:46:59 UTC (rev 24471)
+++ packages/markupsafe/trunk/debian/changelog	2013-05-20 22:09:25 UTC (rev 24472)
@@ -1,9 +1,19 @@
-markupsafe (0.15-2) UNRELEASED; urgency=low
+markupsafe (0.16-1) unstable; urgency=low
 
+  [ Jakub Wilk ]
   * Use canonical URIs for Vcs-* fields.
 
- -- Jakub Wilk <jwilk at debian.org>  Sun, 05 May 2013 16:01:13 +0200
+  [ Piotr Ożarowski ]
+  * New upstream release
+  * Harden extension (debian/rules updated to export hardening build flags)
+  * Standards-Version bumped to 3.9.4
+    - add build-indep and build-arch targets in debian/rules
+  * debian/compat bumped to 9
+  * Package descriptions updated (thanks to Martin Eberhard Schauer and
+    Justin B Rye, closes: #682835)
 
+ -- Piotr Ożarowski <piotr at debian.org>  Mon, 20 May 2013 23:25:11 +0200
+
 markupsafe (0.15-1) unstable; urgency=low
 
   * New upstream release

Modified: packages/markupsafe/trunk/debian/compat
===================================================================
--- packages/markupsafe/trunk/debian/compat	2013-05-20 20:46:59 UTC (rev 24471)
+++ packages/markupsafe/trunk/debian/compat	2013-05-20 22:09:25 UTC (rev 24472)
@@ -1 +1 @@
-5
+9
\ No newline at end of file

Modified: packages/markupsafe/trunk/debian/control
===================================================================
--- packages/markupsafe/trunk/debian/control	2013-05-20 20:46:59 UTC (rev 24471)
+++ packages/markupsafe/trunk/debian/control	2013-05-20 22:09:25 UTC (rev 24472)
@@ -3,11 +3,11 @@
 Priority: optional
 Maintainer: Piotr Ożarowski <piotr at debian.org>
 Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
-Build-Depends: debhelper (>= 5),
+Build-Depends: debhelper (>= 9),
  python-all-dev (>= 2.6.5-2), python3-all-dev (>= 3.1.2-8~),
  python-all-dbg, python3-all-dbg,
  python-setuptools, python3-setuptools
-Standards-Version: 3.9.2
+Standards-Version: 3.9.4
 Homepage: http://pypi.python.org/pypi/MarkupSafe
 Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/markupsafe/trunk/
 Vcs-Browser: http://anonscm.debian.org/viewvc/python-modules/packages/markupsafe/trunk/
@@ -17,61 +17,41 @@
 Architecture: any
 Depends: ${misc:Depends}, ${python:Depends}, ${shlibs:Depends}
 Provides: ${python:Provides}
-Description: XML/HTML/XHTML Markup safe string for Python
- MarkupSafe implements a unicode subclass that supports HTML strings:
- .
-  >>> from markupsafe import Markup, escape
-  >>> escape("<script>alert(document.cookie);</script>")
-  Markup(u'<script>alert(document.cookie);</script>')
-  >>> tmpl = Markup("<em>%s</em>")
-  >>> tmpl % "Peter > Lustig"
-  Markup(u'<em>Peter > Lustig</em>')
- .
- If you want to make an object unicode that is not yet unicode
- but don't want to lose the taint information, you can use the
- `soft_unicode` function:
- .
-  >>> from markupsafe import soft_unicode
-  >>> soft_unicode(42)
-  u'42'
-  >>> soft_unicode(Markup('foo'))
-  Markup(u'foo')
+Description: HTML/XHTML/XML string library for Python
+ MarkupSafe is a Python library implementing a unicode subclass that is
+ aware of HTML escaping rules. It can be used to implement automatic
+ string escaping.
 
 Package: python-markupsafe-dbg
 Architecture: any
 Section: debug
 Priority: extra
 Depends: python-markupsafe (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}
-Description: XML/HTML/XHTML Markup safe string for Python
+Description: HTML/XHTML/XML string library for Python - debug version
+ MarkupSafe is a Python library implementing a unicode subclass that is
+ aware of HTML escaping rules. It can be used to implement automatic
+ string escaping.
+ .
  This package contains the extension built for the Python debug interpreter.
 
 Package: python3-markupsafe
 Architecture: any
 Depends: ${misc:Depends}, ${python3:Depends}, ${shlibs:Depends}
-Description: XML/HTML/XHTML Markup safe string for Python3
- MarkupSafe implements a unicode subclass that supports HTML strings:
+Description: HTML/XHTML/XML string library for Python 3
+ MarkupSafe is a Python library implementing a unicode subclass that is
+ aware of HTML escaping rules. It can be used to implement automatic
+ string escaping.
  .
-  >>> from markupsafe import Markup, escape
-  >>> escape("<script>alert(document.cookie);</script>")
-  Markup('<script>alert(document.cookie);</script>')
-  >>> tmpl = Markup("<em>%s</em>")
-  >>> tmpl % "Peter > Lustig"
-  Markup('<em>Peter > Lustig</em>')
- .
- If you want to make an object unicode that is not yet unicode
- but don't want to lose the taint information, you can use the
- `soft_unicode` function:
- .
-  >>> from markupsafe import soft_unicode
-  >>> soft_unicode(42)
-  '42'
-  >>> soft_unicode(Markup('foo'))
-  Markup('foo')
+ This package contains the Python 3 version.
 
 Package: python3-markupsafe-dbg
 Architecture: any
 Section: debug
 Priority: extra
 Depends: python3-markupsafe (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}, ${python3:Depends}
-Description: XML/HTML/XHTML Markup safe string for Python3
- This package contains the extension built for the Python3 debug interpreter.
+Description: HTML/XHTML/XML string library for Python 3 - debug version
+ MarkupSafe is a Python library implementing a unicode subclass that is
+ aware of HTML escaping rules. It can be used to implement automatic
+ string escaping.
+ .
+ This package contains the extension built for the Python 3 debug interpreter.

Modified: packages/markupsafe/trunk/debian/rules
===================================================================
--- packages/markupsafe/trunk/debian/rules	2013-05-20 20:46:59 UTC (rev 24471)
+++ packages/markupsafe/trunk/debian/rules	2013-05-20 22:09:25 UTC (rev 24472)
@@ -1,23 +1,28 @@
 #!/usr/bin/make -f
 
 #export DH_VERBOSE=1
-PYVERS=$(shell pyversions -vr) $(shell py3versions -sv)
+PYVERS=$(shell pyversions -vr) $(shell py3versions -vr)
 
 include /usr/share/python/python.mk
 pkgdir = $(CURDIR)/debian/python$(if $(patsubst 3.%,,$(1)),,3)-markupsafe
 
+DPKG_EXPORT_BUILDFLAGS = 1
+-include /usr/share/dpkg/buildflags.mk
+
 clean:
 	dh_testdir
 	dh_testroot
 	rm -rf dist build MarkupSafe.egg-info
 	find . -name '*\.pyc' -delete
-	dh_clean install-stamp build-stamp \
+	dh_clean install-stamp build-arch \
 		$(PYVERS:%=install-python%) $(PYVERS:%=build-python%) \
 		$(PYVERS:%=install-debug-python%) $(PYVERS:%=build-debug-python%)
 
-build: build-stamp
+build: build-arch
 
-build-stamp: $(PYVERS:%=build-python%) $(PYVERS:%=build-debug-python%)
+build-indep:
+
+build-arch: $(PYVERS:%=build-python%) $(PYVERS:%=build-debug-python%)
 	touch $@
 
 build-python%: