[Python-apps-commits] r3325 - in packages/waf/trunk/debian (6 files)

dfiloni-guest at users.alioth.debian.org dfiloni-guest at users.alioth.debian.org
Thu Jul 23 22:30:46 UTC 2009


    Date: Thursday, July 23, 2009 @ 22:30:45
  Author: dfiloni-guest
Revision: 3325

[svn-inject] Applying Debian modifications to trunk

Modified:
  packages/waf/trunk/debian/README.source
  packages/waf/trunk/debian/changelog
  packages/waf/trunk/debian/control
  packages/waf/trunk/debian/copyright
  packages/waf/trunk/debian/rules
  packages/waf/trunk/debian/watch

Modified: packages/waf/trunk/debian/README.source
===================================================================
--- packages/waf/trunk/debian/README.source	2009-07-23 22:17:31 UTC (rev 3324)
+++ packages/waf/trunk/debian/README.source	2009-07-23 22:30:45 UTC (rev 3325)
@@ -1,3 +1,12 @@
+  * Some files in the original tarball are licensed under several licenses
+    (QPL, GFDL, etc...), they may have distribution problems (for example:
+    QPL is not compatible with GPL and GFDL files shoudn't have invariant
+    sections) and they are also useless so they are removed from the tarball,
+    please use the provided get-orig-source target to generate the tarball.
+
+ -- Devid Antonio Filoni <d.filoni at ubuntu.com>  Sun, 19 Jul 2009 16:23:56 +0200
+
+
 This package uses quilt to manage all modifications to the upstream
 source.  Changes are stored in the source package as diffs in
 debian/patches and applied during the build.

Modified: packages/waf/trunk/debian/changelog
===================================================================
--- packages/waf/trunk/debian/changelog	2009-07-23 22:17:31 UTC (rev 3324)
+++ packages/waf/trunk/debian/changelog	2009-07-23 22:30:45 UTC (rev 3325)
@@ -1,4 +1,4 @@
-waf (1.5.8-1) UNRELEASED; urgency=low
+waf (1.5.8+dfsg-1) unstable; urgency=low
 
   * Initial release (Closes: #466304).
 

Modified: packages/waf/trunk/debian/control
===================================================================
--- packages/waf/trunk/debian/control	2009-07-23 22:17:31 UTC (rev 3324)
+++ packages/waf/trunk/debian/control	2009-07-23 22:30:45 UTC (rev 3325)
@@ -2,9 +2,11 @@
 Section: devel
 Priority: optional
 Maintainer: Devid Antonio Filoni <d.filoni at ubuntu.com>
-Uploaders: Python Applications Packaging Team <python-apps-team at lists.alioth.debian.org>
+Uploaders: Python Applications Packaging Team <python-apps-team at lists.alioth.debian.org>,
+ Luca Falavigna <dktrkranz at ubuntu.com>
 Build-Depends: debhelper (>= 7.2.6), quilt (>= 0.46-7)
-Build-Depends-Indep: python (>= 2.4), python-support (>= 0.5.3), xsltproc, docbook-xsl
+Build-Depends-Indep: python (>= 2.4), python-support (>= 0.5.3), xsltproc,
+ docbook-xsl
 XS-Python-Version: >= 2.4
 Standards-Version: 3.8.2
 Homepage: http://code.google.com/p/waf/

Modified: packages/waf/trunk/debian/copyright
===================================================================
--- packages/waf/trunk/debian/copyright	2009-07-23 22:17:31 UTC (rev 3324)
+++ packages/waf/trunk/debian/copyright	2009-07-23 22:30:45 UTC (rev 3325)
@@ -10,16 +10,24 @@
 Copyright:
 
     Copyright © 2005-2009, Thomas Nagy
-    Copyright © 1999, Havoc Pennington
-    Copyright © 2005, LiuCougar
-    Copyright © 2005, Ralf Habacker
-    Copyright © 2005, Scott Newton
     Copyright © 2008-2009, Yinon Ehrlich
+    Copyright © 2005, Scott Newton
     Copyright © 2003-2005, Peter Astrand
-    Copyright © 2005-2005, Trolltech AS
-    Copyright © 2006, Matthias Jahn
-    Copyright © 2008, hhasemann
-    Copyright © 2007, Matthias Jahn
+    Copyright © 2006, Ralf Habacker
+    Copyright © 2006, John O'Meara
+    Copyright © 2008, Ruediger Sonderfeld
+    Copyright © 2008, Bjoern Michaelsen
+    Copyright © 2008, Luca Fossati
+    Copyright © 2007-2008, Matthias Jahn
+    Copyright © 2006-2007, Carlos Rafael Giani
+    Copyright © 2007, Ali Sabil
+    Copyright © 2008, Stian Selnes
+    Copyright © 2008, Sebastian Schlingmann
+    Copyright © 2007, Tamas Pal
+    Copyright © 2009, Nicolas Mercier
+    Copyright © 2007, Anders Waldenborg
+    Copyright © 2007, Gustavo Carneiro
+    Copyright © 2007, Brant Young
 
 License:
 
@@ -46,49 +54,6 @@
 is licensed under the GPL-2, see `/usr/share/common-licenses/GPL-2'.
 
 
-License of utils/am*.py, demos/gnome/src/*.{h, c}:
-
-    This package is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This package is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this package; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
-
-On Debian systems, the complete text of the GNU General
-Public License 2 can be found in `/usr/share/common-licenses/GPL-2'.
-
-
-License of demos/qt4/src/*:
-
-    This file may be distributed under the terms of the Q Public License
-    as defined by Trolltech AS of Norway and appearing in the file
-    LICENSE.QPL included in the packaging of this file.
-
-    This file may be distributed and/or modified under the terms of the
-    GNU General Public License version 2 as published by the Free Software
-    Foundation and appearing in the file LICENSE.GPL included in the
-    packaging of this file.
-
-    See http://www.trolltech.com/pricing.html or email sales at trolltech.com for
-      information about Qt Commercial License Agreements.
-    See http://www.trolltech.com/qpl/ for QPL licensing information.
-    See http://www.trolltech.com/gpl/ for GPL licensing information.
-
-    Contact info at trolltech.com if any conditions of this licensing are
-    not clear to you.
-
-    This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-    WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-
-
 License of wafadmin/pproc.py:
 
     Licensed to PSF under a Contributor Agreement.

Modified: packages/waf/trunk/debian/rules
===================================================================
--- packages/waf/trunk/debian/rules	2009-07-23 22:17:31 UTC (rev 3324)
+++ packages/waf/trunk/debian/rules	2009-07-23 22:30:45 UTC (rev 3325)
@@ -1,5 +1,7 @@
 #!/usr/bin/make -f
 
+VERSION = 1.5.8
+
 export DEB_BUILD_OPTIONS := nocheck
 
 %:
@@ -19,3 +21,16 @@
 
 override_dh_auto_install:
 	./waf-light install --strip --nopyc --nopyo
+
+get-orig-source:
+	cd $(CURDIR); \
+	wget http://waf.googlecode.com/files/waf-$(VERSION).tar.bz2; \
+	tar fjx waf-$(VERSION).tar.bz2; \
+	rm waf-$(VERSION).tar.bz2; \
+	mv waf-$(VERSION) waf-$(VERSION)+dfsg; \
+	tar --exclude=waf-$(VERSION)+dfsg/demos --exclude=waf-$(VERSION)+dfsg/playground \
+		--exclude=waf-$(VERSION)+dfsg/test --exclude=waf-$(VERSION)+dfsg/utils \
+		-cf ../waf_$(VERSION)+dfsg.orig.tar waf-$(VERSION)+dfsg; \
+	rm -rf waf-$(VERSION)+dfsg; \
+	cd ..; \
+	gzip -9nf waf_$(VERSION)+dfsg.orig.tar

Modified: packages/waf/trunk/debian/watch
===================================================================
--- packages/waf/trunk/debian/watch	2009-07-23 22:17:31 UTC (rev 3324)
+++ packages/waf/trunk/debian/watch	2009-07-23 22:30:45 UTC (rev 3325)
@@ -1,3 +1,4 @@
 version=3
-http://code.google.com/p/waf/downloads/list \
+opts=dversionmangle=s/\+dfsg// \
+  http://code.google.com/p/waf/downloads/list \
   http://waf.googlecode.com/files/waf-(.*)\.tar\.bz2




More information about the Python-apps-commits mailing list