[Python-apps-commits] r6828 - in packages/upnp-inspector/trunk/debian (5 files)
cjsmo-guest at users.alioth.debian.org
cjsmo-guest at users.alioth.debian.org
Sat Mar 26 18:29:47 UTC 2011
Date: Saturday, March 26, 2011 @ 18:29:43
Author: cjsmo-guest
Revision: 6828
updated to use dh_python2, updated copyright to DEP5 format, updated patches to DEP3 format, corrected spacing in rules, updated changelog
Modified:
packages/upnp-inspector/trunk/debian/changelog
packages/upnp-inspector/trunk/debian/control
packages/upnp-inspector/trunk/debian/copyright
packages/upnp-inspector/trunk/debian/patches/01_upnp-inspector.desktop_fix
packages/upnp-inspector/trunk/debian/rules
Modified: packages/upnp-inspector/trunk/debian/changelog
===================================================================
--- packages/upnp-inspector/trunk/debian/changelog 2011-03-26 16:50:05 UTC (rev 6827)
+++ packages/upnp-inspector/trunk/debian/changelog 2011-03-26 18:29:43 UTC (rev 6828)
@@ -1,26 +1,27 @@
upnp-inspector (0.2.2+dfsg-3) UNRELEASED; urgency=low
[ Charlie Smotherman ]
- * debian/patches:
- - updated header info for 01_upnp-inspector.desktop_fix.
- * debian/source/format:
- - switched to using source format 3.0 (quilt)
- * debian/README.source:
- - removed, it is no longer needed.
+ * Updated header info for 01_upnp-inspector.desktop_fix to DEP3.
+ * Switched to using source format 3.0 (quilt).
+ * With the switch to source format 3.0 (quilt) debian/README.source is no
+ longer needed, so it has been removed.
+ * Added debian/pydist-overrides.
+ * Updated debian/copyright to DEP5 rev173.
* debian/rules:
- switched to "--with python2".
- - added exclude for win32 dir. It is only needed by windows users.
+ - added dh_install exclude for win32 dir. It is only needed by windows
+ users.
* debian/control:
- removed dependency on quilt.
- - increased min python version to (>=2.6.5-2~).
+ - increased min python version to (>=2.6.6-3).
- removed b-d-i on python-support.
- bumped Standards Version to 3.9.1, no changes needed.
- * Added debian/pydist-overrides.
+ - use X-P-V instead of XS-P-V.
[ Ryan Kavanagh ]
* Added a README.source, as required by Debian Policy Manual section 4.14
- -- Charlie Smotherman <cjsmo at cableone.net> Mon, 03 Jan 2011 13:44:22 -0500
+ -- Charlie Smotherman <cjsmo at cableone.net> Sat, 26 Mar 2011 13:33:42 -0500
upnp-inspector (0.2.2+dfsg-2) unstable; urgency=low
Modified: packages/upnp-inspector/trunk/debian/control
===================================================================
--- packages/upnp-inspector/trunk/debian/control 2011-03-26 16:50:05 UTC (rev 6827)
+++ packages/upnp-inspector/trunk/debian/control 2011-03-26 18:29:43 UTC (rev 6828)
@@ -3,9 +3,9 @@
Priority: optional
Maintainer: Charlie Smotherman <cjsmo at cableone.net>
Uploaders: Python Applications Packaging Team <python-apps-team at lists.alioth.debian.org>
-Build-Depends: debhelper (>= 7.0.50), python (>=2.6.5-2~), python-setuptools
+Build-Depends: debhelper (>= 7.0.50~), python (>=2.6.6-3), python-setuptools
Standards-Version: 3.9.1
-XS-Python-Version: >=2.5
+X-Python-Version: >=2.6
Vcs-Svn: svn://svn.debian.org/python-apps/packages/upnp-inspector/trunk/
Vcs-Browser: http://svn.debian.org/viewsvn/python-apps/packages/upnp-inspector/trunk/
Homepage: http://coherence.beebits.net/wiki/UPnP-Inspector
Modified: packages/upnp-inspector/trunk/debian/copyright
===================================================================
--- packages/upnp-inspector/trunk/debian/copyright 2011-03-26 16:50:05 UTC (rev 6827)
+++ packages/upnp-inspector/trunk/debian/copyright 2011-03-26 18:29:43 UTC (rev 6828)
@@ -1,118 +1,92 @@
-This package was initially debianized by Michael Stöcker
-<micha at ThinkpadR61Ubuntu.homebase> on Fri, 20 Mar 2009 18:01:28 +0100, and
-completed by Charlie Smotherman <cjsmo at cableone.net> Sun, 17 May 2009 13:57:04
--0500
+Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=173
+Upstream-Name: upnp-inspector
+Upstream-Contact: Frank Scholz <coherence at beebits.net>
+Source: https://coherence.beebits.net/download/
-It was downloaded from:
+Files: *
+Copyright: 2006 Frank Scholz <coherence at beebits.net>
+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.
- https://coherence.beebits.net/download/
+File: upnp_inspector/icons/blankalbum.png
+Copyright: 2006 Ampache.org
+License: GPLv2
-Upstream Author:
+Files: upnp_inspector/icons/inspector-icon.png
+ upnp_inspector/icons/inspector-logo.png
+Copyright: 2006 Frank Scholz <coherence at beebits.net>
+License: GPLv2
- Frank Scholz <coherence at beebits net>
+Files: debian/*
+Copyright: 2009 Michael Stöcker <micha at ThinkpadR61Ubuntu.homebase>
+ 2009 Charlie Smotherman <cjsmo at cableone.net>
+License: GPLv2
+ This program 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 program 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 program; if not, write to the Free Software Foundation, Inc., 51
+ Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ .
+ For full wording of above license, see '/usr/share/common-licenses/GPL-2
-Copyright:
-
- The file upnp_inspector/icons/inspector-icon.png Copyright 2006 Frank Scholz
- The file upnp_inspector/icons/inspector-logo.png Copyright 2006 Frank Scholz
- The file upnp_inspector/icons/blankalbum.png Copyright 2006 Ampache.org
- All other files in upnp_inspector/icons:
- -Copyright Ulisse Perusin <uli.peru at gmail.com>
- -Copyright Steven Garrity <sgarrity at silverorange.com>
- -Copyright Lapo Calamandrei <calamandrei at gmail.com>
- -Copyright Ryan Collier <rcollier at novell.com>
- -Copyright Rodney Dawes <dobey at novell.com>
- -Copyright Andreas Nilsson <nisses.mail at home.se>
- -Copyright Tuomas Kuosmanen <tigert at tigert.com>
- -Copyright Garrett LeSage <garrett at novell.com>
- -Copyright Jakub Steiner <jimmac at novell.com>
- All other files are Copyright 2006 Frank Scholz
-
-License:
-
-The file upnp_inspector/icons/blankalbum.png was developed by the Ampache
-project (http://ampache.org) and is being used, by the upnp-inspector project.
-
-The file upnp_inspector/icons/blankalbum.png is released under the following
-license:
-
-GPLv2
-
- This program 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 program 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 program; if not, write to the Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-For full wording of above license, see '/usr/share/common-licenses/GPL-2
-
-All files in upnp_inspector/icons except for inspector-icon.png,
-inspector-logo.png and blankalbum.png are licensed:
-
-Public Domain
-
- The person or persons who have associated work with this document
- (the "Dedicator" or "Certifier") hereby either (a) certifies that, to the best
- of his knowledge, the work of authorship identified is in the public domain of
- the country from which the work is published, or (b) hereby dedicates whatever
- copyright the dedicators holds in the work of authorship identified below
- (the "Work") to the public domain. A certifier, moreover, dedicates any
- copyright interest he may have in the associated work, and for these purposes,
- is described as a "dedicator" below.
-
- A certifier has taken reasonable steps to verify the copyright status of this
- work. Certifier recognizes that his good faith efforts may not shield him from
- liability if in fact the work certified is not in the public domain.
-
- Dedicator makes this dedication for the benefit of the public at large and to
- the detriment of the Dedicator's heirs and successors. Dedicator intends this
- dedication to be an overt act of relinquishment in perpetuity of all present
- and future rights under copyright law, whether vested or contingent, in the
- Work. Dedicator understands that such relinquishment of all rights includes
- the relinquishment of all rights to enforce (by lawsuit or otherwise) those
- copyrights in the Work.
-
- Dedicator recognizes that, once placed in the public domain, the Work may be
- freely reproduced, distributed, transmitted, used, modified, built upon, or
- otherwise exploited by anyone for any purpose, commercial or non-commercial,
- and in any way, including by methods that have not yet been invented or
- conceived.
-
-All other files are released under the following licence:
-
-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.
-
-This file was added to the upstream tarball to make it compliant with the
-dfsg and policy:
-
-/upnp-inspector/GPL-2
-
-The Debian packaging is Copyright 2009, Michael Stöcker
-<micha at ThinkpadR61Ubuntu.homebase> and Charlie Smotherman <cjsmo at cableone.net>
-and is licensed under the GPLv2, see `/usr/share/common-licenses/GPL-2'.
+Files: upnp_inspector/icons/*
+Copyright: Ulisse Perusin <uli.peru at gmail.com>
+ Steven Garrity <sgarrity at silverorange.com>
+ Lapo Calamandrei <calamandrei at gmail.com>
+ Ryan Collier <rcollier at novell.com>
+ Rodney Dawes <dobey at novell.com>
+ Andreas Nilsson <nisses.mail at home.se>
+ Tuomas Kuosmanen <tigert at tigert.com>
+ Garrett LeSage <garrett at novell.com>
+ Jakub Steiner <jimmac at novell.com>
+License: Public Domain
+ The person or persons who have associated work with this document (the
+ "Dedicator" or "Certifier") hereby either (a) certifies that, to the best of
+ his knowledge, the work of authorship identified is in the public domain of
+ the country from which the work is published, or (b) hereby dedicates
+ whatever copyright the dedicators holds in the work of authorship identified
+ below (the "Work") to the public domain. A certifier, moreover, dedicates any
+ copyright interest he may have in the associated work, and for these purposes,
+ is described as a "dedicator" below.
+ .
+ A certifier has taken reasonable steps to verify the copyright status of this
+ work. Certifier recognizes that his good faith efforts may not shield him
+ from liability if in fact the work certified is not in the public domain.
+ .
+ Dedicator makes this dedication for the benefit of the public at large and to
+ the detriment of the Dedicator's heirs and successors. Dedicator intends this
+ dedication to be an overt act of relinquishment in perpetuity of all present
+ and future rights under copyright law, whether vested or contingent, in the
+ Work. Dedicator understands that such relinquishment of all rights includes
+ the relinquishment of all rights to enforce (by lawsuit or otherwise) those
+ copyrights in the Work.
+ .
+ Dedicator recognizes that, once placed in the public domain, the Work may be
+ freely reproduced, distributed, transmitted, used, modified, built upon, or
+ otherwise exploited by anyone for any purpose, commercial or non-commercial,
+ and in any way, including by methods that have not yet been invented or
+ conceived.
Modified: packages/upnp-inspector/trunk/debian/patches/01_upnp-inspector.desktop_fix
===================================================================
--- packages/upnp-inspector/trunk/debian/patches/01_upnp-inspector.desktop_fix 2011-03-26 16:50:05 UTC (rev 6827)
+++ packages/upnp-inspector/trunk/debian/patches/01_upnp-inspector.desktop_fix 2011-03-26 18:29:43 UTC (rev 6828)
@@ -1,7 +1,5 @@
Description: This patch allows the desktop file to validate
Author: Charlie Smotherman 06032009
-Origin: Debian
-Forwarded: Forwarded to upstreams bug tracker.
Index: upnp-inspector-0.2.2/misc/upnp-inspector.desktop
===================================================================
Modified: packages/upnp-inspector/trunk/debian/rules
===================================================================
--- packages/upnp-inspector/trunk/debian/rules 2011-03-26 16:50:05 UTC (rev 6827)
+++ packages/upnp-inspector/trunk/debian/rules 2011-03-26 18:29:43 UTC (rev 6828)
@@ -2,12 +2,12 @@
%:
- dh --with python2 $@
+ dh $@ --with python2
override_dh_auto_install:
dh_auto_install -- --install-scripts=/usr/share/upnp-inspector \
- --install-lib=/usr/share/upnp-inspector \
- --single-version-externally-managed
+ --install-lib=/usr/share/upnp-inspector \
+ --single-version-externally-managed
override_dh_install:
dh_install -Xwin32
More information about the Python-apps-commits
mailing list