[Python-modules-commits] r14239 - in packages/python-slimmer/trunk/debian (8 files)

janos-guest at users.alioth.debian.org janos-guest at users.alioth.debian.org
Sun Aug 22 00:41:42 UTC 2010


    Date: Sunday, August 22, 2010 @ 00:41:40
  Author: janos-guest
Revision: 14239

Added:
  packages/python-slimmer/trunk/debian/patches/
  packages/python-slimmer/trunk/debian/patches/debian-changes-0.1.30-2
  packages/python-slimmer/trunk/debian/patches/series
Modified:
  packages/python-slimmer/trunk/debian/changelog
  packages/python-slimmer/trunk/debian/control
  packages/python-slimmer/trunk/debian/copyright
  packages/python-slimmer/trunk/debian/rules
  packages/python-slimmer/trunk/debian/source/format

Modified: packages/python-slimmer/trunk/debian/changelog
===================================================================
--- packages/python-slimmer/trunk/debian/changelog	2010-08-21 23:30:13 UTC (rev 14238)
+++ packages/python-slimmer/trunk/debian/changelog	2010-08-22 00:41:40 UTC (rev 14239)
@@ -1,3 +1,10 @@
+python-slimmer (0.1.30-2) unstable; urgency=low
+
+  * Add python3-slimmer binary package (closes: #593137)
+  * Bump standards version to 3.9.1
+
+ -- Janos Guljas <janos at janos.in.rs>  Sat, 21 Aug 2010 22:08:09 +0200
+
 python-slimmer (0.1.30-1) unstable; urgency=low
 
   [ Janos Guljas ]

Modified: packages/python-slimmer/trunk/debian/control
===================================================================
--- packages/python-slimmer/trunk/debian/control	2010-08-21 23:30:13 UTC (rev 14238)
+++ packages/python-slimmer/trunk/debian/control	2010-08-22 00:41:40 UTC (rev 14239)
@@ -4,8 +4,8 @@
 Maintainer: Janos Guljas <janos at janos.in.rs>
 Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>,
  Jan Dittberner <jandd at debian.org>
-Build-Depends: debhelper (>= 7), python-support, python-setuptools
-Standards-Version: 3.8.3
+Build-Depends: debhelper (>= 7.0.50~), python (>= 2.5), python-setuptools, python3-setuptools
+Standards-Version: 3.9.1
 XS-Python-Version: >= 2.4
 Homepage: http://pypi.python.org/pypi/slimmer/
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/python-slimmer/trunk
@@ -15,6 +15,18 @@
 Architecture: all
 XB-Python-Version: ${python:Versions}
 Depends: ${misc:Depends}, ${python:Depends}
+Provides: ${python:Provides}
 Description: HTML, XHTML, CSS, JavaScript optimizer
  Slimmer is a simple set of functions for compressing/optimizing
  HTML, XHTML and CSS documents as strings.
+
+Package: python3-slimmer
+Architecture: all
+X-Python-Version: ${python3:Versions}
+Depends: ${misc:Depends}, ${python3:Depends}
+Provides: ${python3:Provides}
+Description: HTML, XHTML, CSS, JavaScript optimizer for Python3
+ Slimmer is a simple set of functions for compressing/optimizing
+ HTML, XHTML and CSS documents as strings.
+ .
+ This package provides module for python3 series.

Modified: packages/python-slimmer/trunk/debian/copyright
===================================================================
--- packages/python-slimmer/trunk/debian/copyright	2010-08-21 23:30:13 UTC (rev 14238)
+++ packages/python-slimmer/trunk/debian/copyright	2010-08-22 00:41:40 UTC (rev 14239)
@@ -2,11 +2,34 @@
 
 It was downloaded from http://pypi.python.org/pypi/slimmer/
 
-The Debian packaging is Copyright 2009, Janos Guljas <janos at janos.in.rs>
-and is licensed under the BSD license. Under Debian systems, you can find
-the text of the BSD license under /usr/share/common-licenses/BSD
+The Debian packaging is Copyright 2010, Janos Guljas <janos at janos.in.rs>.
+All rights reserved.
 
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+2. 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.
+3. Neither the name of the Janos Guljas nor the names of his contributors
+   may be used to endorse or promote products derived from this software
+   without specific prior written permission.
 
+THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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, EVEN IF ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGE.
+
+
 Upstream Author: Peter Bengtsson <peter at fry-it.com>
 
 Copyright (c) 2004-2009, Peter Bengtsson

Added: packages/python-slimmer/trunk/debian/patches/debian-changes-0.1.30-2
===================================================================
--- packages/python-slimmer/trunk/debian/patches/debian-changes-0.1.30-2	                        (rev 0)
+++ packages/python-slimmer/trunk/debian/patches/debian-changes-0.1.30-2	2010-08-22 00:41:40 UTC (rev 14239)
@@ -0,0 +1,109 @@
+Description: Upstream changes introduced in version 0.1.30-2
+ This patch has been created by dpkg-source during the package build.
+ Here's the last changelog entry, hopefully it gives details on why
+ those changes were made:
+ .
+ python-slimmer (0.1.30-2) unstable; urgency=low
+ .
+   * Add python3-slimmer binary package (closes: #593137)
+   * Bump standards version to 3.9.1
+ .
+ The person named in the Author field signed this changelog entry.
+Author: Janos Guljas <janos at janos.in.rs>
+Bug-Debian: http://bugs.debian.org/593137
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: http://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: <YYYY-MM-DD>
+
+--- python-slimmer-0.1.30.orig/setup.py
++++ python-slimmer-0.1.30/setup.py
+@@ -1,12 +1,17 @@
+ from setuptools import setup, find_packages
+ import sys, os
+ 
+-import slimmer
+-version = slimmer.__version__ # hate repeating myself
++version = '0.1.30'
+ 
+ README = os.path.join(os.path.dirname(__file__), 'README.txt')
+ long_description = open(README).read().strip() + "\n\n"
+ 
++extra = {}
++if sys.version_info >= (3, 0):
++    extra.update(
++        use_2to3=True,
++    )
++
+ 
+ setup(name='slimmer',
+       version=version,
+@@ -41,4 +46,5 @@ setup(name='slimmer',
+       entry_points="""
+       # -*- Entry points: -*-
+       """,
++      **extra
+       )
+--- python-slimmer-0.1.30.orig/slimmer.egg-info/PKG-INFO
++++ python-slimmer-0.1.30/slimmer.egg-info/PKG-INFO
+@@ -13,32 +13,32 @@ Description: slimmer.py is a whitespace
+         
+         INSTALLATION::
+         
+-        $ sudo easy_install slimmer
+-        
++         $ sudo easy_install slimmer
++         
+         Alternative::
+         
+-        $ tar -zxvf slimmer-x.x.x.tgz
+-        $ cd slimmer/
+-        $ sudo python setup.py install
+-        
++         $ tar -zxvf slimmer-x.x.x.tgz
++         $ cd slimmer/
++         $ sudo python setup.py install
++         
+         USAGE::
+         
+-        >>> import slimmer
+-        >>> from slimmer import css_slimmer
+-        >>> css_slimmer("h1, h2 { font-family: 'Courier New', Courier; }")
+-        "h1,h2{font-family:'Courier New',Courier;border:1px solid black;}"
+-        >>> html_slimmer('<a  href="x" title="   foo  bar  "> one </a>  <br />')
+-        >>> from slimmer import html_slimmer, xhtml_slimmer
+-        >>> html_slimmer('''<a  href="x" title="   foo  bar  "
+-        > one </a>  <br/>''')
+-        '<a href="x" title="   foo bar  "> one </a><br />'
+-        
++         >>> import slimmer
++         >>> from slimmer import css_slimmer
++         >>> css_slimmer("h1, h2 { font-family: 'Courier New', Courier; }")
++         "h1,h2{font-family:'Courier New',Courier;border:1px solid black;}"
++         >>> html_slimmer('<a  href="x" title="   foo  bar  "> one </a>  <br />')
++         >>> from slimmer import html_slimmer, xhtml_slimmer
++         >>> html_slimmer('''<a  href="x" title="   foo  bar  "
++                           > one </a>  <br/>''')
++         '<a href="x" title="   foo bar  "> one </a><br />'
+         
++         
+         UNITTESTS::
+         
+-        $ cd slimmer/tests
+-        $ python testSlimmer.py
+-        $ python testSlimmer.py --verbose
++         $ cd slimmer/tests
++         $ python testSlimmer.py
++         $ python testSlimmer.py --verbose
+         
+         
+ Keywords: slimmer optimizer optimiser whitespace

Added: packages/python-slimmer/trunk/debian/patches/series
===================================================================
--- packages/python-slimmer/trunk/debian/patches/series	                        (rev 0)
+++ packages/python-slimmer/trunk/debian/patches/series	2010-08-22 00:41:40 UTC (rev 14239)
@@ -0,0 +1 @@
+debian-changes-0.1.30-2

Modified: packages/python-slimmer/trunk/debian/rules
===================================================================
--- packages/python-slimmer/trunk/debian/rules	2010-08-21 23:30:13 UTC (rev 14238)
+++ packages/python-slimmer/trunk/debian/rules	2010-08-22 00:41:40 UTC (rev 14239)
@@ -1,5 +1,22 @@
 #!/usr/bin/make -f
 
 %:
-	dh $@
+	dh $@ --with python2
 
+override_dh_auto_install:
+	for pyvers in $(shell pyversions -vr); do \
+		python$$pyvers setup.py install --install-layout=deb \
+			--root $(CURDIR)/debian/python-slimmer; \
+	done
+	for pyvers in $(shell py3versions -sv); do \
+		python$$pyvers setup.py install --install-layout=deb \
+			--root $(CURDIR)/debian/python3-slimmer; \
+	done
+
+override_dh_python2:
+	dh_python2 -ppython-slimmer
+	dh_python3 -ppython3-slimmer
+
+override_dh_clean:
+	dh_clean
+	rm -rf build

Modified: packages/python-slimmer/trunk/debian/source/format
===================================================================
--- packages/python-slimmer/trunk/debian/source/format	2010-08-21 23:30:13 UTC (rev 14238)
+++ packages/python-slimmer/trunk/debian/source/format	2010-08-22 00:41:40 UTC (rev 14239)
@@ -1 +1 @@
-1.0
+3.0 (quilt)




More information about the Python-modules-commits mailing list