[Python-modules-commits] r12221 - in packages/pyamf/trunk/debian (16 files)

nomadium-guest at users.alioth.debian.org nomadium-guest at users.alioth.debian.org
Tue Mar 9 00:07:42 UTC 2010 

    Date: Tuesday, March 9, 2010 @ 00:07:20
  Author: nomadium-guest
Revision: 12221

Adopted pyamf
    
* Packaged 0.5.1 version.
* Removed Build-Depends on dpatch.
* Added myself as Uploader and set DPMT as Maintainer.
* Bumped Standards-Version to 3.8.4.
* Added Build-Depends on python-dev-all and python-support.
* Updated copyright file.
* Updated watch file.
* Migrated source format package to 3.0 quilt. Converted patches from
  dpatch to quilt.
* Registered documentation of python-pyamf-doc under doc-base.
* Migrated debian/rules from plain debhelper to dh7.
  Added get-orig-source target.

Added:
  packages/pyamf/trunk/debian/patches/01_remove_ez_setup.diff
  packages/pyamf/trunk/debian/patches/series
  packages/pyamf/trunk/debian/python-pyamf-doc.doc-base.1
  packages/pyamf/trunk/debian/python-pyamf-doc.doc-base.2
  packages/pyamf/trunk/debian/python-pyamf.install
  packages/pyamf/trunk/debian/source/
  packages/pyamf/trunk/debian/source/format
Modified:
  packages/pyamf/trunk/debian/changelog
  packages/pyamf/trunk/debian/control
  packages/pyamf/trunk/debian/copyright
  packages/pyamf/trunk/debian/python-pyamf-doc.docs
  packages/pyamf/trunk/debian/rules
  packages/pyamf/trunk/debian/watch
Deleted:
  packages/pyamf/trunk/debian/README.source
  packages/pyamf/trunk/debian/patches/00list
  packages/pyamf/trunk/debian/patches/01_remove_ez_setup.dpatch

Deleted: packages/pyamf/trunk/debian/README.source
===================================================================
--- packages/pyamf/trunk/debian/README.source	2010-03-08 22:46:11 UTC (rev 12220)
+++ packages/pyamf/trunk/debian/README.source	2010-03-09 00:07:20 UTC (rev 12221)
@@ -1,9 +0,0 @@
-This package is using dpatch patch system.
-
-To patch the source:
- * debian/rules patch
-To add a new patch:
- * put it under debian/patches
- * add it to debian/patches/00list
-
-See /usr/share/doc/dpatch/README.source.gz for more information.

Modified: packages/pyamf/trunk/debian/changelog
===================================================================
--- packages/pyamf/trunk/debian/changelog	2010-03-08 22:46:11 UTC (rev 12220)
+++ packages/pyamf/trunk/debian/changelog	2010-03-09 00:07:20 UTC (rev 12221)
@@ -1,5 +1,5 @@
-pyamf (0.4.1-1) unstable; urgency=low
+pyamf (0.5.1-1) UNRELEASED; urgency=low
 
   * Initial release. (Closes: #499617)
 
- -- Daniel Watkins <daniel at daniel-watkins.co.uk>  Fri, 09 Jan 2009 11:18:34 +0000
+ -- Miguel Landaeta <miguel at miguel.cc>  Mon, 08 Mar 2010 19:27:04 -0430

Modified: packages/pyamf/trunk/debian/control
===================================================================
--- packages/pyamf/trunk/debian/control	2010-03-08 22:46:11 UTC (rev 12220)
+++ packages/pyamf/trunk/debian/control	2010-03-09 00:07:20 UTC (rev 12221)
@@ -1,10 +1,11 @@
 Source: pyamf
 Section: python
 Priority: extra
-Maintainer: Daniel Watkins <daniel at daniel-watkins.co.uk>
-Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
-Build-Depends: debhelper (>= 7), dpatch, python (>= 2.5), python-setuptools
-Standards-Version: 3.8.1
+Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
+Uploaders: Miguel Landaeta <miguel at miguel.cc>
+Build-Depends: debhelper (>> 7.0.50), python-all-dev, python-support (>= 0.8),
+               python-setuptools (>= 0.6c9)
+Standards-Version: 3.8.4
 Homepage: http://pyamf.org/
 XS-Python-Version: >= 2.5
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/pyamf/trunk/

Modified: packages/pyamf/trunk/debian/copyright
===================================================================
--- packages/pyamf/trunk/debian/copyright	2010-03-08 22:46:11 UTC (rev 12220)
+++ packages/pyamf/trunk/debian/copyright	2010-03-09 00:07:20 UTC (rev 12221)
@@ -5,7 +5,15 @@
 Upstream-Source: http://pyamf.org/
 
 Files: *
-Copyright: Copyright (C) 2007-2008 The PyAMF Project
+Copyright: Copyright (C) 2007-2009 The PyAMF Project
+Authors: The PyAMF Project <users at pyamf.org>,
+    Thijs Triemstra <thijs at pyamf.org>,
+    Nick Joyce <nick at pyamf.org>,
+    Jacob Feisley <feisley at pyamf.org>,
+    Arnar Birgisson <arnar at pyamf.org>,
+    Michael van Tellingen <michael.vantellingen at pyamf.org>,
+    Gerard Escalante <gerard at pyamf.org>,
+    Dave Thompson <dave at pyamf.org>
 License: MIT
     Permission is hereby granted, free of charge, to any person obtaining
     a copy of this software and associated documentation files (the
@@ -27,49 +35,10 @@
     WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 Files: debian/*
-Copyright: Copyright (C) 2008, Daniel Watkins <daniel at daniel-watkins.co.uk>
+Copyright: Copyright (C) 2008-2009, Daniel Watkins <daniel at daniel-watkins.co.uk>,
+           Copyright (C) 2008, Piotr Ożarowski <piotr at debian.org>,
+           Copyright (C) 2009, Sandro Tosi <morph at debian.org>,
+           Copyright (C) 2010, Miguel Landaeta <miguel at miguel.cc>
 License: BSD
     On Debian systems, the complete text of the BSD License can be found in
     `/usr/share/common-licenses/BSD'.
-
-Files: pyamf/util/imports.py
-Copyright: Copyright (C) 2006 Phillip J. Eby <peak at eby-sarna.com>
-License: Zope Public License (ZPL) Version 2.1:
-    A copyright notice accompanies this license document that identifies the
-    copyright holders.
-
-    This license has been certified as open source. It has also been designated
-    as GPL compatible by the Free Software Foundation (FSF).
-
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions are met:
-
-       1. Redistributions in source code must retain the accompanying copyright
-          notice, this list of conditions, and the following disclaimer.
-       2. Redistributions in binary form must reproduce the accompanying
-          copyright notice, this list of conditions, and the following
-          disclaimer in the documentation and/or other materials provided with
-          the distribution.
-       3. Names of the copyright holders must not be used to endorse or promote
-          products derived from this software without prior written permission
-          from the copyright holders.
-       4. The right to distribute this software or to use it for any purpose
-          does not give you the right to use Servicemarks (sm) or Trademarks
-          (tm) of the copyright holders. Use of them is covered by separate
-          agreement with the copyright holders.
-       5. If any files are modified, you must cause the modified files to carry
-          prominent notices stating that you changed the files and the date of
-          any change.
-
-    Disclaimer
-
-    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ``AS IS'' AND ANY
-    EXPRESSED 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 COPYRIGHT HOLDERS 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.

Deleted: packages/pyamf/trunk/debian/patches/00list
===================================================================
--- packages/pyamf/trunk/debian/patches/00list	2010-03-08 22:46:11 UTC (rev 12220)
+++ packages/pyamf/trunk/debian/patches/00list	2010-03-09 00:07:20 UTC (rev 12221)
@@ -1 +0,0 @@
-01_remove_ez_setup.dpatch

Added: packages/pyamf/trunk/debian/patches/01_remove_ez_setup.diff
===================================================================
--- packages/pyamf/trunk/debian/patches/01_remove_ez_setup.diff	                        (rev 0)
+++ packages/pyamf/trunk/debian/patches/01_remove_ez_setup.diff	2010-03-09 00:07:20 UTC (rev 12221)
@@ -0,0 +1,15 @@
+diff --git a/setup.py b/setup.py
+index 0587d78..07f2060 100644
+--- a/setup.py
++++ b/setup.py
+@@ -1,10 +1,6 @@
+ # Copyright (c) 2007-2009 The PyAMF Project.
+ # See LICENSE.txt for details.
+ 
+-from ez_setup import use_setuptools
+-
+-use_setuptools()
+-
+ import sys, os.path
+ from setuptools import setup, find_packages, Extension
+ from setuptools.command import test

Deleted: packages/pyamf/trunk/debian/patches/01_remove_ez_setup.dpatch
===================================================================
--- packages/pyamf/trunk/debian/patches/01_remove_ez_setup.dpatch	2010-03-08 22:46:11 UTC (rev 12220)
+++ packages/pyamf/trunk/debian/patches/01_remove_ez_setup.dpatch	2010-03-09 00:07:20 UTC (rev 12221)
@@ -1,15 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_remove_ez_setup.dpatch by Daniel Watkins <daniel at daniel-watkins.co.uk>
-##
-## DP: Remove needless dependency on ez_setup.
-
- at DPATCH@
-
---- PyAMF-0.4rc2.orig/setup.py
-+++ PyAMF-0.4rc2/setup.py
-@@ -4,5 +4,2 @@
--from ez_setup import use_setuptools
--
--use_setuptools()
- 
- from setuptools import setup, find_packages

Added: packages/pyamf/trunk/debian/patches/series
===================================================================
--- packages/pyamf/trunk/debian/patches/series	                        (rev 0)
+++ packages/pyamf/trunk/debian/patches/series	2010-03-09 00:07:20 UTC (rev 12221)
@@ -0,0 +1 @@
+01_remove_ez_setup.diff

Added: packages/pyamf/trunk/debian/python-pyamf-doc.doc-base.1
===================================================================
--- packages/pyamf/trunk/debian/python-pyamf-doc.doc-base.1	                        (rev 0)
+++ packages/pyamf/trunk/debian/python-pyamf-doc.doc-base.1	2010-03-09 00:07:20 UTC (rev 12221)
@@ -0,0 +1,8 @@
+Document: python-pyamf-doc1
+Title: API for PyAMF
+Abstract: Action Message Format support for Python
+Section: Programming
+
+Format: HTML
+Index: /usr/share/doc/python-pyamf-doc/api/index.html
+Files: /usr/share/doc/python-pyamf-doc/api/*.html

Added: packages/pyamf/trunk/debian/python-pyamf-doc.doc-base.2
===================================================================
--- packages/pyamf/trunk/debian/python-pyamf-doc.doc-base.2	                        (rev 0)
+++ packages/pyamf/trunk/debian/python-pyamf-doc.doc-base.2	2010-03-09 00:07:20 UTC (rev 12221)
@@ -0,0 +1,8 @@
+Document: python-pyamf-doc2
+Title: Documentation and tutorials for PyAMF
+Abstract: Action Message Format support for Python
+Section: Programming
+
+Format: HTML
+Index: /usr/share/doc/python-pyamf-doc/index.html
+Files: /usr/share/doc/python-pyamf-doc/*.html

Modified: packages/pyamf/trunk/debian/python-pyamf-doc.docs
===================================================================
--- packages/pyamf/trunk/debian/python-pyamf-doc.docs	2010-03-08 22:46:11 UTC (rev 12220)
+++ packages/pyamf/trunk/debian/python-pyamf-doc.docs	2010-03-09 00:07:20 UTC (rev 12221)
@@ -1,2 +1,9 @@
 README.txt
 doc/api
+doc/*.html
+doc/architecture
+doc/whatsnew
+doc/tutorials
+doc/searchindex.js
+doc/_images
+doc/_static

Added: packages/pyamf/trunk/debian/python-pyamf.install
===================================================================
--- packages/pyamf/trunk/debian/python-pyamf.install	                        (rev 0)
+++ packages/pyamf/trunk/debian/python-pyamf.install	2010-03-09 00:07:20 UTC (rev 12221)
@@ -0,0 +1 @@
+debian/tmp/usr/*

Modified: packages/pyamf/trunk/debian/rules
===================================================================
--- packages/pyamf/trunk/debian/rules	2010-03-08 22:46:11 UTC (rev 12220)
+++ packages/pyamf/trunk/debian/rules	2010-03-09 00:07:20 UTC (rev 12221)
@@ -1,35 +1,16 @@
 #!/usr/bin/make -f
 
-include /usr/share/dpatch/dpatch.make
+%:
+	dh --with python-support $@
 
-DOC_PREFIX=debian/python-pyamf-doc/usr/share/doc/python-pyamf-doc
+override_dh_auto_clean:
+	dh_auto_clean
+	rm -rf PyAMF.egg-info
 
-pre-clean: patch
-	dh clean
+override_dh_installdocs:
+	dh_installdocs
+	rm -f debian/python-pyamf-doc/usr/share/doc/python-pyamf-doc/_static/jquery.js
 
-clean: pre-clean unpatch
-	find . -name '*\.py[co]' -delete
-	rm -rf PyAMF.egg-info/ && true
-
-build: patch
-	dh build
-
-install: build
-ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
-	PYTHONPATH=. python pyamf/tests/__init__.py
-endif
-	dh install --before dh_installchangelogs
-	dh_installchangelogs CHANGES.txt
-	dh install --before dh_compress
-	mv $(DOC_PREFIX)/README.txt $(DOC_PREFIX)/README
-	dh install --remaining
-
-binary-indep: install
-	dh binary-indep
-
-binary-arch: install
-	dh binary-arch
-
-binary: binary-arch binary-indep
-
-.PHONY: clean build install binary-indep binary-arch binary
+get-orig-source:
+	cd $(dir $(firstword $(MAKEFILE_LIST)))../ && \
+	uscan --rename --force-download --watchfile debian/watch --destdir $(CURDIR)

Added: packages/pyamf/trunk/debian/source/format
===================================================================
--- packages/pyamf/trunk/debian/source/format	                        (rev 0)
+++ packages/pyamf/trunk/debian/source/format	2010-03-09 00:07:20 UTC (rev 12221)
@@ -0,0 +1 @@
+3.0 (quilt)

Modified: packages/pyamf/trunk/debian/watch
===================================================================
--- packages/pyamf/trunk/debian/watch	2010-03-08 22:46:11 UTC (rev 12220)
+++ packages/pyamf/trunk/debian/watch	2010-03-09 00:07:20 UTC (rev 12221)
@@ -1,2 +1,2 @@
 version=3
-http://download.pyamf.org/releases/PyAMF-(\d.*)\.tar\.gz
+http://download.pyamf.org/releases/([\d.]+)/PyAMF-([\d.]+)\.tar\.gz

More information about the Python-modules-commits mailing list