[Python-modules-commits] r29778 - in packages/gamera/trunk/debian (4 files)
danstender-guest at users.alioth.debian.org
danstender-guest at users.alioth.debian.org
Wed Jul 16 10:47:29 UTC 2014
Date: Wednesday, July 16, 2014 @ 10:47:28
Author: danstender-guest
Revision: 29778
changed X-Python-Version, added Reviewed-by line to patch header, improved changelog
Modified:
packages/gamera/trunk/debian/changelog
packages/gamera/trunk/debian/control
packages/gamera/trunk/debian/copyright
packages/gamera/trunk/debian/patches/fix-typos.diff
Modified: packages/gamera/trunk/debian/changelog
===================================================================
--- packages/gamera/trunk/debian/changelog 2014-07-16 10:10:13 UTC (rev 29777)
+++ packages/gamera/trunk/debian/changelog 2014-07-16 10:47:28 UTC (rev 29778)
@@ -11,9 +11,10 @@
+ Changed b-d from libtiff4-dev to libtiff-dev (Closes: #736004).
+ Bumped version of python, python-all-dbg/dev to 2.6.6-3~.
+ Dropped b-d on python_support.
+ + Changed XS-Python-Version to X-Python-Version.
+ Bump standards version to 3.9.5 (no changes needed).
+ Relocated Vcs-* fields.
- * Updated deb/copyright.
+ * Updated deb/copyright, sorted holders, padded, removed trailing commas.
* deb/rules:
+ Added export lines for DH_VERBOSE and DEB_BUILD_OPTIONS.
+ Replaced dh_pysupport with dh_python2.
@@ -40,7 +41,7 @@
* Set PYTHONHASHSEED=random in debian/rules.
* Use canonical URIs for Vcs-* fields.
- -- Daniel Stender <debian at danielstender.com> Fri, 11 Jul 2014 00:08:24 +0200
+ -- Daniel Stender <debian at danielstender.com> Wed, 16 Jul 2014 12:44:56 +0200
gamera (3.3.3-2) unstable; urgency=low
Modified: packages/gamera/trunk/debian/control
===================================================================
--- packages/gamera/trunk/debian/control 2014-07-16 10:10:13 UTC (rev 29777)
+++ packages/gamera/trunk/debian/control 2014-07-16 10:47:28 UTC (rev 29778)
@@ -25,7 +25,7 @@
python-numpy,
python-wxgtk2.8,
rdfind
-XS-Python-Version: >= 2.5
+X-Python-Version: >= 2.5
Standards-Version: 3.9.5
Homepage: http://gamera.sourceforge.net/
Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/gamera/trunk/
Modified: packages/gamera/trunk/debian/copyright
===================================================================
--- packages/gamera/trunk/debian/copyright 2014-07-16 10:10:13 UTC (rev 29777)
+++ packages/gamera/trunk/debian/copyright 2014-07-16 10:47:28 UTC (rev 29778)
@@ -1,71 +1,46 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: gamera
-Upstream-Contact: Michael Droettboom, Christoph Dalitz
+Upstream-Contact: Christoph Dalitz <christoph.dalitz at hs-niederrhein.de>
+ Michael Droettboom <mdboom at gmail.com>
Source: http://gamera.sourceforge.net/
Files: *
-Copyright:
- 2001-2013, Christoph Dalitz
- 2001-2010, Michael Droettboom
- 2001-2010, Ichiro Fujinaga
- 2001-2010, Karl MacMillan
- 2002-2005, Robert Ferguson
- 2005, Alex Cobb
- 2005, John Ashley Burgoyne
- 2007-2010, Robert Butz
- 2007-2010, Uma Kompella
- 2007-2009, Rene Baston
- 2007-2009, Maria Elhachimi
- 2007-2009, Stefan Ruloff
- 2007-2009, Ilya Stoyanov
- 2007-2008, Colin Baumgarten
- 2009, Jonathan Koch
- 2010, Hasan Yildiz
- 2010-2012, Olivier Christen
- 2010-2012, Tobias Bolten
- 2011-2013, Christian Brandt
- 2011, Andreas Leuschner
- 2012, Andrew Hankinson
- 2012, David Kolanus
- 2013, Fabian Schmitt
- 2013, Manuel Jeltsch
+Copyright: 2007-2009 Rene Baston
+ 2007-2008 Colin Baumgarten
+ 2010-2012 Tobias Bolten
+ 2011-2013 Christian Brandt
+ 2005 John Ashley Burgoyne
+ 2007-2010 Robert Butz
+ 2010-2012 Olivier Christen
+ 2005 Alex Cobb
+ 2001-2014 Christoph Dalitz
+ 2001-2010 Michael Droettboom
+ 2007-2009 Maria Elhachimi
+ 2002-2005 Robert Ferguson
+ 2001-2010 Ichiro Fujinaga
+ 2012 Andrew Hankinson
+ 2013 Manuel Jeltsch
+ 2009 Jonathan Koch
+ 2012 David Kolanus
+ 2007-2010 Uma Kompella
+ 2011 Andreas Leuschner
+ 2001-2010 Karl MacMillan
+ 2007-2009 Stefan Ruloff
+ 2013 Fabian Schmitt
+ 2007-2009 Ilya Stoyanov
+ 2010 Hasan Yildiz
License: GPL-2+
-Files: gamera/backport/textwrap.py
-Comment: Origin: Python standard library
-Copyright:
- 1999-2001, Gregory P. Ward
- 2002-2003, Python Software Foundation
-License: PSF-2
-
-Files: gamera/backport/ConfigParser.py gamera/backport/sets.py
-Comment: Origin: Python standard library
-Copyright:
- 2002-2004, Python Software Foundation
-License: PSF-2
-
-Files: gamera/backport/optparse.py
-Comment: Origin: Python standard library
-Copyright:
- 2001-2003, Gregory P. Ward.
-License: BSD
-
Files: gamera/stats.py gamera/pstat.py gamera/io.py
-Copyright:
- 1999-2007, Gary Strangman
+Copyright: 1999-2007 Gary Strangman <strang at nmr.mgh.harvard.edu>
License: Expat
-Files: include/vigra/* include/vigra_iterators.hpp
-Copyright:
- 1998-2006, Ullrich Köthe
- 1998-2005, Hans Meine
- 2001-2002, Gunnar Kedenburg
- 2003, Christian-Dennis Rahn
- 2003-2004, Gunnar Kedenburg
+Files: include/vigra_iterators.hpp include/vigra_support.hpp
+Copyright: 1998-2001 Ullrich Köthe <ullrich.koethe at iwr.uni-heidelberg.de>
License: Expat
Files: include/boost_limits.hpp
-Copyright: 1997, Silicon Graphics Computer Systems, Inc.
+Copyright: 1997 Silicon Graphics Computer Systems, Inc.
License: other-1
Permission to use, copy, modify, distribute and sell this software and its
documentation for any purpose is hereby granted without fee, provided that the
@@ -74,33 +49,24 @@
makes no representations about the suitability of this software for any
purpose. It is provided "as is" without express or implied warranty.
-Files: include/plugins/threshold.hpp
-Copyright:
- 1990, Blab, UiO
- 2001-2005, Ichiro Fujinaga,
- 2001-2005, Michael Droettboom,
- 2001-2005, Karl MacMillan,
-License: GPL-2+
-
Files: src/eodev/*
-Copyright:
- 1994, Th. Baeck
- 1996-2001, EEAAX
- 1996-2003, Nikolaus Hansen
- 1998-2005, GeNeura Team
- 1998-2007, Maarten Keijzer
- 1999-2005, Marc Schoenauer
- 2001-2002, Jeroen Eggermont
- 2002, Pierre Collet
- 2002-2007, OPAC Team
- 2005, Jochen Küpper
- 2007-2008, Dolphin Team
- 2010-2011, Thales group
+Copyright: 1994 Th. Baeck
+ 2002 Pierre Collet
+ 1996-2001 EEAAX
+ 2001-2002 Jeroen Eggermont
+ 1998-2005 GeNeura Team
+ 1996-2003 Nikolaus Hansen
+ 2007-2008 INRIA Dolphin Project
+ 1998-2007 Maarten Keijzer
+ 2005 Jochen Küpper
+ 2007 Thomas Legrand
+ 2002-2007 LIFL OPAC Team
+ 1999-2005 Marc Schoenauer
+ 2010-2011 Thales group
License: LGPLv2.1+
Files: src/eodev/gp/node_pool.h
-Copyright:
- 1999-2000, Maarten Keijzer
+Copyright: 1999-2000 Maarten Keijzer
License: other-2
Permission to copy, use, modify, sell and distribute this software is
granted provided this copyright notice appears in all copies. This software
@@ -118,26 +84,26 @@
Files: gamera/pixmaps/img2py.py gamera/pixmaps/img2img.py
Comment: Origin: wxPython
-Copyright: 2002, Total Control Software
+Copyright: 1998 Robert Roebling
+ 1998 Julian Smart
License: wxWindows-3
Files: gamera/mac/buildpkg.py
-Copyright: 2002, Dinu C. Gherman
+Copyright: 2002 Dinu C. Gherman
License: FreeBSD
Files: doc/*
-Copyright:
- 2003-2009, Michael Droettboom
- 2003-2009, Christoph Dalitz
+Copyright: 2003-2009 Christoph Dalitz
+ 2003-2009 Michael Droettboom
License: CC-BY-SA-3.0
Files: debian/*
-Copyright: 2009-2012, Jakub Wilk <jwilk at debian.org>
- 2014, Daniel Stender <debian at danielstender.com>
+Copyright: 2014 Daniel Stender <debian at danielstender.com>
+ 2009-2012 Jakub Wilk <jwilk at debian.org>
License: GPL-2
Files: debian/dh_buildid
-Copyright: 2011, Jakub Wilk <jwilk at debian.org>
+Copyright: 2011 Jakub Wilk <jwilk at debian.org>
License: Expat
License: GPL-2
@@ -252,79 +218,6 @@
TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-License: PSF-2
- 1. This LICENSE AGREEMENT is between the Python Software Foundation
- ("PSF"), and the Individual or Organization ("Licensee") accessing and
- otherwise using this software ("Python") in source or binary form and
- its associated documentation.
- .
- 2. Subject to the terms and conditions of this License Agreement, PSF
- hereby grants Licensee a nonexclusive, royalty-free, world-wide license
- to reproduce, analyze, test, perform and/or display publicly, prepare
- derivative works, distribute, and otherwise use Python alone or in any
- derivative version, provided, however, that PSF's License Agreement and
- PSF's notice of copyright, i.e., "Copyright (c) 2001, 2002, 2003, 2004
- Python Software Foundation; All Rights Reserved" are retained in Python
- alone or in any derivative version prepared by Licensee.
- .
- 3. In the event Licensee prepares a derivative work that is based on or
- incorporates Python or any part thereof, and wants to make the
- derivative work available to others as provided herein, then Licensee
- hereby agrees to include in any such work a brief summary of the
- changes made to Python.
- .
- 4. PSF is making Python available to Licensee on an "AS IS" basis. PSF
- MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED. BY WAY OF
- EXAMPLE, BUT NOT LIMITATION, PSF MAKES NO AND DISCLAIMS ANY
- REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS FOR ANY
- PARTICULAR PURPOSE OR THAT THE USE OF PYTHON WILL NOT INFRINGE ANY
- THIRD PARTY RIGHTS.
- .
- 5. PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON FOR
- ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS A RESULT
- OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON, OR ANY
- DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
- .
- 6. This License Agreement will automatically terminate upon a material
- breach of its terms and conditions.
- .
- 7. Nothing in this License Agreement shall be deemed to create any
- relationship of agency, partnership, or joint venture between PSF and
- Licensee. This License Agreement does not grant permission to use PSF
- trademarks or trade name in a trademark sense to endorse or promote
- products or services of Licensee, or any third party.
- .
- 8. By copying, installing or otherwise using Python, Licensee agrees to
- be bound by the terms and conditions of this License Agreement.
-
-License: BSD
- 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 author nor the names of its contributors may
- be used to endorse or promote products derived from this software
- without specific prior written permission.
- .
- THIS SOFTWARE 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 AUTHOR 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.
-
License: FreeBSD
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
Modified: packages/gamera/trunk/debian/patches/fix-typos.diff
===================================================================
--- packages/gamera/trunk/debian/patches/fix-typos.diff 2014-07-16 10:10:13 UTC (rev 29777)
+++ packages/gamera/trunk/debian/patches/fix-typos.diff 2014-07-16 10:47:28 UTC (rev 29778)
@@ -1,6 +1,7 @@
Description: fix spelling mistakes
Author: Jakub Wilk <jwilk at debian.org>
Forwarded: no
+Reviewed-by: Daniel Stender <debian at danielstender.com>
Last-Update: 2014-07-08
--- a/doc/src/ga_optimization.txt
More information about the Python-modules-commits
mailing list