The following commit has been merged in the master branch:
commit 87a29cce1ae75df49b5aa5a2b8397ac110edf045
Author: Giovanni Mascellani <mascell...@poisson.phc.unipi.it>
Date:   Tue Jan 11 18:39:52 2011 +0100

    Fixed get-orig-source (the tarball returned by uscan doesn't contain 
sources).

diff --git a/debian/rules b/debian/rules
index e59eb71..9a646b2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -29,37 +29,24 @@ DEB_INSTALL_CHANGELOGS_ALL := changes.txt
 DB2MAN := /usr/share/sgml/docbook/stylesheet/xsl/nwalsh/manpages/docbook.xsl
 XP := xsltproc -''-nonet -''-param man.charmap.use.subset "0"
 
+CURVER  := $(shell dpkg-parsechangelog | grep ^Version | cut -d\  -f2 | cut 
-d- -f1 | cut -d+ -f1)
 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)
+SVNREPO := ${SVNBASE}/${CURVER}
+DESTDIR := ../tarballs/osmosis-${CURVER}
+DESTTGZ := ../tarballs/osmosis_${CURVER}+ds1.orig.tar.gz
 
 debian/osmosis.1: debian/osmosis.xml
        $(XP) -o $@ $(DB2MAN) $<
 
 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 .
-       uscan \
-               --verbose \
-               --destdir . \
-               --force-download \
-               --download-version $(CURVER)
-       tar xvf osmosis-$(CURVER).tgz
-       tar zcf osmosis_$(CURVER)+ds1.orig.tar.gz \
-               --exclude *.jar \
-               osmosis-$(CURVER)/
-       rm -rf osmosis-$(CURVER).tgz osmosis-$(CURVER)/
+       test -d ../tarballs/. || mkdir -p ../tarballs
+       @echo Downloading osmosis from ${SVNREPO}
+       svn export ${SVNREPO} ${DESTDIR}
+       @echo Removing build-support/repo and debian directory
+       rm -rf ${DESTDIR}/build-support/repo ${DESTDIR}/debian
+       @echo Building snapshot tarball                                         
                                                                                
        
+       tar czf ${DESTTGZ} -C `dirname ${DESTDIR}` `basename ${DESTDIR}`
+       @echo Cleaning up
+       rm -rf ${DESTDIR}
+

-- 
Osmosis, an OSM data processor

_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel

Reply via email to