[Python-apps-commits] r4926 - in packages/ibid/trunk/debian (5 files)

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

    Date: Tuesday, March 9, 2010 @ 21:40:40
  Author: stefanor-guest
Revision: 4926

Ibid 0.1.0

Modified:
  packages/ibid/trunk/debian/changelog
  packages/ibid/trunk/debian/control
  packages/ibid/trunk/debian/patches/separate-data.diff
  packages/ibid/trunk/debian/rules
  packages/ibid/trunk/debian/watch

Modified: packages/ibid/trunk/debian/changelog
===================================================================
--- packages/ibid/trunk/debian/changelog	2010-03-09 17:38:05 UTC (rev 4925)
+++ packages/ibid/trunk/debian/changelog	2010-03-09 21:40:40 UTC (rev 4926)
@@ -1,6 +1,6 @@
-ibid (0+bzr908+dfsg-1) UNRELEASED; urgency=low
+ibid (0.1.0+dfsg-1) UNRELEASED; urgency=low
 
-  * New upstream revision.
+  * Initial upstream release.
   * Update separate-data patch. Upstream incorporated fixes to make this patch
     much simpler and less invasive.
   * Run test suite with all python interpretors.
@@ -8,7 +8,7 @@
   * Add fortune-path.diff: Change fortune's default location to be absolute
     path /usr/games/fortune.
 
- -- Stefano Rivera <stefano at rivera.za.net>  Wed, 03 Mar 2010 12:20:43 +0200
+ -- Stefano Rivera <stefano at rivera.za.net>  Tue, 09 Mar 2010 23:14:30 +0200
 
 ibid (0+bzr881+dfsg-1) experimental; urgency=low
 

Modified: packages/ibid/trunk/debian/control
===================================================================
--- packages/ibid/trunk/debian/control	2010-03-09 17:38:05 UTC (rev 4925)
+++ packages/ibid/trunk/debian/control	2010-03-09 21:40:40 UTC (rev 4926)
@@ -4,7 +4,7 @@
 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-central (>= 0.6.7~),
- python-all, python-beautifulsoup, python-configobj (>= 4.7.0), python-dateutil,
+ python-all, python-beautifulsoup, python-configobj (>= 4.7), python-dateutil,
  python-html5lib, python-jinja, python-pkg-resources, python-setuptools,
  python-simplejson, python-soappy, python-sphinx, python-sqlalchemy (>= 0.4.6),
  python-sqlalchemy (<< 0.6~), python-twisted-core, python-twisted-web
@@ -19,7 +19,7 @@
 XB-Python-Version: ${python:Versions}
 Depends: ${misc:Depends}, ${python:Depends},
  libjs-jquery, python (>= 2.6) | python-simplejson, python-beautifulsoup,
- python-chardet, python-configobj (>= 4.7.0), python-dateutil, python-html5lib,
+ python-chardet, python-configobj (>= 4.7), python-dateutil, python-html5lib,
  python-jinja, python-pkg-resources,
  python-pysqlite2 | python-mysqldb | python-psycopg2, python-soappy,
  python-sqlalchemy (>= 0.4.6), python-sqlalchemy (<< 0.6~), python-twisted-core,
@@ -27,7 +27,7 @@
  python-zope.interface | python-zopeinterface
 Recommends: fortune, ipcalc, iputils-ping, iputils-tracepath, man-db,
  python-dictclient, python-dnspython, python-feedparser, python-html2text,
- python-imdbpy (>= 3.8), python-twisted-mail, python-wokkel (>= 0.6.3), units
+ python-imdbpy (>= 4.5), python-twisted-mail, python-wokkel (>= 0.6.3), units
 Suggests: apt-file, aptitude, bc, bzr, caca-utils, dictd, python-aalib,
  python-dbus, python-imaging, python-matplotlib, python-numpy, python-objgraph,
  python-pyfiglet, python-silc, python-svn

Modified: packages/ibid/trunk/debian/patches/separate-data.diff
===================================================================
--- packages/ibid/trunk/debian/patches/separate-data.diff	2010-03-09 17:38:05 UTC (rev 4925)
+++ packages/ibid/trunk/debian/patches/separate-data.diff	2010-03-09 21:40:40 UTC (rev 4926)
@@ -8,7 +8,7 @@
 
 --- a/MANIFEST.in
 +++ b/MANIFEST.in
-@@ -1,12 +1,9 @@
+@@ -1,14 +1,11 @@
  recursive-include ibid *.py
 -recursive-include ibid/templates *
  recursive-include tracibid *.py
@@ -16,14 +16,16 @@
  recursive-include ibid/lib *.py
 -recursive-include ibid/data *
  recursive-include docs *
+ recursive-include man *
  include factpacks/*.json
+ include factpacks/README
 -include ibid/*.ini
  include twisted/plugins/ibid_plugin.py
+ include README
  include INSTALL
- include COPYING
 --- a/ibid/utils/__init__.py
 +++ b/ibid/utils/__init__.py
-@@ -19,7 +19,6 @@
+@@ -20,7 +20,6 @@
  from subprocess import Popen, PIPE
  
  from dateutil.tz import tzlocal, tzutc
@@ -31,7 +33,7 @@
  
  import ibid
  from ibid.compat import defaultdict, json
-@@ -267,9 +266,11 @@
+@@ -268,9 +267,11 @@
      ))
      if os.path.exists(fspath):
          return fspath

Modified: packages/ibid/trunk/debian/rules
===================================================================
--- packages/ibid/trunk/debian/rules	2010-03-09 17:38:05 UTC (rev 4925)
+++ packages/ibid/trunk/debian/rules	2010-03-09 21:40:40 UTC (rev 4926)
@@ -56,6 +56,7 @@
 ifeq ($(REV),)
 	uscan --noconf --force-download --rename --download-version=$(VER) --destdir=.
 	tar -xf ibid_$(VER).orig.tar.gz
+	mv Ibid-$(VER) ibid-$(VER)
 	rm -f ibid_$(VER).orig.tar.gz
 else
 	bzr export -r $(REV) ibid-$(VER) $(BZR_REPO)

Modified: packages/ibid/trunk/debian/watch
===================================================================
--- packages/ibid/trunk/debian/watch	2010-03-09 17:38:05 UTC (rev 4925)
+++ packages/ibid/trunk/debian/watch	2010-03-09 21:40:40 UTC (rev 4926)
@@ -2,4 +2,4 @@
 
 opts=dversionmangle=s/\+dfsg// \
 https://launchpad.net/ibid/+download \
-https?://.*/ibid-(.*)\.tar\.gz
+https?://.*/Ibid-(.*)\.tar\.gz