[DebianGIS-dev] r1170 - packages/josm/trunk/debian

[nd-guest at alioth.debian.org]

Author: nd-guest
Date: 2007-10-05 20:34:59 +0000 (Fri, 05 Oct 2007)
New Revision: 1170

Modified:
   packages/josm/trunk/debian/changelog
   packages/josm/trunk/debian/copyright
   packages/josm/trunk/debian/rules
Log:
- Switch to josm branch for osm api 0.5
- Removed josm version number which was nonsense.


Modified: packages/josm/trunk/debian/changelog
===================================================================
--- packages/josm/trunk/debian/changelog	2007-10-05 13:55:48 UTC (rev 1169)
+++ packages/josm/trunk/debian/changelog	2007-10-05 20:34:59 UTC (rev 1170)
@@ -1,7 +1,5 @@
-josm (1.6~svn320-1) UNRELEASED; urgency=low
+josm (0.0.0.20071005-1) UNRELEASED; urgency=low
 
   * Initial release (Closes: #385371)
 
- -- Andreas Putzo <andreas at putzo.net>  Tue, 04 Sep 2007 17:55:44 +0000
-
-
+ -- Andreas Putzo <andreas at putzo.net>  Fri, 05 Oct 2007 20:29:10 +0000

Modified: packages/josm/trunk/debian/copyright
===================================================================
--- packages/josm/trunk/debian/copyright	2007-10-05 13:55:48 UTC (rev 1169)
+++ packages/josm/trunk/debian/copyright	2007-10-05 20:34:59 UTC (rev 1170)
@@ -1,7 +1,7 @@
 This package was debianized by Andreas Putzo <andreas at putzo.net> on
 Mon, 04 Sep 2007 12:16:50 +0200.
 
-It was downloaded using the command svn export http://josm.openstreetmap.de/svn.
+It was downloaded using the command svn export http://josm.openstreetmap.de/svn/branch/0.5/.
 All .jar files have been removed.
 All files in the data/ directory have been removed because they contain (large) test data that
 is not used by the program.

Modified: packages/josm/trunk/debian/rules
===================================================================
--- packages/josm/trunk/debian/rules	2007-10-05 13:55:48 UTC (rev 1169)
+++ packages/josm/trunk/debian/rules	2007-10-05 20:34:59 UTC (rev 1170)
@@ -14,32 +14,35 @@
 # Docs are already included in the jar file and can be accessed from within josm.
 DEB_INSTALL_DOCS_ALL :=
 
-DEB_UPSTREAM_VERSION := 1.6
-SVNREPO := http://josm.openstreetmap.de/svn
-SVNREV := 320
+SVNREPO := http://josm.openstreetmap.de/svn/branch/0.5
+DATE := $(shell date +%Y%m%d)
 
-clean::
+clean/josm::
 	dh_clean $(CURDIR)/REVISION
 
 configure/josm::
 	echo Revision: ${DEB_VERSION} > $(CURDIR)/REVISION
 
 install/josm::
-	install -m 644 $(CURDIR)/dist/josm-custom.jar $(CURDIR)/debian/josm/usr/share/josm/josm-${DEB_UPSTREAM_VERSION}~svn${SVNREV}.jar
-	dh_link usr/share/josm/josm-${DEB_UPSTREAM_VERSION}~svn${SVNREV}.jar usr/share/josm/josm.jar
+	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
 
-get-orig-source::
+get-orig-source:
 	dh_testdir
 	test -d ../tarballs/. || mkdir -p ../tarballs
-	echo Downloading ${SVNREV} from ${SVNREPO}
-	svn export -r ${SVNREV} ${SVNREPO} ../tarballs/josm-${DEB_UPSTREAM_VERSION}~svn${SVNREV}
-	echo Removing jar files and test data
-	find ../tarballs/josm-${DEB_UPSTREAM_VERSION}~svn${SVNREV} -name "*.jar" -exec rm {} \;
-	rm -f ../tarballs/josm-${DEB_UPSTREAM_VERSION}~svn${SVNREV}/data/*
-	echo Building snapshot tarball																	
-	tar czf ../tarballs/josm_${DEB_UPSTREAM_VERSION}~svn${SVNREV}.orig.tar.gz -C ../tarballs josm-${DEB_UPSTREAM_VERSION}~svn${SVNREV}
-	echo Cleaning up
-	rm -rf ../tarballs/josm-${DEB_UPSTREAM_VERSION}~svn${SVNREV}
+	@echo Downloading josm from ${SVNREPO}
+	svn export ${SVNREPO} ../tarballs/josm-0.0.0.${DATE}
+	@echo Removing jar files and test data
+	find ../tarballs/josm-0.0.0.${DATE} -name "*.jar" -exec rm {} \;
+	rm -f ../tarballs/josm-0.0.0.${DATE}/data/*
+	@echo Building snapshot tarball																	
+	tar czf ../tarballs/josm_0.0.0.${DATE}.orig.tar.gz -C ../tarballs josm-0.0.0.${DATE}
+	@echo Cleaning up
+	rm -rf ../tarballs/josm-0.0.0.${DATE}
+	@echo .
+	@echo To update debian/changelog type
+	@echo dch -v 0.0.0.${DATE}-1
+	@echo .