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

[piotr at users.alioth.debian.org]

    Date: Saturday, August 21, 2010 @ 16:54:28
  Author: piotr
Revision: 14235

  - minimum python3-all-dev version bumped to 3.1.2-6~
* Do not install markupsafe/ _speedups.c file
* BSD license is now included in the coypright file directly
* Standards-Version bumped to 3.9.1 (no changes needed)

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

Modified: packages/markupsafe/trunk/debian/changelog
===================================================================
--- packages/markupsafe/trunk/debian/changelog	2010-08-21 14:42:45 UTC (rev 14234)
+++ packages/markupsafe/trunk/debian/changelog	2010-08-21 16:54:28 UTC (rev 14235)
@@ -1,8 +1,12 @@
-markupsafe (0.9.2-2) UNRELEASED; urgency=low
+markupsafe (0.9.2-2) unstable; urgency=low
 
   * Use ${python3:Depends} in python3-markupsafe{,-dbg} package (closes: 591953)
+    - minimum python3-all-dev version bumped to 3.1.2-6~
+  * Do not install markupsafe/ _speedups.c file
+  * BSD license is now included in the coypright file directly
+  * Standards-Version bumped to 3.9.1 (no changes needed)
 
- -- Piotr Ożarowski <piotr at debian.org>  Fri, 06 Aug 2010 22:40:50 -0400
+ -- Piotr Ożarowski <piotr at debian.org>  Sat, 21 Aug 2010 18:31:54 +0200
 
 markupsafe (0.9.2-1) unstable; urgency=low
 

Modified: packages/markupsafe/trunk/debian/control
===================================================================
--- packages/markupsafe/trunk/debian/control	2010-08-21 14:42:45 UTC (rev 14234)
+++ packages/markupsafe/trunk/debian/control	2010-08-21 16:54:28 UTC (rev 14235)
@@ -4,10 +4,10 @@
 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),
- python-all-dev (>= 2.6.5-2), python3-all-dev (>= 3.1.2-2),
+ python-all-dev (>= 2.6.5-2), python3-all-dev (>= 3.1.2-6~),
  python-all-dbg, python3-all-dbg,
  python-setuptools, python3-setuptools
-Standards-Version: 3.8.4
+Standards-Version: 3.9.1
 Homepage: http://pypi.python.org/pypi/MarkupSafe
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/markupsafe/trunk
 Vcs-Browser: http://svn.debian.org/viewsvn/python-modules/packages/markupsafe/trunk/

Modified: packages/markupsafe/trunk/debian/copyright
===================================================================
--- packages/markupsafe/trunk/debian/copyright	2010-08-21 14:42:45 UTC (rev 14234)
+++ packages/markupsafe/trunk/debian/copyright	2010-08-21 16:54:28 UTC (rev 14235)
@@ -6,10 +6,37 @@
 Copyright (c) 2010 by Armin Ronacher and contributors.  See AUTHORS
 for more details.
 
-License: BSD
+Some rights reserved.
 
+Redistribution and use in source and binary forms of the software as well
+as documentation, with or without modification, are permitted provided
+that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright
+  notice, this list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above
+  copyright notice, this list of conditions and the following
+  disclaimer in the documentation and/or other materials provided
+  with the distribution.
+
+* The names of the contributors may not be used to endorse or
+  promote products derived from this software without specific
+  prior written permission.
+
+THIS SOFTWARE AND DOCUMENTATION IS PROVIDED BY THE COPYRIGHT HOLDERS AND
+CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT
+NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
+OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE AND DOCUMENTATION, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
+
+
 The Debian packaging is © 2010, Piotr Ożarowski <piotr at debian.org> and
-is licensed under the BSD as well.
-
-On Debian systems, the complete text of the BSD License can be found in
-`/usr/share/common-licenses/BSD'
+is licensed under the same license.

Modified: packages/markupsafe/trunk/debian/rules
===================================================================
--- packages/markupsafe/trunk/debian/rules	2010-08-21 14:42:45 UTC (rev 14234)
+++ packages/markupsafe/trunk/debian/rules	2010-08-21 16:54:28 UTC (rev 14235)
@@ -1,8 +1,9 @@
 #!/usr/bin/make -f
 
 #export DH_VERBOSE=1
+PYVERS=$(shell pyversions -vr) $(shell py3versions -sv)
 
-PYVERS=$(shell pyversions -vr) $(shell py3versions -sv)
+include /usr/share/python/python.mk
 pkgdir = $(CURDIR)/debian/python$(if $(patsubst 3.%,,$(1)),,3)-markupsafe
 
 clean:
@@ -37,6 +38,7 @@
 		--install-layout=deb --skip-build \
 		--single-version-externally-managed \
 		--root $(call pkgdir,$*)
+	rm -f $(call pkgdir,$*)$(call py_libdir,$*)/markupsafe/_speedups.c
 	touch $@
 
 install-debug-python%: build