[DebianGIS-dev] [SCM] josm branch, master, updated. debian/0.0.svn3514-2

[David Paleino]

The following commit has been merged in the master branch:
commit e8c9402c7500a1169a1695122ac71d9e949e1704
Author: David Paleino <dapal at debian.org>
Date:   Wed Oct 6 09:44:15 2010 +0200

    debian/rules, debian/control.in: handle distro-specific Build-Depends, so that this same source package can build on Maverick.

diff --git a/debian/changelog b/debian/changelog
index 41bce61..6fcfb60 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,10 @@ josm (0.0.svn3514-2) UNRELEASED; urgency=low
   * debian/patches/90-fix_version.patch added, fix inconsistency
     between code and upstream website. Thanks to Mario Izquierdo
     (Closes: #598920)
+  * debian/rules, debian/control.in: handle distro-specific Build-Depends,
+    so that this same source package can build on Maverick.
 
- -- David Paleino <dapal at debian.org>  Sun, 03 Oct 2010 11:37:39 +0200
+ -- David Paleino <dapal at debian.org>  Wed, 06 Oct 2010 09:43:43 +0200
 
 josm (0.0.svn3514-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index c22e196..dd955f1 100644
--- a/debian/control
+++ b/debian/control
@@ -13,12 +13,12 @@ Build-Depends:
  ant,
  debhelper (>= 7.0.50~),
  gettext,
- default-jdk (>= 1:1.6),
  libgettext-commons-java (>= 0.9.6),
  libmetadata-extractor-java,
  libgettext-ant-tasks-java,
  libterm-readkey-perl
  , liboauth-signpost-java (>= 1.2)
+ , default-jdk (>= 1:1.6)
 Standards-Version: 3.9.1
 Homepage: http://josm.openstreetmap.de
 Vcs-Git: git://git.debian.org/pkg-grass/josm.git
diff --git a/debian/control b/debian/control.in
similarity index 98%
copy from debian/control
copy to debian/control.in
index c22e196..86b61a7 100644
--- a/debian/control
+++ b/debian/control.in
@@ -13,12 +13,12 @@ Build-Depends:
  ant,
  debhelper (>= 7.0.50~),
  gettext,
- default-jdk (>= 1:1.6),
  libgettext-commons-java (>= 0.9.6),
  libmetadata-extractor-java,
  libgettext-ant-tasks-java,
  libterm-readkey-perl
  , liboauth-signpost-java (>= 1.2)
+ , %distro_build_depends%
 Standards-Version: 3.9.1
 Homepage: http://josm.openstreetmap.de
 Vcs-Git: git://git.debian.org/pkg-grass/josm.git
diff --git a/debian/rules b/debian/rules
index 8f7a7ed..e315c71 100755
--- a/debian/rules
+++ b/debian/rules
@@ -21,6 +21,12 @@ DEB_UPSTREAM_VERSION := $(shell echo $(DEB_VERSION) | cut -d- -f1)
 # Docs are already included in the jar file and can be accessed from within josm.
 #DEB_INSTALL_DOCS_ALL :=
 
+ifeq ($(shell dpkg-vendor --derives-from Ubuntu && echo yes),yes)
+	BUILDDEPENDS=default-jdk (>= 1.6)
+else
+	BUILDDEPENDS=default-jdk (>= 1:1.6)
+endif
+
 %:
 	dh $@
 
@@ -36,6 +42,13 @@ override_dh_auto_install:
 	install -m 644 $(CURDIR)/debian/icons/josm-32.xpm $(CURDIR)/debian/josm/usr/share/pixmaps/josm-32.xpm
 	install -m 644 $(CURDIR)/debian/josm.desktop $(CURDIR)/debian/josm/usr/share/applications/josm.desktop
 
+override_dh_clean:
+	dh_clean
+
+	# handle distro-specific Build-Depends
+	sed -e "s/%distro_build_depends%/$(BUILDDEPENDS)/" \
+		debian/control.in > debian/control
+
 
 get-orig-source:
 	dh_testdir

-- 
Java OpenStreetMap editor