[Python-apps-commits] r4591 - in packages/ibid/trunk/debian (7 files)

stefanor-guest at users.alioth.debian.org stefanor-guest at users.alioth.debian.org
Mon Jan 25 01:08:35 UTC 2010 

    Date: Monday, January 25, 2010 @ 01:08:34
  Author: stefanor-guest
Revision: 4591

Give myself some review

Modified:
  packages/ibid/trunk/debian/changelog
  packages/ibid/trunk/debian/control
  packages/ibid/trunk/debian/copyright
  packages/ibid/trunk/debian/doc-base
  packages/ibid/trunk/debian/patches/docs.diff
  packages/ibid/trunk/debian/patches/tac-not-needed.diff
  packages/ibid/trunk/debian/rules

Modified: packages/ibid/trunk/debian/changelog
===================================================================
--- packages/ibid/trunk/debian/changelog	2010-01-24 20:46:41 UTC (rev 4590)
+++ packages/ibid/trunk/debian/changelog	2010-01-25 01:08:34 UTC (rev 4591)
@@ -1,5 +1,5 @@
-ibid (0+bzr853-1) unstable; urgency=low
+ibid (0+bzr858-1) UNRELEASED; urgency=low
 
   * Initial release (Closes: #565885)
 
- -- Stefano Rivera <stefano at rivera.za.net>  Sun, 24 Jan 2010 18:32:49 +0200
+ -- Stefano Rivera <stefano at rivera.za.net>  Mon, 25 Jan 2010 03:02:05 +0200

Modified: packages/ibid/trunk/debian/control
===================================================================
--- packages/ibid/trunk/debian/control	2010-01-24 20:46:41 UTC (rev 4590)
+++ packages/ibid/trunk/debian/control	2010-01-25 01:08:34 UTC (rev 4591)
@@ -3,8 +3,8 @@
 Priority: optional
 Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Uploaders: Stefano Rivera <stefano at rivera.za.net>
-Build-Depends: debhelper (>= 7.0.50~), python-setuptools, python-central (>= 0.6.7~),
- python-sphinx
+Build-Depends: debhelper (>= 7.0.50~), python-central (>= 0.6.7~),
+ python-setuptools, python-sphinx, python-twisted-core
 Standards-Version: 3.8.3
 Homepage: http://ibid.omnia.za.net/
 Vcs-Svn: svn://svn.debian.org/python-apps/packages/ibid/trunk/
@@ -15,17 +15,16 @@
 Architecture: all
 XB-Python-Version: ${python:Versions}
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends},
- libjs-jquery,
- python-twisted-words, python-twisted-web, python-sqlalchemy (>= 0.4.6),
- python-simplejson | python (>= 2.6), python-soappy, python-jinja,
- python-html5lib, python-beautifulsoup, python-twisted-mail,
- python-celementtree | python (>= 2.5), python-pkg-resources, python-dateutil,
- python-pysqlite2 | python-mysqldb | python-psycopg2, python-openssl
-Recommends: python-dictclient, python-dnspython, python-feedparser,
- python-imdbpy (>= 3.8), python-wokkel (>= 0.4),
- units, bc, ipcalc, iputils-tracepath, man-db, fortune
-Suggests: python-silc, apt-file, bzr, dictd, python-figlet, python-aalib,
- python-imaging, python-matplotlib, caca-utils
+ libjs-jquery, python-beautifulsoup, python-celementtree | python (>= 2.5),
+ python-dateutil, python-html5lib, python-jinja, python-pkg-resources,
+ python-simplejson | python (>= 2.6), python-soappy,
+ python-sqlalchemy (>= 0.4.6), python-twisted-core, python-twisted-web,
+ python-twisted-words, python-pysqlite2 | python-mysqldb | python-psycopg2
+Recommends: fortune, ipcalc, iputils-ping, iputils-tracepath, man-db,
+ python-dictclient, python-dnspython, python-feedparser, python-imdbpy (>= 3.8),
+ python-twisted-mail, python-wokkel, units
+Suggests: apt-file, aptitude, bc, bzr, caca-utils, dictd, python-aalib,
+ python-imaging, python-matplotlib, python-pyfiglet, python-silc, python-svn
 Description: Easily extensible Python IM bot for IRC, Jabber, SILC, campfire, etc.
  Ibid is a multi-protocol, general purpose, instant messaging chat bot written
  in Python.

Modified: packages/ibid/trunk/debian/copyright
===================================================================
--- packages/ibid/trunk/debian/copyright	2010-01-24 20:46:41 UTC (rev 4590)
+++ packages/ibid/trunk/debian/copyright	2010-01-25 01:08:34 UTC (rev 4591)
@@ -17,19 +17,41 @@
 
 Files: ibid/lib/html2text.py
 Copyright: 2004-2008, Aaron Swartz
-License: GPL-3
+License: GPL-2+
+ html2text is available under the GNU GPL 2.0.
 
-Files: ibid/lib/configobj.py
-Copyright: 2005-2008, Michael Foord, Nicola Larosa
+Files: ibid/lib/configobj.py, ibid/lib/validate.py
+Copyright: 2005-2010, Michael Foord, Mark Andrews, Nicola Larosa
 License: BSD
  Released subject to the BSD License.
-
-Files: ibid/lib/validate.py
-Copyright: 2005, Michael Foord, Mark Andrews, Nicola Larosa
-License: BSD
- This software is licensed under the terms of the BSD license.
  Basically you're free to copy, modify, distribute and relicense it,
  So long as you keep a copy of the license with it.
+ .
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are
+ met:
+ .
+     * Redistributions of source code must retain the above copyright
+       notice, this list of conditions and the following disclaimer.
+     * 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.
+     * Neither the name of Michael Foord nor the name of Voidspace
+       may be used to endorse or promote products derived from this
+       software without specific prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 COPYRIGHT
+ OWNER 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.
 
 Files: ibid/lib/objgraph.py
 Copyright: 2008, Marius Gedminas
@@ -37,10 +59,34 @@
  Released under the MIT licence.
 
 Files: ibid/lib/nickometer.py
-Copyright:
- 2004, William Robinson.
- Derived from work Copyright 1998, Adam Spiers
+Copyright: 2004, William Robinson.
 License: BSD
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+ .
+   * Redistributions of source code must retain the above copyright notice,
+     this list of conditions, and the following disclaimer.
+   * 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.
+   * Neither the name of the author of this software nor the name of
+     contributors to this software may be used to endorse or promote products
+     derived from this software without specific prior written consent.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
+Copyright: Derived from work Copyright 1998, Adam Spiers
+License: Other
+ You may do whatever you want with this code, but give me credit.
 
 License: MIT-1
  Permission is hereby granted, free of charge, to any person obtaining a copy of
@@ -60,7 +106,3 @@
  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  SOFTWARE.
-
-License: BSD
- On a Debian system, the BSD License can be found in
- /usr/share/common-licenses/BSD.

Modified: packages/ibid/trunk/debian/doc-base
===================================================================
--- packages/ibid/trunk/debian/doc-base	2010-01-24 20:46:41 UTC (rev 4590)
+++ packages/ibid/trunk/debian/doc-base	2010-01-25 01:08:34 UTC (rev 4591)
@@ -1,5 +1,5 @@
 Document: ibid
-Title: Ibid bot documentation
+Title: Ibid Bot Documentation
 Author: The Ibid Developers
 Abstract: Ibid is a multi-protocol chat bot, wrtitten in Python
 Section: Programming/Python

Modified: packages/ibid/trunk/debian/patches/docs.diff
===================================================================
--- packages/ibid/trunk/debian/patches/docs.diff	2010-01-24 20:46:41 UTC (rev 4590)
+++ packages/ibid/trunk/debian/patches/docs.diff	2010-01-25 01:08:34 UTC (rev 4591)
@@ -1,10 +1,10 @@
 Description: contrib/ and factpacks/ will be installed as docs.
 Author: Michael Gorven <michael at gorven.za.net>
 Forwarded: not-needed
+Last-Update: 2010-01-25
 
-=== modified file 'ibid-0.0+bzr849/setup.py'
---- ibid-0+bzr849.orig/setup.py	2010-01-19 23:21:04.000000000 +0200
-+++ ibid-0+bzr849/setup.py	2010-01-19 23:29:44.664383624 +0200
+--- a/setup.py
++++ b/setup.py
 @@ -48,7 +48,7 @@
          'http://ibid.omnia.za.net/eggs/',
          'http://wokkel.ik.nu/downloads',

Modified: packages/ibid/trunk/debian/patches/tac-not-needed.diff
===================================================================
--- packages/ibid/trunk/debian/patches/tac-not-needed.diff	2010-01-24 20:46:41 UTC (rev 4590)
+++ packages/ibid/trunk/debian/patches/tac-not-needed.diff	2010-01-25 01:08:34 UTC (rev 4591)
@@ -3,7 +3,6 @@
 Forwarded: not-needed
 Last-Update: 2010-01-23
 
-=== modified file 'ibid-0+bzr852/setup.py'
 --- a/setup.py
 +++ b/setup.py
 @@ -60,7 +60,6 @@

Modified: packages/ibid/trunk/debian/rules
===================================================================
--- packages/ibid/trunk/debian/rules	2010-01-24 20:46:41 UTC (rev 4590)
+++ packages/ibid/trunk/debian/rules	2010-01-25 01:08:34 UTC (rev 4591)
@@ -3,28 +3,26 @@
 %:
 	dh --with python-central $@
 
-.PHONY: override_dh_installdocs
+override_dh_auto_test:
+	trial --reporter=text ibid
+
 override_dh_installdocs:
 	# Old sphinx-builds don't create the destination directory
 	mkdir -p docs/html
-	sphinx-build -bhtml docs/ docs/html/
+	sphinx-build -N -bhtml docs/ docs/html/
 	dh_installdocs -Xdocs/html/_sources -Xdocs/_build -Xdocs/html/.doctrees \
 	               -Xdocs/html/_static/jquery.js
 
-.PHONY: override_dh_link
 override_dh_link:
 	dh_link /usr/share/javascript/jquery/jquery.js \
 	        /usr/share/doc/ibid/docs/html/_static/jquery.js
 
-.PHONY: override_dh_compress
 override_dh_compress:
 	dh_compress -X.js
 
-.PHONY: override_dh_installman
 override_dh_installman:
 	dh_installman man/*
 
-.PHONY: get-orig-source
 get-orig-source:
 	REV=$(shell dpkg-parsechangelog | sed -rne 's,^Version: .*bzr([^-]+).*,\1,p'); \
 	VER=$(shell dpkg-parsechangelog | sed -rne 's,^Version: ([^-]+).*,\1,p'); \

More information about the Python-apps-commits mailing list