[Python-modules-commits] r15452 - in packages/python-gearman/trunk/debian (4 files)

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

    Date: Friday, February 4, 2011 @ 16:43:11
  Author: oxan-guest
Revision: 15452

* Use the libjs-jquery package
* Remove obsolete dual-licensing left over from old version
* Switch Maintainer and Uploaders
* Use more standard way of calling make in debian/rules

Added:
  packages/python-gearman/trunk/debian/python-gearman.links
Modified:
  packages/python-gearman/trunk/debian/control
  packages/python-gearman/trunk/debian/copyright
  packages/python-gearman/trunk/debian/rules

Modified: packages/python-gearman/trunk/debian/control
===================================================================
--- packages/python-gearman/trunk/debian/control	2011-02-04 04:35:29 UTC (rev 15451)
+++ packages/python-gearman/trunk/debian/control	2011-02-04 16:43:11 UTC (rev 15452)
@@ -1,11 +1,11 @@
 Source: python-gearman
 Section: python
 Priority: optional
-Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
-Maintainer: Oxan van Leeuwen <oxan at oxanvanleeuwen.nl>
+Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
+Uploaders: Oxan van Leeuwen <oxan at oxanvanleeuwen.nl>
 Build-Depends: debhelper (>= 7.0.50~), python-all (>= 2.6.6-2), python-setuptools, python-sphinx
 Standards-Version: 3.9.1
-Homepage: http://github.com/mtai/python-gearman/
+Homepage: http://github.com/Yelp/python-gearman/
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/python-gearman/trunk
 Vcs-Browser: http://svn.debian.org/viewsvn/python-modules/packages/python-gearman/trunk/
 X-Python-Version: >= 2.4
@@ -13,7 +13,7 @@
 Package: python-gearman
 Architecture: all
 Depends: ${misc:Depends}, ${python:Depends}
-Provides: ${python:Provides}
+Suggests: libjs-jquery
 Breaks: ${python:Breaks}
 XB-Python-Version: ${python:Versions}
 Description: Python interface to the Gearman library

Modified: packages/python-gearman/trunk/debian/copyright
===================================================================
--- packages/python-gearman/trunk/debian/copyright	2011-02-04 04:35:29 UTC (rev 15451)
+++ packages/python-gearman/trunk/debian/copyright	2011-02-04 16:43:11 UTC (rev 15452)
@@ -4,12 +4,12 @@
 Source: http://github.com/Yelp/python-gearman/
 
 Files: *
-Copyright: 2010, 2011, Yelp
+Copyright: 2010 Yelp
 License: Apache-2
 
 Files: debian/*
 Copyright: 2010, 2011, Oxan van Leeuwen <oxan at oxanvanleeuwen.nl>
-License: Apache-2 or GPL-2+
+License: Apache-2
 
 License: Apache-2
  Licensed under the Apache License, Version 2.0 (the "License");
@@ -26,25 +26,3 @@
  .
  On Debian systems, the full text of the Apache License version 2 can 
  be found in the file `/usr/share/common-licenses/Apache-2'.
-
-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/python-gearman/trunk/debian/python-gearman.links
===================================================================
--- packages/python-gearman/trunk/debian/python-gearman.links	                        (rev 0)
+++ packages/python-gearman/trunk/debian/python-gearman.links	2011-02-04 16:43:11 UTC (rev 15452)
@@ -0,0 +1 @@
+/usr/share/javascript/jquery/jquery.js usr/share/doc/python-gearman/html/_static/jquery.js

Modified: packages/python-gearman/trunk/debian/rules
===================================================================
--- packages/python-gearman/trunk/debian/rules	2011-02-04 04:35:29 UTC (rev 15451)
+++ packages/python-gearman/trunk/debian/rules	2011-02-04 16:43:11 UTC (rev 15452)
@@ -5,14 +5,14 @@
 
 override_dh_auto_build:
 	dh_auto_build
-	cd docs && make html
+	$(MAKE) -C docs html
 
 override_dh_auto_clean:
 	dh_auto_clean
-	rm -rf docs/_build
+	$(MAKE) -C docs clean
 
 override_dh_installdocs:
-	dh_installdocs -X.js
+	dh_installdocs -Xjquery.js
 
 override_dh_installchangelogs:
 	dh_installchangelogs CHANGES.txt