The following commit has been merged in the master branch: commit fd7812e5f1f8072b43fcbb1454cfadee6d50cefb Author: David Paleino <da...@debian.org> Date: Sat Nov 27 17:11:29 2010 +0100
Revert "debian/rules: don't install XPM versions of the icons anymore" This reverts commit 25fe9a5bb5473af50c88ec9dec6df03bafa74474. Conflicts: debian/changelog diff --git a/debian/changelog b/debian/changelog index 3c31ce7..2b8edeb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,6 @@ josm (0.0.svn3592-2) UNRELEASED; urgency=low [ David Paleino ] - * debian/rules: - - don't install XPM versions of the icons anymore * debian/icons/*.xpm updated from the logo.png image * debian/install: - install debian/icons/josm.png in /usr/share/pixmaps. josm.png diff --git a/debian/rules b/debian/rules index da49542..8f7a7ed 100755 --- a/debian/rules +++ b/debian/rules @@ -32,6 +32,8 @@ override_dh_auto_install: install -m 644 $(CURDIR)/dist/josm-custom.jar $(CURDIR)/debian/josm/usr/share/josm/josm-${DEB_UPSTREAM_VERSION}.jar dh_link usr/share/josm/josm-${DEB_UPSTREAM_VERSION}.jar usr/share/josm/josm.jar install -m 755 $(CURDIR)/debian/josm.sh $(CURDIR)/debian/josm/usr/bin/josm + install -m 644 $(CURDIR)/debian/icons/josm-16.xpm $(CURDIR)/debian/josm/usr/share/pixmaps/josm-16.xpm + 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 -- 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