[Python-apps-commits] r4549 - in packages/ibid/trunk/debian (12 files)
stefanor-guest at users.alioth.debian.org
stefanor-guest at users.alioth.debian.org
Tue Jan 19 21:16:40 UTC 2010
Date: Tuesday, January 19, 2010 @ 21:16:39
Author: stefanor-guest
Revision: 4549
Convert to quilt and update
Added:
packages/ibid/trunk/debian/patches/docs.diff
(from rev 4548, packages/ibid/trunk/debian/patches/10-docs.diff)
packages/ibid/trunk/debian/patches/series
packages/ibid/trunk/debian/source/
packages/ibid/trunk/debian/source/format
Modified:
packages/ibid/trunk/debian/changelog
packages/ibid/trunk/debian/compat
packages/ibid/trunk/debian/control
packages/ibid/trunk/debian/copyright
packages/ibid/trunk/debian/rules
Deleted:
packages/ibid/trunk/debian/patches/10-docs.diff
packages/ibid/trunk/debian/pycompat
packages/ibid/trunk/debian/pyversions
Modified: packages/ibid/trunk/debian/changelog
===================================================================
--- packages/ibid/trunk/debian/changelog 2010-01-19 12:14:15 UTC (rev 4548)
+++ packages/ibid/trunk/debian/changelog 2010-01-19 21:16:39 UTC (rev 4549)
@@ -1,5 +1,5 @@
-ibid (0.0-0ubuntu1) karmic; urgency=low
+ibid (0+bzr849) unstable; urgency=low
- * Initial release
+ * Initial release (Closes: #565885)
- -- Michael Gorven <ibid-dev at lists.launchpad.net> Wed, 08 Jul 2009 18:45:02 +0200
+ -- Stefano Rivera <stefano at rivera.za.net> Tue, 19 Jan 2010 22:17:34 +0200
Modified: packages/ibid/trunk/debian/compat
===================================================================
--- packages/ibid/trunk/debian/compat 2010-01-19 12:14:15 UTC (rev 4548)
+++ packages/ibid/trunk/debian/compat 2010-01-19 21:16:39 UTC (rev 4549)
@@ -1 +1 @@
-5
+7
Modified: packages/ibid/trunk/debian/control
===================================================================
--- packages/ibid/trunk/debian/control 2010-01-19 12:14:15 UTC (rev 4548)
+++ packages/ibid/trunk/debian/control 2010-01-19 21:16:39 UTC (rev 4549)
@@ -1,22 +1,26 @@
Source: ibid
Section: python
Priority: extra
-Maintainer: Ibid Developers <ibid-dev at lists.launchpad.net>
-Build-Depends: cdbs, debhelper (>= 5), python-setuptools, python-support, python
-Standards-Version: 3.8.2
+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), python-setuptools, python-support
+Standards-Version: 3.8.3
Homepage: http://ibid.omnia.za.net/
+Vcs-Svn: svn://svn.debian.org/python-apps/packages/ibid/trunk/
+Vcs-Browser: http://svn.debian.org/viewsvn/python-apps/packages/ibid/trunk/
+XS-Python-Version: >= 2.4
-Package: python-ibid
+Package: ibid
Architecture: all
Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends},
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-Depends: python-pysqlite2 | python-mysqldb | python-psycopg2, python-openssl
+ 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),
units, bc, ipcalc, iputils-tracepath, man-db, fortune, python-wokkel (>= 0.4)
-Suggests: python-pinder, python-pysilc, apt-file, bzr, dictd
+Suggests: python-pysilc, apt-file, bzr, dictd, python-figlet, python-aalib, caca-utils
Description: Multi-protocol general purpose chat bot
Ibid is a multi-protocol general purpose chat bot written in Python. It uses a
natural language interface, and can connect to multiple sources, including IRC,
Modified: packages/ibid/trunk/debian/copyright
===================================================================
--- packages/ibid/trunk/debian/copyright 2010-01-19 12:14:15 UTC (rev 4548)
+++ packages/ibid/trunk/debian/copyright 2010-01-19 21:16:39 UTC (rev 4549)
@@ -1,12 +1,66 @@
-Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat
-Upstream-Name: Ibid
-Upstream-Maintainer: Ibid Developers <ibid-dev at lists.launchpad.net>
-Upstream-Source: http://launchpad.net/ibid
+Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?rev=135
+Name: Ibid
+Maintainer: The Ibid Developers <ibid-core at lists.launchpad.net>
+Source: http://ibid.omnia.za.net/
Files: *
-Copyright: (c) 2008-2009, Michael Gorven
-Copyright: (c) 2008-2009, Jonathan Hitchcock
-Copyright: (c) 2009, Stefano Rivera
+Copyright: 2008-2010, Jonathan Hitchcock, Michael Gorven, Stefano Rivera
+ and other contributors.
+License: GPL3+ or MIT-1
+ The complete Ibid package is released under the terms of the GPL license, as
+ can be found in /usr/share/common-licenses/GPL-3. The core of Ibid is
+ additionally available under the terms of the MIT/X/Expat license, as below.
+
+Files: debian/*
+Copyright: 2008-2010, Michael Gorven, Stefano Rivera
+License: MIT-1
+
+Files: ibid/lib/html2text.py
+Copyright: 2004-2008, Aaron Swartz
+License: GPL-3
+
+Files: ibid/lib/configobj.py
+Copyright: 2005-2008, Michael Foord, Nicola Larosa
License: BSD
-X-Comment: On Debian GNU/Linux systems, the complete text of the
- BSD License can be found in /usr/share/common-licenses/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.
+
+Files: ibid/lib/objgraph.py
+Copyright: 2008, Marius Gedminas
+License: MIT-1
+ Released under the MIT licence.
+
+Files: ibid/lib/nickometer.py
+Copyright:
+ 2004, William Robinson.
+ Derived from work Copyright 1998, Adam Spiers
+License: BSD
+
+License: MIT-1
+ Permission is hereby granted, free of charge, to any person obtaining a copy of
+ this software and associated documentation files (the "Software"), to deal in
+ the Software without restriction, including without limitation the rights to
+ use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+ of the Software, and to permit persons to whom the Software is furnished to do
+ so, subject to the following conditions:
+ .
+ The above copyright notice and this permission notice shall be included in all
+ copies or substantial portions of the Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ 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.
Deleted: packages/ibid/trunk/debian/patches/10-docs.diff
===================================================================
--- packages/ibid/trunk/debian/patches/10-docs.diff 2010-01-19 12:14:15 UTC (rev 4548)
+++ packages/ibid/trunk/debian/patches/10-docs.diff 2010-01-19 21:16:39 UTC (rev 4549)
@@ -1,17 +0,0 @@
-Description: contrib/ and factpacks/ will be installed as docs.
-Author: Michael Gorven <michael at gorven.za.net>
-Forwarded: not-needed
-
-=== modified file 'setup.py'
---- setup.py 2009-07-13 17:08:34 +0000
-+++ setup.py 2009-07-14 07:58:43 +0000
-@@ -41,7 +41,7 @@
- 'http://ibid.omnia.za.net/eggs/',
- 'http://wokkel.ik.nu/downloads',
- ],
-- packages=['ibid', 'tracibid', 'lib', 'twisted', 'data', 'contrib', 'factpacks'],
-+ packages=['ibid', 'tracibid', 'lib', 'twisted', 'data'],
- entry_points={
- 'trac.plugins': ['tracibid = tracibid.notifier'],
- },
-
Copied: packages/ibid/trunk/debian/patches/docs.diff (from rev 4548, packages/ibid/trunk/debian/patches/10-docs.diff)
===================================================================
--- packages/ibid/trunk/debian/patches/docs.diff (rev 0)
+++ packages/ibid/trunk/debian/patches/docs.diff 2010-01-19 21:16:39 UTC (rev 4549)
@@ -0,0 +1,17 @@
+Description: contrib/ and factpacks/ will be installed as docs.
+Author: Michael Gorven <michael at gorven.za.net>
+Forwarded: not-needed
+
+=== modified file 'ibid-0.0/setup.py'
+--- ibid-0.0.orig/setup.py 2009-07-13 17:08:34 +0000
++++ ibid-0.0/setup.py 2009-07-14 07:58:43 +0000
+@@ -41,7 +41,7 @@
+ 'http://ibid.omnia.za.net/eggs/',
+ 'http://wokkel.ik.nu/downloads',
+ ],
+- packages=['ibid', 'tracibid', 'lib', 'twisted', 'data', 'contrib', 'factpacks'],
++ packages=['ibid', 'tracibid', 'lib', 'twisted', 'data'],
+ entry_points={
+ 'trac.plugins': ['tracibid = tracibid.notifier'],
+ },
+
Added: packages/ibid/trunk/debian/patches/series
===================================================================
--- packages/ibid/trunk/debian/patches/series (rev 0)
+++ packages/ibid/trunk/debian/patches/series 2010-01-19 21:16:39 UTC (rev 4549)
@@ -0,0 +1 @@
+docs.diff
Deleted: packages/ibid/trunk/debian/pycompat
===================================================================
--- packages/ibid/trunk/debian/pycompat 2010-01-19 12:14:15 UTC (rev 4548)
+++ packages/ibid/trunk/debian/pycompat 2010-01-19 21:16:39 UTC (rev 4549)
@@ -1 +0,0 @@
-2
Deleted: packages/ibid/trunk/debian/pyversions
===================================================================
--- packages/ibid/trunk/debian/pyversions 2010-01-19 12:14:15 UTC (rev 4548)
+++ packages/ibid/trunk/debian/pyversions 2010-01-19 21:16:39 UTC (rev 4549)
@@ -1 +0,0 @@
-2.5-
Modified: packages/ibid/trunk/debian/rules
===================================================================
--- packages/ibid/trunk/debian/rules 2010-01-19 12:14:15 UTC (rev 4548)
+++ packages/ibid/trunk/debian/rules 2010-01-19 21:16:39 UTC (rev 4549)
@@ -1,7 +1,16 @@
#!/usr/bin/make -f
-
-DEB_PYTHON_SYSTEM := pysupport
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/python-distutils.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+%:
+ dh $@
+
+.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'); \
+ if [ x$$REV = x ]; then \
+ uscan --force-download --rename --repack --download-version=$$VER --destdir=.; \
+ else \
+ bzr export -r $$REV ibid_$$VER.orig.tar.gz ~/projects/ibid/trunk; \
+ fi
+# mv ibid-0.tar.gz ibid_$$VER.orig.tar.gz; \
+# bzr export -r $$REV ibid_$$VER.orig.tar.gz lp:ibid; \
Added: packages/ibid/trunk/debian/source/format
===================================================================
--- packages/ibid/trunk/debian/source/format (rev 0)
+++ packages/ibid/trunk/debian/source/format 2010-01-19 21:16:39 UTC (rev 4549)
@@ -0,0 +1 @@
+3.0 (quilt)
More information about the Python-apps-commits
mailing list