[Python-modules-commits] r21738 - in packages/cheetah/trunk/debian (7 files)

arnau at users.alioth.debian.org arnau at users.alioth.debian.org
Mon May 14 02:53:41 UTC 2012


    Date: Monday, May 14, 2012 @ 02:53:39
  Author: arnau
Revision: 21738

* Switch to dh_python2.
  + debian/control:
    - Remove Build-Depends on python-support.
    - Add X-Python-Version field.
    - Bump cdbs Build-Depends to 0.4.90~.
  + Add debian/pydist-overrides to avoid adding markdown as Depends as
    it is used only for tests.
  + Remove debian/pyversions.
* Add debian/source/options to ignore changes in egg-info/* to prevent
  FTBFS if built twice. Closes: #671311.
* debian/copyright: update to version 1.0 of machine-readable format.

Added:
  packages/cheetah/trunk/debian/pydist-overrides
  packages/cheetah/trunk/debian/source/options
Modified:
  packages/cheetah/trunk/debian/changelog
  packages/cheetah/trunk/debian/control
  packages/cheetah/trunk/debian/copyright
  packages/cheetah/trunk/debian/rules
Deleted:
  packages/cheetah/trunk/debian/pyversions

Modified: packages/cheetah/trunk/debian/changelog
===================================================================
--- packages/cheetah/trunk/debian/changelog	2012-05-14 01:24:01 UTC (rev 21737)
+++ packages/cheetah/trunk/debian/changelog	2012-05-14 02:53:39 UTC (rev 21738)
@@ -1,3 +1,19 @@
+cheetah (2.4.4-3) unstable; urgency=low
+
+  * Switch to dh_python2.
+    + debian/control:
+      - Remove Build-Depends on python-support.
+      - Add X-Python-Version field.
+      - Bump cdbs Build-Depends to 0.4.90~.
+    + Add debian/pydist-overrides to avoid adding markdown as Depends as
+      it is used only for tests.
+    + Remove debian/pyversions.
+  * Add debian/source/options to ignore changes in egg-info/* to prevent
+    FTBFS if built twice. Closes: #671311.
+  * debian/copyright: update to version 1.0 of machine-readable format.
+
+ -- Arnaud Fontaine <arnau at debian.org>  Mon, 14 May 2012 10:51:26 +0900
+
 cheetah (2.4.4-2) unstable; urgency=low
 
   * Upload to unstable.
@@ -85,7 +101,7 @@
     + Fix uversionmangle regex for stable versions.
   * debian/copyright:
     + Add package license.
-  
+
   [ Piotr Ożarowski ]
   * debian/control:
     + Add Homepage field.
@@ -244,4 +260,3 @@
   * Answers the call to package cheetah-template. Closes: #135456
 
  -- Chad Walstrom <chewie at debian.org>  Fri, 23 Jan 2004 23:54:05 -0600
-

Modified: packages/cheetah/trunk/debian/control
===================================================================
--- packages/cheetah/trunk/debian/control	2012-05-14 01:24:01 UTC (rev 21737)
+++ packages/cheetah/trunk/debian/control	2012-05-14 02:53:39 UTC (rev 21738)
@@ -4,12 +4,12 @@
 Maintainer: Arnaud Fontaine <arnau at debian.org>
 Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Build-Depends: debhelper (>= 5.0.37.2),
-	       cdbs (>= 0.4.43),
+	       cdbs (>= 0.4.90~),
 	       python-all-dev (>= 2.6.6-9),
-	       python-support (>= 1.0.12),
 	       python-setuptools (>= 0.6.14-5),
 	       python-markdown (>= 2.0.1)
-Standards-Version: 3.9.1
+X-Python-Version: >= 2.3
+Standards-Version: 3.9.3
 Homepage: http://www.cheetahtemplate.org/
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/cheetah/trunk/
 Vcs-Browser: http://svn.debian.org/viewsvn/python-modules/packages/cheetah/trunk/

Modified: packages/cheetah/trunk/debian/copyright
===================================================================
--- packages/cheetah/trunk/debian/copyright	2012-05-14 01:24:01 UTC (rev 21737)
+++ packages/cheetah/trunk/debian/copyright	2012-05-14 02:53:39 UTC (rev 21738)
@@ -1,36 +1,43 @@
-This package  was debianized  by Chad Walstrom  <chewie at debian.org> on
-Fri,  23 Jan  2004  23:47:52 -0600.  It  is now  maintained by  Arnaud
-Fontaine <arnau at debian.org>.
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: Cheetah
+Upstream-Contact: R. Tyler Ballance <cheetahtemplate-discuss at lists.sf.net>
+Source: http://www.cheetahtemplate.org/download.html
 
-It was downloaded from SourceForge at
-http://www.cheetahtemplate.org/download.html
+Files: *
+Copyright: 2009-2012, R. Tyler Ballance.
+           2001-2009, The Cheetah Development Team: Tavis Rudd, Mike Orr,
+           Chuck Esterbrook, Ian Bicking.
+License: MIT
+ Permission to use, copy, modify, and distribute this software for any purpose
+ and without fee  is hereby granted, provided that the  above copyright notice
+ appear in all copies and that  both that copyright notice and this permission
+ notice appear in supporting documentation, and  that the names of the authors
+ not be  used in advertising  or publicity  pertaining to distribution  of the
+ software without specific, written prior permission.
+ .
+ THE AUTHORS DISCLAIM  ALL WARRANTIES WITH REGARD TO  THIS SOFTWARE, INCLUDING
+ ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND  FITNESS. IN NO EVENT SHALL THE
+ AUTHORS BE LIABLE  FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL  DAMAGES OR ANY
+ DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+ CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-Copyright:
-
-  Copyright 2009-2010, R. Tyler Ballance.
-
-  Copyright 2001-2009, The Cheetah  Development Team: Tavis Rudd, Mike
-  Orr, Chuck Esterbrook, Ian Bicking.
-
-License:
-
-  Permission to  use, copy, modify,  and distribute this  software for
-  any purpose  and without  fee is hereby  granted, provided  that the
-  above  copyright notice  appear in  all  copies and  that both  that
-  copyright  notice and  this permission  notice appear  in supporting
-  documentation,  and that the  names of  the authors  not be  used in
-  advertising or publicity pertaining  to distribution of the software
-  without specific, written prior permission.
-
-  THE AUTHORS  DISCLAIM ALL WARRANTIES  WITH REGARD TO  THIS SOFTWARE,
-  INCLUDING ALL IMPLIED WARRANTIES  OF MERCHANTABILITY AND FITNESS. IN
-  NO EVENT  SHALL THE AUTHORS BE  LIABLE FOR ANY  SPECIAL, INDIRECT OR
-  CONSEQUENTIAL DAMAGES OR ANY  DAMAGES WHATSOEVER RESULTING FROM LOSS
-  OF  USE,  DATA  OR  PROFITS,  WHETHER  IN  AN  ACTION  OF  CONTRACT,
-  NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-  WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-The   Debian    packaging   is   (C)    2006-2010,   Arnaud   Fontaine
-<arnau at debian.org>  and  is  licensed  under  the  GPL  version  2  or
-above. On Debian systems, the  complete text of the GNU General Public
-License can be found in `/usr/share/common-licenses/GPL-2'.
+Files: debian/*
+Copyright: 2006-2012, Arnaud Fontaine <arnau at debian.org>
+License: GPL-2+
+ 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  package; if  not,  write  to the  Free  Software  Foundation, Inc.,  51
+ Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ .
+ On Debian systems, the full text of  the GNU General Public License version 2
+ can be found in the file `/usr/share/common-licenses/GPL-2'.

Added: packages/cheetah/trunk/debian/pydist-overrides
===================================================================
--- packages/cheetah/trunk/debian/pydist-overrides	                        (rev 0)
+++ packages/cheetah/trunk/debian/pydist-overrides	2012-05-14 02:53:39 UTC (rev 21738)
@@ -0,0 +1 @@
+Markdown

Deleted: packages/cheetah/trunk/debian/pyversions
===================================================================
--- packages/cheetah/trunk/debian/pyversions	2012-05-14 01:24:01 UTC (rev 21737)
+++ packages/cheetah/trunk/debian/pyversions	2012-05-14 02:53:39 UTC (rev 21738)
@@ -1 +0,0 @@
-2.3-

Modified: packages/cheetah/trunk/debian/rules
===================================================================
--- packages/cheetah/trunk/debian/rules	2012-05-14 01:24:01 UTC (rev 21737)
+++ packages/cheetah/trunk/debian/rules	2012-05-14 02:53:39 UTC (rev 21738)
@@ -4,8 +4,6 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-DEB_PYTHON_SYSTEM=pysupport
-
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/python-distutils.mk
 

Added: packages/cheetah/trunk/debian/source/options
===================================================================
--- packages/cheetah/trunk/debian/source/options	                        (rev 0)
+++ packages/cheetah/trunk/debian/source/options	2012-05-14 02:53:39 UTC (rev 21738)
@@ -0,0 +1 @@
+extend-diff-ignore = "\.egg-info"




More information about the Python-modules-commits mailing list