[DebianGIS-dev] [SCM] osmosis branch, master, updated. debian/0.31.2-2-4-gc18da20

David Paleino dapal at debian.org
Wed Mar 31 21:50:23 UTC 2010


The following commit has been merged in the master branch:
commit c18da2007b8554089e76ee9b7adecb35e79a1b8f
Author: David Paleino <dapal at debian.org>
Date:   Wed Mar 31 23:49:36 2010 +0200

    debian/rules: updated get-orig-source target to strip unwanted *.jar files

diff --git a/debian/changelog b/debian/changelog
index 19eea17..33420cf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,12 +4,14 @@ osmosis (0.31.2-3) UNRELEASED; urgency=low
   * debian/control:
     - updated my e-mail address
     - DMUA removed
+  * debian/rules:
+    - updated get-orig-source target to strip unwanted *.jar files
 
   [ Giovanni Mascellani ]
   * debian/*: updated my email address
   * debian/watch: updated to new upstream distribution location
 
- -- Giovanni Mascellani <mascellani at poisson.phc.unipi.it>  Tue, 12 Jan 2010 11:54:46 +0100
+ -- David Paleino <dapal at debian.org>  Wed, 31 Mar 2010 23:49:13 +0200
 
 osmosis (0.31.2-2) unstable; urgency=low
 
diff --git a/debian/rules b/debian/rules
index f2d0ab0..0a20e7e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -31,6 +31,7 @@ SVNBASE := http://svn.openstreetmap.org/applications/utils/osmosis/tags
 SVNREPO := ${SVNBASE}/${VERSION}
 DESTDIR := ../tarballs/osmosis-${VERSION}
 DESTTGZ := ../tarballs/osmosis_${VERSION}.orig.tar.gz
+CURVER  := $(shell dpkg-parsechangelog | grep ^Version | cut -d\  -f2 | cut -d- -f1)
 
 debian/osmosis.1: debian/osmosis.xml
 	$(XP) -o $@ $(DB2MAN) $<
@@ -42,17 +43,26 @@ clean::
 
 get-orig-source:
 	dh_testdir
-	test -d ../tarballs/. || mkdir -p ../tarballs
-	@echo Downloading osmosis from ${SVNREPO}
-	svn export ${SVNREPO} ${DESTDIR}
-	@echo Removing repo and debian directory
-	rm -rf ${DESTDIR}/repo ${DESTDIR}/debian
-	@echo Building snapshot tarball																	
-	tar czf ${DESTTGZ} -C `dirname ${DESTDIR}` `basename ${DESTDIR}`
-	@echo Cleaning up
-	rm -rf ${DESTDIR}
-	@echo .
-	@echo To update debian/changelog type
-	@echo dch -v ${VERSION}-1
-	@echo .
-
+#	test -d ../tarballs/. || mkdir -p ../tarballs
+#	@echo Downloading osmosis from ${SVNREPO}
+#	svn export ${SVNREPO} ${DESTDIR}
+#	@echo Removing repo and debian directory
+#	rm -rf ${DESTDIR}/repo ${DESTDIR}/debian
+#	@echo Building snapshot tarball																	
+#	tar czf ${DESTTGZ} -C `dirname ${DESTDIR}` `basename ${DESTDIR}`
+#	@echo Cleaning up
+#	rm -rf ${DESTDIR}
+#	@echo .
+#	@echo To update debian/changelog type
+#	@echo dch -v ${VERSION}-1
+#	@echo .
+	uscan \
+		--verbose \
+		--destdir . \
+		--force-download \
+		--download-version $(CURVER)
+	tar xvf osmosis-$(CURVER).tar.gz
+	tar zcf osmosis_$(CURVER)+ds1.orig.tar.gz \
+		--exclude *.jar \
+		osmosis-$(CURVER)/
+	rm -rf osmosis-$(CURVER).tar.gz osmosis-$(CURVER)/

-- 
Osmosis, an OSM data processor



More information about the Pkg-grass-devel mailing list