[Python-modules-commits] r16887 - in packages/pyamf/trunk/debian (5 files)

[nomadium-guest at users.alioth.debian.org]

    Date: Tuesday, May 3, 2011 @ 16:53:02
  Author: nomadium-guest
Revision: 16887

* Remove versioned dependencies on python-twisted-*.
* Bump Standards-Version to 3.9.2.
* Remove redundant copies of swfobject.js and add symlinks.
* Remove unneeded call to cython.
* Don't compress .js files in -doc package.

Added:
  packages/pyamf/trunk/debian/python-pyamf-doc.install
Modified:
  packages/pyamf/trunk/debian/changelog
  packages/pyamf/trunk/debian/control
  packages/pyamf/trunk/debian/rules
Deleted:
  packages/pyamf/trunk/debian/python-pyamf-doc.links

Modified: packages/pyamf/trunk/debian/changelog
===================================================================
--- packages/pyamf/trunk/debian/changelog	2011-05-03 12:51:38 UTC (rev 16886)
+++ packages/pyamf/trunk/debian/changelog	2011-05-03 16:53:02 UTC (rev 16887)
@@ -2,4 +2,4 @@
 
   * Initial release. (Closes: #499617)
 
- -- Miguel Landaeta <miguel at miguel.cc>  Sun, 03 Apr 2011 22:10:58 -0430
+ -- Miguel Landaeta <miguel at miguel.cc>  Tue, 03 May 2011 12:17:51 -0430

Modified: packages/pyamf/trunk/debian/control
===================================================================
--- packages/pyamf/trunk/debian/control	2011-05-03 12:51:38 UTC (rev 16886)
+++ packages/pyamf/trunk/debian/control	2011-05-03 16:53:02 UTC (rev 16887)
@@ -14,11 +14,10 @@
  python-setuptools (>= 0.6c9),
  python-sqlalchemy (>= 0.4),
  python-pysqlite2,
- python-support (>= 0.90),
- python-twisted-core (>= 2.5.0),
- python-twisted-web (>= 2.5.0),
+ python-twisted-core,
+ python-twisted-web,
  python-unittest2
-Standards-Version: 3.9.1
+Standards-Version: 3.9.2
 X-Python-Version: >= 2.4
 Homepage: http://www.pyamf.org/
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/pyamf/trunk/
@@ -32,8 +31,8 @@
  python-django (>= 0.96),
  python-elixir (>= 0.7.1),
  python-sqlalchemy (>= 0.4),
- python-twisted-core (>= 2.5.0),
- python-twisted-web (>= 2.5.0)
+ python-twisted-core,
+ python-twisted-web
 Description: Action Message Format support for Python
  PyAMF provides Action Message Format (AMF) support for Python
  that is compatible with the Flash Player. It includes integration

Added: packages/pyamf/trunk/debian/python-pyamf-doc.install
===================================================================
--- packages/pyamf/trunk/debian/python-pyamf-doc.install	                        (rev 0)
+++ packages/pyamf/trunk/debian/python-pyamf-doc.install	2011-05-03 16:53:02 UTC (rev 16887)
@@ -0,0 +1 @@
+doc/tutorials/examples/actionscript/shell/flex/deploy/assets/swfobject.js  usr/share/doc/python-pyamf-doc/assets

Deleted: packages/pyamf/trunk/debian/python-pyamf-doc.links
===================================================================
--- packages/pyamf/trunk/debian/python-pyamf-doc.links	2011-05-03 12:51:38 UTC (rev 16886)
+++ packages/pyamf/trunk/debian/python-pyamf-doc.links	2011-05-03 16:53:02 UTC (rev 16887)
@@ -1 +0,0 @@
-usr/share/javascript/mootools/mootools.js  usr/share/doc/python-pyamf-doc/tutorials/examples/gateways/appengine/demo/assets/mootools.js

Modified: packages/pyamf/trunk/debian/rules
===================================================================
--- packages/pyamf/trunk/debian/rules	2011-05-03 12:51:38 UTC (rev 16886)
+++ packages/pyamf/trunk/debian/rules	2011-05-03 16:53:02 UTC (rev 16887)
@@ -4,10 +4,9 @@
 
 override_dh_auto_build:
 	rm -f cpyamf/*.c
-	cython cpyamf/*.pyx
 	dh_auto_build
 	# the documentation is not built due to a missing dependency
-	# cd doc && sphinx-build -b html -D latex_paper_size=letter . ../build/html
+	# cd doc && sphinx-build -b html . ../build/html
 
 override_dh_auto_clean:
 	find pyamf/tests -type f -name '*.pyc' -delete
@@ -25,12 +24,27 @@
 	done || true
 endif
 
-override_dh_auto_install:
-	dh_auto_install
+override_dh_link:
+	# remove redundant copies of swfobject.js
+	find debian/python-pyamf-doc/usr/share/doc/python-pyamf-doc/tutorials \
+		-name 'swfobject.js' -delete
+	set -e; \
+	for js in $(shell find debian/python-pyamf-doc -name swfobject.js); do \
+		dh_link -p python-pyamf-doc \
+			usr/share/doc/python-pyamf-doc/assets/swfobject.js \
+			`echo $$js | sed 's_^debian/python-pyamf-doc/__'` ; \
+	done
+	# remove bundled copies of mootools javascript library
 	find debian/python-pyamf-doc -name 'mootools.js' -delete
+	set -e; \
+	for js in $(shell find debian/python-pyamf-doc -name mootools.js); do \
+		dh_link -p python-pyamf-doc \
+			usr/share/javascript/mootools/mootools.js \
+			`echo $$js | sed 's_^debian/python-pyamf-doc/__'` ; \
+	done
 
 override_dh_compress:
-	dh_compress -X.py
+	dh_compress -X.py -X.js
 
 override_dh_strip:
 ifeq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))