Rev 19: Use bzr-builddeb. in file:///home/jelmer/bzr-hg/debian/

Jelmer Vernooij jelmer at samba.org
Sat Jan 20 22:35:40 GMT 2007


------------------------------------------------------------
revno: 19
revision-id: jelmer at samba.org-20070120223442-09q77gqd8dyji3h0
parent: jelmer at samba.org-20070120222939-4rb8p1epuphhdjq7
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: debian
timestamp: Sat 2007-01-20 23:34:42 +0100
message:
  Use bzr-builddeb.
  Support DEB_BUILD_OPTIONS=notest
  Update requirements for bzr and mercurial versions.
added:
  .bzr-builddeb/                 bzrbuilddeb-20070120223427-s470qshv8eubbd70-1
  .bzr-builddeb/default.conf     default.conf-20070120223427-s470qshv8eubbd70-2
modified:
  debian/changelog               changelog-20061014151307-5rtlle5xj25pk1vs-2
  debian/control                 control-20061014151307-5rtlle5xj25pk1vs-4
  debian/rules                   rules-20061014151307-5rtlle5xj25pk1vs-7
=== added directory '.bzr-builddeb'
=== added file '.bzr-builddeb/default.conf'
--- a/.bzr-builddeb/default.conf	1970-01-01 00:00:00 +0000
+++ b/.bzr-builddeb/default.conf	2007-01-20 22:34:42 +0000
@@ -0,0 +1,3 @@
+[BUILDDEB]
+merge = True
+export-upstream = http://launchpad.net/bzr-hg

=== modified file 'debian/changelog'
--- a/debian/changelog	2006-10-14 15:14:18 +0000
+++ b/debian/changelog	2007-01-20 22:34:42 +0000
@@ -1,5 +1,5 @@
 bzr-hg (0.1-0ubuntu1) unstable; urgency=low
 
-  * Initial revision.
+  * Initial release.
 
- -- Jelmer Vernooij <jelmer at samba.org>  Sat,  14 Oct 2006 17:46:03 +0200
+ -- Jelmer Vernooij <jelmer at samba.org>  Sat, 14 Oct 2006 17:46:03 +0200

=== modified file 'debian/control'
--- a/debian/control	2006-10-14 15:14:18 +0000
+++ b/debian/control	2007-01-20 22:34:42 +0000
@@ -3,17 +3,17 @@
 Priority: optional
 Maintainer: Jelmer Vernooij <jelmer at samba.org>
 Build-Depends: debhelper (>= 5.0.37.2), cdbs (>= 0.4.43), python, python-central (>= 0.5)
-Build-Depends-Indep: mercurial (>= 0.9), bzr
+Build-Depends-Indep: mercurial (>= 0.9.3), bzr (>= 0.13)
 Standards-Version: 3.7.2
 XS-Python-Version: all
 
 Package: bzr-hg
 Architecture: all
-Depends: bzr, mercurial (>= 0.9), ${python:Depends}
-Recommends: bzr-gtk
+Depends: bzr (>= 0.9.3), mercurial (>= 0.9.3), ${python:Depends}
+Suggests: bzr-gtk
 XB-Python-Version: ${python:Versions}
 Description: Bazaar plugin providing Mercurial integration
  Plugin for Bazaar that adds the ability to partially read Mercurial branches.
  .
- This support is currently sufficient for running bzrk against 
+ This support is sufficient for running bzrk against 
  mercurial branches.

=== modified file 'debian/rules'
--- a/debian/rules	2006-10-14 15:14:18 +0000
+++ b/debian/rules	2007-01-20 22:34:42 +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 hg
+endif




More information about the bazaar-commits mailing list