Rev 238: Fix lintian warnings. in http://people.samba.org/bzr/jelmer/bzr-svn/debian

[Jelmer Vernooij]

------------------------------------------------------------
revno: 238
revision-id: jelmer at samba.org-20070116103408-10uip9m3pw0cfipi
parent: jelmer at samba.org-20070116101725-hq299tst671y22o5
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: debian
timestamp: Tue 2007-01-16 11:34:08 +0100
message:
  Fix lintian warnings.
  Support DEB_BUILD_OPTIONS=notest.
  Allow building with bzr=0.14~rc1
modified:
  debian/control                 control-20061009030331-beff4307o0ccq70i-5
  debian/rules                   rules-20061009030331-beff4307o0ccq70i-7
  upgrade.py                     upgrade.py-20070106192108-0rakplee2lzah4gs-1
=== modified file 'debian/control'
--- a/debian/control	2007-01-15 17:52:26 +0000
+++ b/debian/control	2007-01-16 10:34:08 +0000
@@ -2,13 +2,14 @@
 Section: devel
 Priority: optional
 Maintainer: Jelmer Vernooij <jelmer at samba.org>
-Build-Depends-Indep: python-subversion, bzr (>= 0.13), debhelper (>= 5.0.37.2), cdbs (>= 0.4.43), python, python-central (>= 0.5)
+Build-Depends-Indep: python-subversion, bzr (>= 0.14~rc1)
+Build-Depends: python-central (>= 0.5), cdbs (>= 0.4.43), python, debhelper (>= 5.0.37.2)
 Standards-Version: 3.7.2
 XS-Python-Version: >= 2.4
 
 Package: bzr-svn
 Architecture: all
-Depends: bzr (>= 0.13), python-subversion, ${python:Depends}
+Depends: bzr (>= 0.14~rc1), python-subversion, ${python:Depends}
 XB-Python-Version: ${python:Versions}
 Description: Bazaar plugin providing Subversion integration
  Plugin for Bazaar that adds the ability to read and commit to 

=== modified file 'debian/rules'
--- a/debian/rules	2006-10-09 03:36:44 +0000
+++ b/debian/rules	2007-01-16 10:34:08 +0000
@@ -5,9 +5,15 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/python-distutils.mk
 
+# turn DEB_BUILD_OPTIONS='foo,bar' into DEB_BUILD_OPT_FOO and DEB_BUILD_OPT_BAR
+d_b_o:=$(shell echo "$$DEB_BUILD_OPTIONS"|sed 's/[^-[:alnum:]]/ /g'|tr a-z A-Z)
+$(foreach o, $(d_b_o), $(eval DEB_BUILD_OPT_$o := 1))
+
 clean::
 	-rm -rf build test*.tmp 
 	find . -name "*.pyc" -print0 | xargs -0 rm -f
 
+ifndef DEB_BUILD_OPT_NOTEST
 common-post-build-indep::	
 	BZR_PLUGIN_PATH=build/lib/bzrlib/plugins/ bzr selftest svn
+endif

=== modified file 'upgrade.py'
--- a/upgrade.py	2007-01-15 13:34:48 +0000
+++ b/upgrade.py	2007-01-16 10:34:08 +0000
@@ -1,5 +1,3 @@
-#!/usr/bin/env python2.4
-#
 # Copyright (C) 2006 by Jelmer Vernooij
 # 
 # This program is free software; you can redistribute it and/or modify