[Python-modules-commits] r34005 - in packages/mako/trunk/debian (4 files)

piotr at users.alioth.debian.org piotr at users.alioth.debian.org
Wed Aug 26 16:45:13 UTC 2015


    Date: Wednesday, August 26, 2015 @ 16:45:12
  Author: piotr
Revision: 34005

* Convert debian/copyright to DEP-5 and use it to remove minified JS files
* Add dh-python to Build-Depends
* Standards-Version bumped to 3.9.6 (no changes needed)
* Remove minified javascript files from upstream source. They are not used
  in the build process. Closes: #722265
* include Non-maintainer upload in debian/changelog

Modified:
  packages/mako/trunk/debian/changelog
  packages/mako/trunk/debian/control
  packages/mako/trunk/debian/copyright
  packages/mako/trunk/debian/watch

Modified: packages/mako/trunk/debian/changelog
===================================================================
--- packages/mako/trunk/debian/changelog	2015-08-26 15:16:57 UTC (rev 34004)
+++ packages/mako/trunk/debian/changelog	2015-08-26 16:45:12 UTC (rev 34005)
@@ -1,14 +1,25 @@
-mako (1.0.1-1) UNRELEASED; urgency=medium
+mako (1.0.1+ds1-1) unstable; urgency=medium
 
-  * Team upload.
+  [ Barry Warsaw ]
   * New upstream release.
-  * debian/control: 
-    - Add python3-funcsigs to Build-Depends-Indep.
   * debian/patches/python35-compat.patch: Upstream provided patch to
     fix compatibility issues with Python 3.5.
 
- -- Barry Warsaw <barry at debian.org>  Tue, 25 Aug 2015 16:23:14 -0400
+  [ Piotr Ożarowski ]
+  * Convert debian/copyright to DEP-5 and use it to remove minified JS files
+  * Add dh-python to Build-Depends
+  * Standards-Version bumped to 3.9.6 (no changes needed)
 
+ -- Piotr Ożarowski <piotr at debian.org>  Wed, 26 Aug 2015 17:24:08 +0200
+
+mako (1.0.0+dfsg-0.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Remove minified javascript files from upstream source. They are not used
+    in the build process. Closes: #722265
+
+ -- Ivo De Decker <ivodd at debian.org>  Tue, 11 Nov 2014 12:39:18 +0100
+
 mako (1.0.0-1) unstable; urgency=medium
 
   * New upstream release

Modified: packages/mako/trunk/debian/control
===================================================================
--- packages/mako/trunk/debian/control	2015-08-26 15:16:57 UTC (rev 34004)
+++ packages/mako/trunk/debian/control	2015-08-26 16:45:12 UTC (rev 34005)
@@ -3,15 +3,15 @@
 Priority: optional
 Maintainer: Piotr Ożarowski <piotr at debian.org>
 Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
-Build-Depends: debhelper (>= 5.0.38)
+Build-Depends: debhelper (>= 5.0.38), dh-python
 Build-Depends-Indep: python-all, python-setuptools,
  python3-all, python3-setuptools,
 # to rebuild docs:
  python-sphinx, python-changelog, python-sphinx-paramlinks,
 # for tests:
  python-nose, python-markupsafe, python-mock,
- python3-nose, python3-markupsafe, python3-mock, python3-funcsigs
-Standards-Version: 3.9.5
+ python3-nose, python3-markupsafe, python3-mock
+Standards-Version: 3.9.6
 Homepage: http://www.makotemplates.org/
 X-Python-Version: >= 2.4
 Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/mako/trunk/

Modified: packages/mako/trunk/debian/copyright
===================================================================
--- packages/mako/trunk/debian/copyright	2015-08-26 15:16:57 UTC (rev 34004)
+++ packages/mako/trunk/debian/copyright	2015-08-26 16:45:12 UTC (rev 34005)
@@ -1,29 +1,57 @@
-This package was debianized by Piotr Ożarowski <piotr at debian.org> on
-Thu,  4 Jan 2007 23:04:33 +0100.
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: mako
+Upstream-Contact: Michael Bayer <mike at zzzcomputing.com>
+Source: http://www.makotemplates.org/
+Files-Excluded: doc/*.html doc/*.js doc/_static Mako.egg-info
 
-It was originally downloaded from http://www.makotemplates.org/download.html
+Files: *
+Copyright: 2006-2015 the Mako authors and contributors
+License: Expat
 
-Upstream Author: Mike Bayer <mike at zzzcomputing.com>
+Files: examples/bench/basic.py
+Copyright: 2006 Edgewall Software
+License: BSD-3-clause
 
-Copyright © 2006-2010 Michael Bayer <mike at zzzcomputing.com>
+Files: debian/*
+Copyright: 2006-2015 Piotr Ożarowski <piotr at debian.org>
+License: Expat
 
-Copyright:
+# Source: http://www.vim.org/scripts/script.php?script_id=1858
+Files: debian/mako.vim
+Copyright: Armin Ronacher <armin.ronacher at active-4.com>
+License: BSD-3-clause
 
- This is the MIT license: http://www.opensource.org/licenses/mit-license.php
+# Source: http://www.vim.org/scripts/script.php?script_id=2663
+Files: debian/mako_indent.vim
+Copyright: 2004 Scott Torborg <storborg at mit.edu>
+License: WTFPL
 
- Copyright (C) 2006, 2007, 2008, 2009, 2010 Michael Bayer and contributors.
- Mako is a trademark of Michael Bayer.
+License: WTFPL
+            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
+                    Version 2, December 2004
+ . 
+ Copyright (C) 2004 Sam Hocevar <sam at hocevar.net>
+ .
+ Everyone is permitted to copy and distribute verbatim or modified
+ copies of this license document, and changing it is allowed as long
+ as the name is changed.
+ .
+            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+ .
+  0. You just DO WHAT THE FUCK YOU WANT TO.
 
+License: Expat
  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
@@ -32,88 +60,27 @@
  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  SOFTWARE.
 
-----------------------------------------------------------------
-
-lib/mako/_ast_util.py file:
-
- :copyright: Copyright 2008 by Armin Ronacher.
- :license: Python License.
-
-----------------------------------------------------------------
-
-lib/mako/filters.py file:
-
- Copyright (C) 2006, 2007, 2008, 2009 Geoffrey T. Dairiki <dairiki at dairiki.org> and Michael Bayer <mike_mp at zzzcomputing.com>
- This module is part of Mako and is released under
- the MIT License: http://www.opensource.org/licenses/mit-license.php
-
-----------------------------------------------------------------
-
-examples/bench/basic.py file:
-
-  basic.py - basic benchmarks adapted from Genshi
-  Copyright (C) 2006 Edgewall Software
-  All rights reserved.
-
-  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. The name of the author may not be used to endorse or promote
-      products derived from this software without specific prior
-      written permission.
-
-  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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.
-
-----------------------------------------------------------------
-
-debian/mako.vim file:
- 
- Source: http://www.vim.org/scripts/script.php?script_id=1858
-
- Author: Armin Ronacher <armin.ronacher at active-4.com>
- License: three clause BSD
-
-----------------------------------------------------------------
-
-debian/mako_indent.vim file:
-
- Source: http://www.vim.org/scripts/script.php?script_id=2663
-
- Author: Scott Torborg <storborg at mit.edu>
- License: Do What The Fuck You Want To Public License (WTFPL)
- 
-             DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
-                     Version 2, December 2004
- 
-  Copyright (C) 2004 Sam Hocevar <sam at hocevar.net>
- 
-  Everyone is permitted to copy and distribute verbatim or modified
-  copies of this license document, and changing it is allowed as long
-  as the name is changed.
- 
-             DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
-    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
- 
-   0. You just DO WHAT THE FUCK YOU WANT TO.
-
-----------------------------------------------------------------
-
-The Debian packaging is © 2007-2010, Piotr Ożarowski <piotr at debian.org> and
-is licensed under the MIT License as well.
+License: BSD-3-clause
+ 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 University 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 REGENTS 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 REGENTS 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.

Modified: packages/mako/trunk/debian/watch
===================================================================
--- packages/mako/trunk/debian/watch	2015-08-26 15:16:57 UTC (rev 34004)
+++ packages/mako/trunk/debian/watch	2015-08-26 16:45:12 UTC (rev 34005)
@@ -1,2 +1,7 @@
 version=3
-http://pypi.python.org/packages/source/M/Mako/Mako-(.+)\.tar\.gz debian uupdate
+opts=\
+uversionmangle=s/(rc|a|b|c)/~$1/,\
+pgpsigurlmangle=s/$/.asc/,\
+dversionmangle=s/\+ds\d*$//,\
+repacksuffix=+ds1 \
+http://pypi.debian.net/Mako/Mako-(.+)\.(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))




More information about the Python-modules-commits mailing list