[Reportbug-commits] r589 - in branches/modules (7 files)

[lawrencc at users.alioth.debian.org]

    Date: Saturday, July 26, 2008 @ 18:40:28
  Author: lawrencc
Revision: 589

Wrap up changes for 3.99.0 targeted at experimental.

Added:
  branches/modules/debian/extract_version
  branches/modules/debian/python-reportbug.dirs
Modified:
  branches/modules/debian/control
  branches/modules/debian/dirs
  branches/modules/debian/rules
  branches/modules/po4a/po4a.cfg
  branches/modules/reportbug/__init__.py

Modified: branches/modules/debian/control
===================================================================
--- branches/modules/debian/control	2008-07-26 18:40:18 UTC (rev 588)
+++ branches/modules/debian/control	2008-07-26 18:40:28 UTC (rev 589)
@@ -14,7 +14,7 @@
 
 Package: reportbug
 Architecture: all
-Depends: ${python:Depends}, apt
+Depends: ${python:Depends}, apt, python-reportbug
 Suggests: postfix | exim4 | mail-transport-agent, gnupg | pgp, debconf-utils (>> 1.1.0), debsums, file (>> 1.30), dlocate, python-urwid
 Conflicts: python-urwid (<< 0.9.8-1), python-central (<< 0.5.13)
 XB-Python-Version: ${python:Versions}
@@ -36,3 +36,17 @@
  .
  This package also includes the "querybts" script for browsing the
  Debian bug tracking system.
+
+Package: python-reportbug
+Architecture: all
+Depends: ${python:Depends}, apt
+Suggests: reportbug
+XB-Python-Version: ${python:Versions}
+Description: Python modules for interacting with bug tracking systems
+ reportbug is a tool designed to make the reporting of bugs in Debian
+ and derived distributions relatively painless.
+ .
+ This package includes Python modules which may be reusable by other
+ tools that want to interact with the Debian bug tracking system.
+ .
+ To actually report a bug, install the reportbug package.

Modified: branches/modules/debian/dirs
===================================================================
--- branches/modules/debian/dirs	2008-07-26 18:40:18 UTC (rev 588)
+++ branches/modules/debian/dirs	2008-07-26 18:40:28 UTC (rev 589)
@@ -1,5 +1,3 @@
 etc
 usr/bin
-usr/share/reportbug
-usr/share/reportbug/reportbuglib
 usr/share/bug/reportbug

Added: branches/modules/debian/extract_version
===================================================================
--- branches/modules/debian/extract_version	                        (rev 0)
+++ branches/modules/debian/extract_version	2008-07-26 18:40:28 UTC (rev 589)
@@ -0,0 +1,2 @@
+#!/bin/sh
+head -n 1 debian/changelog | sed -e 's/[^(]*(\([^)]*\).*/\1/'


Property changes on: branches/modules/debian/extract_version
___________________________________________________________________
Name: svn:executable
   + *

Added: branches/modules/debian/python-reportbug.dirs
===================================================================
--- branches/modules/debian/python-reportbug.dirs	                        (rev 0)
+++ branches/modules/debian/python-reportbug.dirs	2008-07-26 18:40:28 UTC (rev 589)
@@ -0,0 +1 @@
+usr/lib

Modified: branches/modules/debian/rules
===================================================================
--- branches/modules/debian/rules	2008-07-26 18:40:18 UTC (rev 588)
+++ branches/modules/debian/rules	2008-07-26 18:40:28 UTC (rev 589)
@@ -13,7 +13,7 @@
 	dh_testdir
 
 	# Test if versions are synchronized; this will bomb if not synced
-	@python -c "import reportbug, sys; sys.exit(reportbug.VERSION_NUMBER != '$(VERSION)')"
+	@python -c "import reportbug, sys; sys.exit(reportbug.VERSION_NUMBER != '$(VERSION)')" || (echo 'Please update reportbug/__version__'; exit 1)
 
 	po4a po4a/po4a.cfg
 	python setup.py build
@@ -40,7 +40,7 @@
 	dh_installdirs
 
 	# Add here commands to install the package into debian/reportbug.
-	python setup.py install --root $(CURDIR)/debian/reportbug
+	python setup.py install --root $(CURDIR)/debian/reportbug --install-lib $(CURDIR)/debian/python-reportbug/usr/lib
 
 	chmod 0755 `pwd`/debian/reportbug/usr/bin/*
 	cp -p reportbug.conf `pwd`/debian/reportbug/etc

Modified: branches/modules/po4a/po4a.cfg
===================================================================
--- branches/modules/po4a/po4a.cfg	2008-07-26 18:40:18 UTC (rev 588)
+++ branches/modules/po4a/po4a.cfg	2008-07-26 18:40:28 UTC (rev 589)
@@ -1,7 +1,7 @@
 [po4a_paths] po4a/po/reportbug.pot fr:po4a/po/fr.po
 [po4a_alias:man] man opt_fr:"-L ISO-8859-15 -A UTF-8"
 
-[type: man] reportbug.1 \
-	fr:reportbug.fr.1 add_fr:po4a/add_fr/reportbug.add
-[type: man] querybts.1 \
-	fr:querybts.fr.1 add_fr:po4a/add_fr/querybts.add
+[type: man] man/reportbug.1 \
+	fr:man/reportbug.fr.1 add_fr:po4a/add_fr/reportbug.add
+[type: man] man/querybts.1 \
+	fr:man/querybts.fr.1 add_fr:po4a/add_fr/querybts.add

Modified: branches/modules/reportbug/__init__.py
===================================================================
--- branches/modules/reportbug/__init__.py	2008-07-26 18:40:18 UTC (rev 588)
+++ branches/modules/reportbug/__init__.py	2008-07-26 18:40:28 UTC (rev 589)
@@ -24,9 +24,7 @@
 __all__ = ['bugreport', 'utils', 'urlutils', 'checkbuildd', 'checkversions',
            'debianbts', 'exceptions', 'submit', 'tempfile']
 
-VERSION_NUMBER = "3.44"
-if VERSION_NUMBER.startswith('#'):
-    VERSION_NUMBER = '(unreleased)'
+VERSION_NUMBER = "3.99.0"
 
 VERSION = "reportbug "+VERSION_NUMBER
 COPYRIGHT = VERSION + '\nCopyright (C) 1999-2008 Chris Lawrence <lawrencc at debian.org>'