The following commit has been merged in the master branch: commit 3606e771ee8f198d2872eeac2ee47d67c42bd482 Author: David Paleino <da...@debian.org> Date: Wed Oct 6 10:24:47 2010 +0200
Revert "debian/rules, debian/control.in: handle distro-specific Build-Depends, so that this same source package can build on Maverick." This reverts commit e8c9402c7500a1169a1695122ac71d9e949e1704. diff --git a/debian/changelog b/debian/changelog index 6fcfb60..41bce61 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,10 +3,8 @@ 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 <da...@debian.org> Wed, 06 Oct 2010 09:43:43 +0200 + -- David Paleino <da...@debian.org> Sun, 03 Oct 2010 11:37:39 +0200 josm (0.0.svn3514-1) unstable; urgency=low diff --git a/debian/control b/debian/control index dd955f1..c22e196 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.in b/debian/control.in deleted file mode 100644 index 86b61a7..0000000 --- a/debian/control.in +++ /dev/null @@ -1,47 +0,0 @@ -Source: josm -Section: utils -Priority: extra -Maintainer: Debian GIS Project <pkg-grass-devel@lists.alioth.debian.org> -Uploaders: - Andreas Putzo <andr...@putzo.net>, - Giovanni Mascellani <g...@debian.org>, - Petter Reinholdtsen <p...@debian.org>, - David Paleino <da...@debian.org>, - Debian OpenStreetMap Team <pkg-osm-ma...@lists.alioth.debian.org> -DM-Upload-Allowed: yes -Build-Depends: - ant, - debhelper (>= 7.0.50~), - gettext, - 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 -Vcs-Browser: http://git.debian.org/?p=pkg-grass/josm.git - -Package: josm -Architecture: all -Depends: - openjdk-6-jre | sun-java6-jre, - libgettext-commons-java (>= 0.9.6), - libmetadata-extractor-java, - liboauth-signpost-java (>= 1.2), - openstreetmap-map-icons-classic, - ${misc:Depends} -Recommends: josm-plugins -Description: Editor for OpenStreetMap - JOSM is an editor for OpenStreetMap (OSM) written in Java. - The current version supports stand alone GPX tracks, GPX track data - from OSM database and existing nodes, line segments and metadata tags - from the OSM database. - . - OpenStreetMap is a project aimed squarely at creating and providing - free geographic data such as street maps to anyone who wants them. - The project was started because most maps you think of as free actually - have legal or technical restrictions on their use, holding back people - from using them in creative, productive or unexpected ways. diff --git a/debian/rules b/debian/rules index e315c71..8f7a7ed 100755 --- a/debian/rules +++ b/debian/rules @@ -21,12 +21,6 @@ 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 $@ @@ -42,13 +36,6 @@ 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 _______________________________________________ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel