[Python-modules-commits] r26478 - in packages/python-meld3/trunk (17 files)
noskcaj-guest at users.alioth.debian.org
noskcaj-guest at users.alioth.debian.org
Sat Nov 23 01:11:54 UTC 2013
Date: Saturday, November 23, 2013 @ 01:11:53
Author: noskcaj-guest
Revision: 26478
[svn-inject] Applying Debian modifications (0.6.10-1) to trunk
Added:
packages/python-meld3/trunk/debian/
packages/python-meld3/trunk/debian/changelog
packages/python-meld3/trunk/debian/compat
packages/python-meld3/trunk/debian/control
packages/python-meld3/trunk/debian/copyright
packages/python-meld3/trunk/debian/dirs
packages/python-meld3/trunk/debian/docs
packages/python-meld3/trunk/debian/patches/
packages/python-meld3/trunk/debian/patches/fixtag_import_error_with_python2.7.patch
packages/python-meld3/trunk/debian/patches/series
packages/python-meld3/trunk/debian/python-meld3.docs
packages/python-meld3/trunk/debian/python-meld3.examples
packages/python-meld3/trunk/debian/python-meld3.install
packages/python-meld3/trunk/debian/rules
packages/python-meld3/trunk/debian/source/
packages/python-meld3/trunk/debian/source/format
packages/python-meld3/trunk/debian/watch
Property changes on: packages/python-meld3/trunk/debian
___________________________________________________________________
Added: mergeWithUpstream
+ 1
Added: packages/python-meld3/trunk/debian/changelog
===================================================================
--- packages/python-meld3/trunk/debian/changelog (rev 0)
+++ packages/python-meld3/trunk/debian/changelog 2013-11-23 01:11:53 UTC (rev 26478)
@@ -0,0 +1,70 @@
+python-meld3 (0.6.10-1) unstable; urgency=low
+
+ * New maintainer. closes: #717061
+ * New upstream version. closes: #651174
+ * Disabled fixtag_import_error_with_python2.7.patch, fixed in upstream
+ * debian/control
+ - Changed homepage to current one
+ - Changed maintainer
+ - Updated to Standards-version 3.9.4
+ - Added ${misc:Depends} as Depends
+ - Removed build-depends for python-support
+ - Removed "An" from short description
+ - Changed debhelper version from 7 to 9
+ * debian/rules
+ - Removed python-support references
+ * Created debian/watch
+
+ -- Jackson Doak <noskcaj at ubuntu.com> Thu, 01 Aug 2013 18:59:45 +1000
+
+python-meld3 (0.6.5-3.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Apply Ubuntu patch to make the package compatible with Python
+ 2.7. Thanks to Jessica McKellar. Closes: #644246.
+ + Switch to 3.0 (quilt) source format to apply patch cleanly.
+
+ -- Arnaud Fontaine <arnau at debian.org> Mon, 31 Oct 2011 10:48:32 +0900
+
+python-meld3 (0.6.5-3) unstable; urgency=low
+
+ * Bring maintainer source in sync with NMUs
+
+ -- Anders Hammarquist <iko at debian.org> Tue, 26 Jan 2010 12:56:08 +0100
+
+python-meld3 (0.6.5-2.3) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Drop dependency on python-elementtree, scheduled for removal soon,
+ together with Python 2.4 (Closes: #562463).
+ * Bump XS-Python-Version to >= 2.5, elementtree is part of python2.5.
+
+ -- Luca Falavigna <dktrkranz at debian.org> Tue, 05 Jan 2010 23:11:37 +0100
+
+python-meld3 (0.6.5-2.2) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Build-Depend on python >= 2.5.4 for --install-layout=deb.
+
+ -- Kumar Appaiah <akumar at debian.org> Mon, 19 Oct 2009 17:47:47 -0500
+
+python-meld3 (0.6.5-2.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Fix "manipulates site-packages/ directly, failing with Python 2.6"
+ Applied and uploaded Kumar's patch, Thanks dude! (Closes: #547846)
+
+ -- Bastian Venthur <venthur at debian.org> Sat, 17 Oct 2009 15:17:40 +0200
+
+python-meld3 (0.6.5-2) unstable; urgency=low
+
+ * Fix build-depends (Closes: #543476)
+
+ -- Anders Hammarquist <iko at debian.org> Wed, 09 Sep 2009 22:54:12 +0200
+
+python-meld3 (0.6.5-1) unstable; urgency=low
+
+ * Initial release (Closes: #491667)
+
+ -- Anders Hammarquist <iko at debian.org> Thu, 30 Jul 2009 11:04:50 +0200
+
Added: packages/python-meld3/trunk/debian/compat
===================================================================
--- packages/python-meld3/trunk/debian/compat (rev 0)
+++ packages/python-meld3/trunk/debian/compat 2013-11-23 01:11:53 UTC (rev 26478)
@@ -0,0 +1 @@
+9
Added: packages/python-meld3/trunk/debian/control
===================================================================
--- packages/python-meld3/trunk/debian/control (rev 0)
+++ packages/python-meld3/trunk/debian/control 2013-11-23 01:11:53 UTC (rev 26478)
@@ -0,0 +1,19 @@
+Source: python-meld3
+Section: python
+Priority: extra
+Maintainer: Jackson Doak <noskcaj at ubuntu.com>
+Build-Depends: debhelper (>= 9), python-setuptools (>= 0.6c7), python-all-dev (>= 2.6.6-3~)
+X-Python-Version: >= 2.5
+Standards-Version: 3.9.4
+Homepage: https://pypi.python.org/pypi/meld3
+
+Package: python-meld3
+Architecture: any
+Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}
+Provides: ${python:Provides}
+Description: HTML/XML templating system for Python
+ meld3 is an HTML/XML templating system for Python 2.3+ which keeps
+ template markup and dynamic rendering logic separate from one
+ another. meld3 can deal with HTML or XML/XHTML input and can output
+ well-formed HTML or XML/XHTML.
+
Added: packages/python-meld3/trunk/debian/copyright
===================================================================
--- packages/python-meld3/trunk/debian/copyright (rev 0)
+++ packages/python-meld3/trunk/debian/copyright 2013-11-23 01:11:53 UTC (rev 26478)
@@ -0,0 +1,70 @@
+Downloaded from: <https://pypi.python.org/pypi/meld3>
+
+Upstream Author:
+
+ Chris McDonough (chrism at plope.com)
+
+Copyright:
+
+ Copyright (c) 2005, 2006 Chris McDonough
+
+License:
+
+ Zope Public License (ZPL) Version 2.1
+ -------------------------------------
+
+ A copyright notice accompanies this license document that
+ identifies the copyright holders.
+
+ This license has been certified as open source. It has also
+ been designated as GPL compatible by the Free Software
+ Foundation (FSF).
+
+ Redistribution and use in source and binary forms, with or
+ without modification, are permitted provided that the
+ following conditions are met:
+
+ 1. Redistributions in source code must retain the
+ accompanying copyright notice, this list of conditions,
+ and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the accompanying
+ copyright notice, this list of conditions, and the
+ following disclaimer in the documentation and/or other
+ materials provided with the distribution.
+
+ 3. Names of the copyright holders must not be used to
+ endorse or promote products derived from this software
+ without prior written permission from the copyright
+ holders.
+
+ 4. The right to distribute this software or to use it for
+ any purpose does not give you the right to use
+ Servicemarks (sm) or Trademarks (tm) of the copyright
+ holders. Use of them is covered by separate agreement
+ with the copyright holders.
+
+ 5. If any files are modified, you must cause the modified
+ files to carry prominent notices stating that you changed
+ the files and the date of any change.
+
+ Disclaimer
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ``AS IS''
+ AND ANY EXPRESSED 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 HOLDERS 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.
+
+The Debian packaging is Copyright (C) 2008, Anders Quist <quest at openend.se>
+(c) 2013, Jackson Doak <noskcaj at ubuntu.com>
+and is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
Added: packages/python-meld3/trunk/debian/dirs
===================================================================
--- packages/python-meld3/trunk/debian/dirs (rev 0)
+++ packages/python-meld3/trunk/debian/dirs 2013-11-23 01:11:53 UTC (rev 26478)
@@ -0,0 +1 @@
+usr/lib
Added: packages/python-meld3/trunk/debian/docs
===================================================================
--- packages/python-meld3/trunk/debian/docs (rev 0)
+++ packages/python-meld3/trunk/debian/docs 2013-11-23 01:11:53 UTC (rev 26478)
@@ -0,0 +1,5 @@
+CHANGES.txt
+COPYRIGHT.txt
+LICENSE.txt
+README.txt
+TODO.txt
Added: packages/python-meld3/trunk/debian/patches/fixtag_import_error_with_python2.7.patch
===================================================================
--- packages/python-meld3/trunk/debian/patches/fixtag_import_error_with_python2.7.patch (rev 0)
+++ packages/python-meld3/trunk/debian/patches/fixtag_import_error_with_python2.7.patch 2013-11-23 01:11:53 UTC (rev 26478)
@@ -0,0 +1,71 @@
+--- python-meld3-0.6.5.orig/meld3/meld3.py
++++ python-meld3-0.6.5/meld3/meld3.py
+@@ -3,6 +3,7 @@
+ import re
+ import types
+ import mimetools
++import string
+ from StringIO import StringIO
+
+ try:
+@@ -24,10 +25,32 @@
+ from xml.etree.ElementTree import QName
+ from xml.etree.ElementTree import _raise_serialization_error
+ from xml.etree.ElementTree import _namespace_map
+- from xml.etree.ElementTree import fixtag
+ from xml.etree.ElementTree import parse as et_parse
+ from xml.etree.ElementTree import ElementPath
+
++ try:
++ from xml.etree.ElementTree import fixtag
++ except:
++ def fixtag(tag, namespaces):
++ # given a decorated tag (of the form {uri}tag), return prefixed
++ # tag and namespace declaration, if any
++ if isinstance(tag, QName):
++ tag = tag.text
++ namespace_uri, tag = string.split(tag[1:], "}", 1)
++ prefix = namespaces.get(namespace_uri)
++ if prefix is None:
++ prefix = _namespace_map.get(namespace_uri)
++ if prefix is None:
++ prefix = "ns%d" % len(namespaces)
++ namespaces[namespace_uri] = prefix
++ if prefix == "xml":
++ xmlns = None
++ else:
++ xmlns = ("xmlns:%s" % prefix, namespace_uri)
++ else:
++ xmlns = None
++ return "%s:%s" % (prefix, tag), xmlns
++
+ # HTMLTreeBuilder does not exist in python 2.5 standard elementtree
+ from HTMLParser import HTMLParser
+ AUTOCLOSE = "p", "li", "tr", "th", "td", "head", "body"
+--- python-meld3-0.6.5.orig/meld3/test_meld3.py
++++ python-meld3-0.6.5/meld3/test_meld3.py
+@@ -1,6 +1,7 @@
+ import unittest
+ from StringIO import StringIO
+ import re
++import sys
+
+ _SIMPLE_XML = r"""<?xml version="1.0"?>
+ <root xmlns:meld="http://www.plope.com/software/meld3">
+@@ -1671,9 +1672,13 @@
+ </html>"""
+
+ def test_unknown_entity(self):
+- from xml.parsers import expat
+- self.assertRaises(expat.error, self._parse,
+- '<html><head></head><body>&fleeb;</body></html>')
++ if sys.version_info[:3] >= (2,7,0):
++ self.assertRaises(SyntaxError, self._parse,
++ '<html><head></head><body>&fleeb;</body></html>')
++ else:
++ from xml.parsers import expat
++ self.assertRaises(expat.error, self._parse,
++ '<html><head></head><body>&fleeb;</body></html>')
+
+ def test_content_nostructure(self):
+ root = self._parse(_SIMPLE_XML)
Added: packages/python-meld3/trunk/debian/patches/series
===================================================================
--- packages/python-meld3/trunk/debian/patches/series (rev 0)
+++ packages/python-meld3/trunk/debian/patches/series 2013-11-23 01:11:53 UTC (rev 26478)
@@ -0,0 +1 @@
+#fixtag_import_error_with_python2.7.patch
Added: packages/python-meld3/trunk/debian/python-meld3.docs
===================================================================
--- packages/python-meld3/trunk/debian/python-meld3.docs (rev 0)
+++ packages/python-meld3/trunk/debian/python-meld3.docs 2013-11-23 01:11:53 UTC (rev 26478)
@@ -0,0 +1,2 @@
+README.txt
+TODO.txt
Added: packages/python-meld3/trunk/debian/python-meld3.examples
===================================================================
--- packages/python-meld3/trunk/debian/python-meld3.examples (rev 0)
+++ packages/python-meld3/trunk/debian/python-meld3.examples 2013-11-23 01:11:53 UTC (rev 26478)
@@ -0,0 +1,8 @@
+meld3/clearsilverprofile.py
+meld3/example.py
+meld3/melddiff.py
+meld3/meldprofile.py
+meld3/test_getiterator.py
+meld3/test_meld3.py
+meld3/testclone.py
+meld3/zptprofile.py
Added: packages/python-meld3/trunk/debian/python-meld3.install
===================================================================
--- packages/python-meld3/trunk/debian/python-meld3.install (rev 0)
+++ packages/python-meld3/trunk/debian/python-meld3.install 2013-11-23 01:11:53 UTC (rev 26478)
@@ -0,0 +1,5 @@
+usr/lib/python*/*-packages/meld3*egg-info
+usr/lib/python*/*-packages/meld3/cmeld3.so
+usr/lib/python*/*-packages/meld3/__init__.py
+usr/lib/python*/*-packages/meld3/meld3.py
+
Added: packages/python-meld3/trunk/debian/rules
===================================================================
--- packages/python-meld3/trunk/debian/rules (rev 0)
+++ packages/python-meld3/trunk/debian/rules 2013-11-23 01:11:53 UTC (rev 26478)
@@ -0,0 +1,86 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+
+# Uncomment this to turn on verbose mode.
+export DH_VERBOSE=1
+PYDEF=$(shell pyversions -d)
+PYVERS=$(shell pyversions -r)
+
+configure: configure-stamp
+configure-stamp:
+ dh_testdir
+ # Add here commands to configure the package.
+
+ touch configure-stamp
+
+
+build: build-arch build-indep
+build-arch: build-stamp
+build-indep: build-stamp
+
+build-stamp: configure-stamp
+ dh_testdir
+
+ # Add here commands to compile the package.
+ for python in $(PYVERS); do \
+ python=$$(echo $$python | sed "s/$(PYDEF)/python/"); \
+ USE_MELD3_EXTENSION_MODULES=true \
+ $$python setup.py build; \
+ done
+ touch $@
+
+clean:
+ dh_testdir
+ dh_testroot
+ rm -f build-stamp configure-stamp
+
+ # Add here commands to clean up after the build process.
+ for python in $(PYVERS); do \
+ python=$$(echo $$python | sed "s/$(PYDEF)/python/"); \
+ USE_MELD3_EXTENSION_MODULES=true \
+ $$python setup.py clean; \
+ done
+ rm -rf build/
+
+ dh_clean
+
+install: build
+ dh_testdir
+ dh_testroot
+ dh_prep
+ dh_installdirs
+
+ # Add here commands to install the package into debian/tmp
+ set -e; \
+ for python in $(PYVERS); do \
+ pydir=$$python \
+ python=$$(echo $$python | sed "s/$(PYDEF)/python/"); \
+ USE_MELD3_EXTENSION_MODULES=true \
+ $$python setup.py install --no-compile --root=debian/tmp --install-layout=deb; \
+ done
+
+# Build architecture-independent files here.
+binary-indep: build install
+# We have nothing to do by default.
+
+# Build architecture-dependent files here.
+binary-arch: build install
+ dh_testdir
+ dh_testroot
+ dh_installchangelogs CHANGES.txt
+ dh_installdocs
+ dh_installexamples
+ dh_install --sourcedir=debian/tmp
+ dh_python2
+ dh_strip
+ dh_shlibdeps
+ dh_compress
+ dh_fixperms
+ dh_installdeb
+ dh_gencontrol
+ dh_md5sums
+ dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install configure
+
Property changes on: packages/python-meld3/trunk/debian/rules
___________________________________________________________________
Added: svn:executable
+ *
Added: packages/python-meld3/trunk/debian/source/format
===================================================================
--- packages/python-meld3/trunk/debian/source/format (rev 0)
+++ packages/python-meld3/trunk/debian/source/format 2013-11-23 01:11:53 UTC (rev 26478)
@@ -0,0 +1 @@
+3.0 (quilt)
Added: packages/python-meld3/trunk/debian/watch
===================================================================
--- packages/python-meld3/trunk/debian/watch (rev 0)
+++ packages/python-meld3/trunk/debian/watch 2013-11-23 01:11:53 UTC (rev 26478)
@@ -0,0 +1,2 @@
+version=3
+http://pypi.python.org/packages/source/m/meld3/meld3-(.+).tar.gz
\ No newline at end of file
More information about the Python-modules-commits
mailing list