[Reportbug-commits] r632 - in branches/manual_merge/debian (7 files)
morph-guest at users.alioth.debian.org
morph-guest at users.alioth.debian.org
Sat Aug 16 23:09:21 UTC 2008
Date: Saturday, August 16, 2008 @ 23:09:20
Author: morph-guest
Revision: 632
cherry picking debian/ dir
Added:
branches/manual_merge/debian/extract_version
branches/manual_merge/debian/python-reportbug.dirs
Modified:
branches/manual_merge/debian/changelog
branches/manual_merge/debian/control
branches/manual_merge/debian/dirs
branches/manual_merge/debian/rules
Deleted:
branches/manual_merge/debian/install-sed
Modified: branches/manual_merge/debian/changelog
===================================================================
--- branches/manual_merge/debian/changelog 2008-08-16 22:56:37 UTC (rev 631)
+++ branches/manual_merge/debian/changelog 2008-08-16 23:09:20 UTC (rev 632)
@@ -1,3 +1,10 @@
+reportbug (3.99.0) UNRELEASED; urgency=low
+
+ [ Chris Lawrence ]
+ * Split off python-reportbug into a separate package.
+
+ -- Sandro Tosi <matrixhasu at gmail.com> Sun, 17 Aug 2008 01:06:52 +0200
+
reportbug (3.45) unstable; urgency=low
* reportbuglib/reportbug_ui_urwid.py
Modified: branches/manual_merge/debian/control
===================================================================
--- branches/manual_merge/debian/control 2008-08-16 22:56:37 UTC (rev 631)
+++ branches/manual_merge/debian/control 2008-08-16 23:09:20 UTC (rev 632)
@@ -5,7 +5,7 @@
Uploaders: Sandro Tosi <matrixhasu at gmail.com>, Y Giridhar Appaji Nag <giridhar at appaji.net>, Chris Lawrence <lawrencc at debian.org>
Standards-Version: 3.8.0
Build-Depends: debhelper (>= 5.0.37.2), po4a (>= 0.23)
-Build-Depends-Indep: python, python-central (>= 0.5.14), python-nose
+Build-Depends-Indep: python-dev (>= 2.5), python-central (>= 0.5.14), python-nose, python-setuptools
XS-Python-Version: current, >= 2.5
DM-Upload-Allowed: yes
Vcs-Svn: svn://svn.debian.org/svn/reportbug/trunk/
@@ -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,18 @@
.
This package also includes the "querybts" script for browsing the
Debian bug tracking system.
+
+Package: python-reportbug
+Section: python
+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/manual_merge/debian/dirs
===================================================================
--- branches/manual_merge/debian/dirs 2008-08-16 22:56:37 UTC (rev 631)
+++ branches/manual_merge/debian/dirs 2008-08-16 23:09:20 UTC (rev 632)
@@ -1,5 +1,3 @@
etc
usr/bin
-usr/share/reportbug
-usr/share/reportbug/reportbuglib
usr/share/bug/reportbug
Added: branches/manual_merge/debian/extract_version
===================================================================
--- branches/manual_merge/debian/extract_version (rev 0)
+++ branches/manual_merge/debian/extract_version 2008-08-16 23:09:20 UTC (rev 632)
@@ -0,0 +1,2 @@
+#!/bin/sh
+head -n 1 debian/changelog | sed -e 's/[^(]*(\([^)]*\).*/\1/'
Property changes on: branches/manual_merge/debian/extract_version
___________________________________________________________________
Name: svn:executable
+ *
Deleted: branches/manual_merge/debian/install-sed
===================================================================
--- branches/manual_merge/debian/install-sed 2008-08-16 22:56:37 UTC (rev 631)
+++ branches/manual_merge/debian/install-sed 2008-08-16 23:09:20 UTC (rev 632)
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-dir=$1
-shift
-
-for filename in $@; do
- sed -f sed-script < $filename > `pwd`/debian/reportbug/$dir/$filename
-done
Added: branches/manual_merge/debian/python-reportbug.dirs
===================================================================
--- branches/manual_merge/debian/python-reportbug.dirs (rev 0)
+++ branches/manual_merge/debian/python-reportbug.dirs 2008-08-16 23:09:20 UTC (rev 632)
@@ -0,0 +1 @@
+usr/lib
Modified: branches/manual_merge/debian/rules
===================================================================
--- branches/manual_merge/debian/rules 2008-08-16 22:56:37 UTC (rev 631)
+++ branches/manual_merge/debian/rules 2008-08-16 23:09:20 UTC (rev 632)
@@ -6,13 +6,17 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
+VERSION=$(shell debian/extract_version)
+
build: build-stamp
build-stamp:
dh_testdir
- # Add here commands to compile the package.
- echo 'No make needed.'
+ # Test if versions are synchronized; this will bomb if not synced
+ @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
touch build-stamp
@@ -23,6 +27,7 @@
# Add here commands to clean up after the build process.
rm -rf `find . -name '*~' -o -name '.#*' -o -name '*.orig' -o -name '*.rej' -o -name '*.py[co]'` sed-script
+ rm -rf build
po4a --rm-translations po4a/po4a.cfg
dh_clean
@@ -34,19 +39,12 @@
dh_clean -k
dh_installdirs
- @echo "s/##VERSION##/`head -n 1 debian/changelog | sed -e 's/[^(]*(\([^)]*\).*/\1/'`/g" > sed-script
- cat sed-script
+ # Add here commands to install the package into debian/reportbug.
+ python setup.py install --root $(CURDIR)/debian/reportbug
+ mv $(CURDIR)/debian/reportbug/usr/lib $(CURDIR)/debian/python-reportbug/usr
+ chmod 0755 $(CURDIR)/debian/reportbug/usr/bin/*
+ cp -p reportbug.conf $(CURDIR)/debian/reportbug/etc
- debian/install-sed /usr/bin reportbug querybts
- debian/install-sed /usr/share/reportbug reportbuglib/*.py
- # Remove unneeded .py files
- rm -f `pwd`/debian/reportbug/usr/share/reportbug/urllib2.py
-
- chmod 0755 `pwd`/debian/reportbug/usr/bin/*
- cp handle_bugscript reportbug.el `pwd`/debian/reportbug/usr/share/reportbug
- cp -p reportbug.conf `pwd`/debian/reportbug/etc
- cp -p presubj script `pwd`/debian/reportbug/usr/share/bug/reportbug/
-
touch install-stamp
# Build architecture-dependent files here.
@@ -64,7 +62,7 @@
# dh_installemacsen
# dh_installinit
dh_installcron
- dh_installman querybts.1 reportbug.1 reportbug.fr.1 querybts.fr.1 reportbug.ja.1 reportbug.conf.5
+ dh_installman man/*
# dh_undocumented
dh_installchangelogs
dh_link
More information about the Reportbug-commits
mailing list