[Python-modules-commits] r8848 - in packages/python-toscawidgets/trunk (10 files)
zack at users.alioth.debian.org
zack at users.alioth.debian.org
Thu Jun 25 13:46:59 UTC 2009
Date: Thursday, June 25, 2009 @ 13:46:56
Author: zack
Revision: 8848
add support to ship contribs and use it to ship tw.forms
Added:
packages/python-toscawidgets/trunk/debian/README.source
(from rev 8822, packages/python-peak.rules/trunk/debian/README.source)
packages/python-toscawidgets/trunk/debian/get-orig-source.mk
(from rev 8822, packages/python-peak.rules/trunk/debian/get-orig-source.mk)
packages/python-toscawidgets/trunk/debian/toscawidgets.watch
(from rev 8762, packages/python-toscawidgets/trunk/debian/watch)
packages/python-toscawidgets/trunk/debian/tw.forms.watch
packages/python-toscawidgets/trunk/setup.py
(from rev 8822, packages/python-peak.rules/trunk/setup.py)
Modified:
packages/python-toscawidgets/trunk/debian/changelog
packages/python-toscawidgets/trunk/debian/copyright
packages/python-toscawidgets/trunk/debian/docs
packages/python-toscawidgets/trunk/debian/rules
packages/python-toscawidgets/trunk/debian/watch
Copied: packages/python-toscawidgets/trunk/debian/README.source (from rev 8822, packages/python-peak.rules/trunk/debian/README.source)
===================================================================
--- packages/python-toscawidgets/trunk/debian/README.source (rev 0)
+++ packages/python-toscawidgets/trunk/debian/README.source 2009-06-25 13:46:56 UTC (rev 8848)
@@ -0,0 +1,50 @@
+
+Upgrade to a new upstream
+=========================
+
+This package is a multi-upstream source package, i.e., its
+.orig.tar.gz is composed by several upstream tarballs, possibly
+released by independent authors.
+
+To obtain a new orig tarball you can invoke the get-orig-source target
+of debian/rules as follows:
+
+ $ debian/rules get-orig-source
+
+If all goes well, that should leave around a .orig.tar.gz tarball.
+
+Note that the target does not check whether creating a new upstream
+version is needed: invoke it only if you know that some of the
+upstream parts of this package need updates. Otherwise, use "apt-get
+source PACKAGE" to work on the latest uploaded upstream release.
+
+
+Package version
+===============
+
+Note that, while the package has multiple upstream tarballs,
+ToscaWidgets is considered the "main" tarball. This means, in
+particular, that the package version comes from it.
+
+
+Adding a new contrib
+====================
+
+As this package ships contribs for ToscaWidgets, it is natural to
+expect that in the future new contribs will be added. To add one to
+the package follow a few simple rules:
+
+1) add the module name (usually the egg name) to the $(UPSTREAMS)
+ Makefile variable in debian/rules
+
+2) add the per-contrib watch file as debian/NAME.watch, where NAME is
+ the module name
+
+3) add license and copyright information about the new module to
+ debian/copyright
+
+4) run "debian/rules get-orig-source" to recreate the new tarball
+
+
+ -- Stefano Zacchiroli <zack at debian.org>, Thu, 25 Jun 2009 15:28:24 +0200
+
Modified: packages/python-toscawidgets/trunk/debian/changelog
===================================================================
--- packages/python-toscawidgets/trunk/debian/changelog 2009-06-25 13:30:56 UTC (rev 8847)
+++ packages/python-toscawidgets/trunk/debian/changelog 2009-06-25 13:46:56 UTC (rev 8848)
@@ -1,3 +1,13 @@
+python-toscawidgets (0.9.7.1-1) experimental; urgency=low
+
+ * new upstream release
+ * add support to ship contribs; ship tw.forms as a contrib
+ * debian/copyright: migrate to machine parseable format, ensure that
+ also the new contrib is covered
+ * debian/docs: reference README.txt via its new path
+
+ -- Stefano Zacchiroli <zack at debian.org> Thu, 25 Jun 2009 15:20:42 +0200
+
python-toscawidgets (0.9.4-1) experimental; urgency=low
[ Stefano Zacchiroli ]
Modified: packages/python-toscawidgets/trunk/debian/copyright
===================================================================
--- packages/python-toscawidgets/trunk/debian/copyright 2009-06-25 13:30:56 UTC (rev 8847)
+++ packages/python-toscawidgets/trunk/debian/copyright 2009-06-25 13:46:56 UTC (rev 8848)
@@ -1,34 +1,37 @@
-This package was debianized by Christoph Haas <haas at debian.org>.
+This package was initially debianized by Christoph Haas
+<haas at debian.org>. Packaging has been took over by Stefano Zacchiroli
+<zack at debian.org> Fri, 29 May 2009 18:45:17 +0200.
-It was downloaded from http://toscawidgets.org/download/
+Files: *
+Copyright: © 2006-2009 Alberto Valverde González and contributors
+License: MIT
+ MIT license is reported below.
-Upstream Author: Alberto Valverde González <alberto at toscat.net>
+Files: debian/*
+Copyright: © 2009 Stefano Zacchiroli <zack at debian.org>
+ © 2007 Christoph Haas <haas at debian.org>
+License: GPL-3+
+ On Debian systems the full text of the GNU General Public License can
+ be found in the `/usr/share/common-licenses/GPL-3' file.
-Copyright (c) 2006 Alberto Valverde González and contributors
+License: MIT
+ Permission is hereby granted, free of charge, to any person obtaining
+ a copy of this software and associated documentation files (the
+ "Software"), to deal in the Software without restriction, including
+ without limitation the rights to use, copy, modify, merge, publish,
+ distribute, sublicense, and/or sell copies of the Software, and to
+ permit persons to whom the Software is furnished to do so, subject to
+ the following conditions:
+
+ The above copyright notice and this permission notice shall be
+ included in all copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ SOFTWARE.
-MIT Licence (see http://www.opensource.org/licenses/mit-license.php)
-
-Based on the widgets package of the TurboGears Framework which is Copyright (c)
-2005, 2006 Kevin Dangoor and contributors.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-of the Software, and to permit persons to whom the Software is furnished to do
-so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-The Debian packaging is (C) 2007, Christoph Haas <haas at debian.org> and
-is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
-
Modified: packages/python-toscawidgets/trunk/debian/docs
===================================================================
--- packages/python-toscawidgets/trunk/debian/docs 2009-06-25 13:30:56 UTC (rev 8847)
+++ packages/python-toscawidgets/trunk/debian/docs 2009-06-25 13:46:56 UTC (rev 8848)
@@ -1 +1 @@
-README.txt
+toscawidgets/README.txt
Copied: packages/python-toscawidgets/trunk/debian/get-orig-source.mk (from rev 8822, packages/python-peak.rules/trunk/debian/get-orig-source.mk)
===================================================================
--- packages/python-toscawidgets/trunk/debian/get-orig-source.mk (rev 0)
+++ packages/python-toscawidgets/trunk/debian/get-orig-source.mk 2009-06-25 13:46:56 UTC (rev 8848)
@@ -0,0 +1,40 @@
+# debian/rules snippet for creating multi-upstream tarball relying on
+# several debian/*.watch files
+
+# XXX: adapted to use as version number those returned by the "main"
+# debian/watch
+
+# Copyright © 2009 Stefano Zacchiroli <zack at debian.org>
+# License: GNU GPL version 3 or above
+# Created: Sat, 30 May 2009 11:58:16 +0200
+# Last-Modified: Sat, 20 Jun 2009 12:59:10 +0200
+
+# TODO: does not yet fully implement policy wrt get-orig-source:
+# - the target cannot be invoked from any dir (rely on "debian/")
+# - tmpdir handling is not fully safe (e.g., no "mktemp -d")
+
+GOSTMP = get-orig-source.tmp
+ORIGVERSION := $(shell uscan --report --dehs | grep '<upstream-version>' | sed 's/<[^>]\+>//g')
+ORIGNAME = $(PKG)-$(ORIGVERSION)
+ORIGTARBALL = $(PKG)_$(ORIGVERSION).orig.tar.gz
+
+get-orig-source: $(patsubst %,%/get-orig-source,$(UPSTREAMS))
+ cd $(GOSTMP) && \
+ mkdir $(ORIGNAME) && \
+ for p in $(UPSTREAMS) ; do \
+ mv `readlink $$p` $(ORIGNAME) ; \
+ mv $$p $(ORIGNAME) ; \
+ done && \
+ tar cvzf $(ORIGTARBALL) $(ORIGNAME) && \
+ mv $(ORIGTARBALL) ../ && \
+ cd .. && \
+ rm -rf $(GOSTMP)/
+$(GOSTMP):
+ -mkdir $@
+%/get-orig-source: $(GOSTMP)
+ uscan --watchfile debian/$*.watch \
+ --upstream-version 0 --package $* \
+ --download --destdir $(GOSTMP)/
+ cd $(GOSTMP) && \
+ tar xzf $**.orig.tar.gz && \
+ ln -s `tar tzf $**.orig.tar.gz | head -n1` $*
Modified: packages/python-toscawidgets/trunk/debian/rules
===================================================================
--- packages/python-toscawidgets/trunk/debian/rules 2009-06-25 13:30:56 UTC (rev 8847)
+++ packages/python-toscawidgets/trunk/debian/rules 2009-06-25 13:46:56 UTC (rev 8848)
@@ -3,4 +3,13 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/python-distutils.mk
+PKG = python-toscawidgets
+UPSTREAMS = \
+ toscawidgets \
+ tw.forms \
+ $(NULL)
+export SUBDIRS = $(UPSTREAMS)
+
DEB_PYTHON_INSTALL_ARGS_ALL += --single-version-externally-managed
+
+-include debian/get-orig-source.mk
Copied: packages/python-toscawidgets/trunk/debian/toscawidgets.watch (from rev 8762, packages/python-toscawidgets/trunk/debian/watch)
===================================================================
--- packages/python-toscawidgets/trunk/debian/toscawidgets.watch (rev 0)
+++ packages/python-toscawidgets/trunk/debian/toscawidgets.watch 2009-06-25 13:46:56 UTC (rev 8848)
@@ -0,0 +1,4 @@
+# this file comes with two copies: debian/watch and debian/toscawidgets.watch
+# will go away with symlink support in dpkg-* soon; in the meantime update both
+version=3
+http://pypi.python.org/packages/source/T/ToscaWidgets/ToscaWidgets-([0-9.a-z]*)\.tar\.gz
Added: packages/python-toscawidgets/trunk/debian/tw.forms.watch
===================================================================
--- packages/python-toscawidgets/trunk/debian/tw.forms.watch (rev 0)
+++ packages/python-toscawidgets/trunk/debian/tw.forms.watch 2009-06-25 13:46:56 UTC (rev 8848)
@@ -0,0 +1,2 @@
+version=3
+http://pypi.python.org/packages/source/t/tw.forms/tw.forms-([0-9.a-z]+)\.tar\.gz
Modified: packages/python-toscawidgets/trunk/debian/watch
===================================================================
--- packages/python-toscawidgets/trunk/debian/watch 2009-06-25 13:30:56 UTC (rev 8847)
+++ packages/python-toscawidgets/trunk/debian/watch 2009-06-25 13:46:56 UTC (rev 8848)
@@ -1,2 +1,4 @@
+# this file comes with two copies: debian/watch and debian/toscawidgets.watch
+# will go away with symlink support in dpkg-* soon; in the meantime update both
version=3
http://pypi.python.org/packages/source/T/ToscaWidgets/ToscaWidgets-([0-9.a-z]*)\.tar\.gz
Copied: packages/python-toscawidgets/trunk/setup.py (from rev 8822, packages/python-peak.rules/trunk/setup.py)
===================================================================
--- packages/python-toscawidgets/trunk/setup.py (rev 0)
+++ packages/python-toscawidgets/trunk/setup.py 2009-06-25 13:46:56 UTC (rev 8848)
@@ -0,0 +1,28 @@
+#!/usr/bin/python
+# Multiplexer for invoking multiple setup.py in subdir
+# Copyright (C) 2009 Stefano Zacchiroli <zack at debian.org>
+# License: GNU GPL version 3 or above
+
+# Created: Sat, 30 May 2009 14:47:04 +0200
+# Last-Modified: Sat, 30 May 2009 14:47:04 +0200
+
+import os, string, sys
+
+if not os.environ.has_key('SUBDIRS') or not os.environ['SUBDIRS']:
+ print >> sys.stderr, "Can't find subdirs, please set SUBDIRS envvar"
+ sys.exit(3)
+else:
+ subdirs = os.environ['SUBDIRS'].split()
+setup_cmd = "python setup.py %s" % string.join(sys.argv[1:])
+
+topdir = os.getcwd()
+for d in subdirs:
+ if not os.path.isdir(d):
+ print >> sys.stderr, "WARNING: can't find subdir %s" % d
+ continue
+ os.chdir(d)
+ retcode = os.system(setup_cmd)
+ if retcode:
+ print >> sys.stderr, "ERROR: setup.py in subdir %s failed" % d
+ sys.exit(retcode >> 8)
+ os.chdir(topdir)
More information about the Python-modules-commits
mailing list