[Python-modules-commits] r15152 - in packages/pyamf/trunk/debian (10 files)
nomadium-guest at users.alioth.debian.org
nomadium-guest at users.alioth.debian.org
Mon Dec 27 15:55:33 UTC 2010
Date: Monday, December 27, 2010 @ 15:55:31
Author: nomadium-guest
Revision: 15152
* Switch to dh_python2.
* Remove python-pyamf-doc since upstream is not providing documentation anymore.
* Remove unneeded patch regarding unit tests.
* Include full BSD license text on copyright file.
* Simplify rules file. Remove some unneeded dh7 overrides.
Added:
packages/pyamf/trunk/debian/python-pyamf.docs
Modified:
packages/pyamf/trunk/debian/changelog
packages/pyamf/trunk/debian/control
packages/pyamf/trunk/debian/copyright
packages/pyamf/trunk/debian/patches/cython-dbg.diff
packages/pyamf/trunk/debian/patches/series
packages/pyamf/trunk/debian/rules
Deleted:
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-doc.docs
Modified: packages/pyamf/trunk/debian/changelog
===================================================================
--- packages/pyamf/trunk/debian/changelog 2010-12-26 23:34:57 UTC (rev 15151)
+++ packages/pyamf/trunk/debian/changelog 2010-12-27 15:55:31 UTC (rev 15152)
@@ -1,5 +1,5 @@
-pyamf (0.5.1-1) UNRELEASED; urgency=low
+pyamf (0.6-1) UNRELEASED; urgency=low
* Initial release. (Closes: #499617)
- -- Miguel Landaeta <miguel at miguel.cc> Wed, 21 Apr 2010 19:50:13 -0430
+ -- Miguel Landaeta <miguel at miguel.cc> Sun, 26 Dec 2010 11:24:00 -0430
Modified: packages/pyamf/trunk/debian/control
===================================================================
--- packages/pyamf/trunk/debian/control 2010-12-26 23:34:57 UTC (rev 15151)
+++ packages/pyamf/trunk/debian/control 2010-12-27 15:55:31 UTC (rev 15152)
@@ -3,17 +3,15 @@
Priority: optional
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), cython, python-all-dbg
-Standards-Version: 3.8.4
+Build-Depends: debhelper (>= 7.0.50~), python-all-dev, cython, python-all-dbg,
+ python-setuptools (>= 0.6c9)
+Standards-Version: 3.9.1
Homepage: http://pyamf.org/
-XS-Python-Version: >= 2.5
Vcs-Svn: svn://svn.debian.org/python-modules/packages/pyamf/trunk/
Vcs-Browser: http://svn.debian.org/viewsvn/python-modules/packages/pyamf/trunk/
Package: python-pyamf
Architecture: any
-XB-Python-Version: ${python:Versions}
Depends: ${shlibs:Depends}, ${python:Depends}, ${misc:Depends}
Enhances: python-pylons, python-django, python-twisted
Description: Action Message Format support for Python
@@ -21,16 +19,6 @@
that is compatible with the Flash Player. It includes integration
with Python web frameworks like Django, Pylons, Twisted, and more.
-Package: python-pyamf-doc
-Section: doc
-Architecture: all
-Depends: ${misc:Depends}
-Suggests: python-pyamf
-Description: documentation for the Python AMF support
- This contains the API documentation for the Python Action Message
- Format (AMF) support provided by python-pyamf. It includes integration
- with Python web frameworks like Django, Pylons, Twisted, and more.
-
Package: python-pyamf-dbg
Section: debug
Priority: extra
Modified: packages/pyamf/trunk/debian/copyright
===================================================================
--- packages/pyamf/trunk/debian/copyright 2010-12-26 23:34:57 UTC (rev 15151)
+++ packages/pyamf/trunk/debian/copyright 2010-12-27 15:55:31 UTC (rev 15152)
@@ -31,5 +31,26 @@
2009, Sandro Tosi <morph at debian.org>,
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'.
+ 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/pyamf/trunk/debian/patches/cython-dbg.diff
===================================================================
--- packages/pyamf/trunk/debian/patches/cython-dbg.diff 2010-12-26 23:34:57 UTC (rev 15151)
+++ packages/pyamf/trunk/debian/patches/cython-dbg.diff 2010-12-27 15:55:31 UTC (rev 15152)
@@ -3,11 +3,11 @@
This is work-around for bug #541314.
Author: Jakub Wilk <jwilk at debian.org>
Forwarded: not-needed
-Last-Update: 2010-04-20
+Last-Update: 2010-12-27
--- a/setup.py
+++ b/setup.py
-@@ -11,6 +11,7 @@
+@@ -13,6 +13,7 @@
try:
from Cython.Distutils import build_ext
Modified: packages/pyamf/trunk/debian/patches/series
===================================================================
--- packages/pyamf/trunk/debian/patches/series 2010-12-26 23:34:57 UTC (rev 15151)
+++ packages/pyamf/trunk/debian/patches/series 2010-12-27 15:55:31 UTC (rev 15152)
@@ -1,2 +1,3 @@
-fix_typo_in_django_unittest.diff
+#fix_typo_in_django_unittest.diff
cython-dbg.diff
+#debian-changes-0.6-1
Deleted: packages/pyamf/trunk/debian/python-pyamf-doc.doc-base.1
===================================================================
--- packages/pyamf/trunk/debian/python-pyamf-doc.doc-base.1 2010-12-26 23:34:57 UTC (rev 15151)
+++ packages/pyamf/trunk/debian/python-pyamf-doc.doc-base.1 2010-12-27 15:55:31 UTC (rev 15152)
@@ -1,8 +0,0 @@
-Document: python-pyamf-api
-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
Deleted: packages/pyamf/trunk/debian/python-pyamf-doc.doc-base.2
===================================================================
--- packages/pyamf/trunk/debian/python-pyamf-doc.doc-base.2 2010-12-26 23:34:57 UTC (rev 15151)
+++ packages/pyamf/trunk/debian/python-pyamf-doc.doc-base.2 2010-12-27 15:55:31 UTC (rev 15152)
@@ -1,8 +0,0 @@
-Document: python-pyamf-doc
-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
Deleted: packages/pyamf/trunk/debian/python-pyamf-doc.docs
===================================================================
--- packages/pyamf/trunk/debian/python-pyamf-doc.docs 2010-12-26 23:34:57 UTC (rev 15151)
+++ packages/pyamf/trunk/debian/python-pyamf-doc.docs 2010-12-27 15:55:31 UTC (rev 15152)
@@ -1,9 +0,0 @@
-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.docs
===================================================================
--- packages/pyamf/trunk/debian/python-pyamf.docs (rev 0)
+++ packages/pyamf/trunk/debian/python-pyamf.docs 2010-12-27 15:55:31 UTC (rev 15152)
@@ -0,0 +1 @@
+README.txt
Modified: packages/pyamf/trunk/debian/rules
===================================================================
--- packages/pyamf/trunk/debian/rules 2010-12-26 23:34:57 UTC (rev 15151)
+++ packages/pyamf/trunk/debian/rules 2010-12-27 15:55:31 UTC (rev 15152)
@@ -1,44 +1,30 @@
#!/usr/bin/make -f
%:
- dh $@
+ dh --with python2 $@
override_dh_auto_build:
- rm -f cpyamf/*.c
- set -e; for module in cpyamf/amf3.pyx cpyamf/util.pyx; do cython $${module}; done
+ #rm -f cpyamf/*.c
+ #cython cpyamf/*.pyx
+ #set -e; for module in cpyamf/amf3.pyx cpyamf/util.pyx; do cython $${module}; done
dh_auto_build
override_dh_auto_clean:
dh_auto_clean
- rm -rf PyAMF.egg-info cpyamf/*.so cpyamf/*.c foo unit-tests-results.txt
+ #-rm -rf PyAMF.egg-info cpyamf/*.so cpyamf/*.c foo unit-tests-results.txt
+ rm -rf PyAMF.egg-info cpyamf/*.so foo unit-tests-results.txt
-override_dh_auto_test:
-ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
- # the test suite does not 100% pass at present,
- # but the output could be useful documentation for users
- (dh_auto_test ; \
- for python in $(shell pyversions -r); do \
- $$python setup.py test; \
- $$python-dbg setup.py test; \
- done; echo $?) 2>&1 | tee unit-tests-results.txt
-endif
+#override_dh_auto_test:
+#ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
+# # the test suite does not 100% pass at present,
+# # but the output could be useful documentation for users
+# (dh_auto_test ; \
+# for python in $(shell pyversions -r); do \
+# $$python setup.py test; \
+# $$python-dbg setup.py test; \
+# done; echo $?) 2>&1 | tee unit-tests-results.txt
+#endif
-override_dh_install:
- dh_install
- find debian/python-pyamf/usr/lib -type f -name requires.txt -delete
- -dh_install unit-tests-results.txt /usr/share/doc/python-pyamf/
-
-override_dh_installdocs:
- dh_installdocs
- rm -f debian/python-pyamf-doc/usr/share/doc/python-pyamf-doc/_static/jquery.js
-
-override_dh_compress:
- dh_compress -X.js
-
-override_dh_strip:
- dh_strip --dbg-package=python-pyamf-dbg
- cd debian/python-pyamf-dbg/usr/lib/debug/usr/lib && mv pyshared pymodules
-
get-orig-source:
cd $(dir $(firstword $(MAKEFILE_LIST)))../ && \
uscan --rename --force-download --watchfile debian/watch --destdir $(CURDIR)
More information about the Python-modules-commits
mailing list