[jts] 08/23: Repack the upstream releases using uscan + Files-Excluded.

[Sebastiaan Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository jts.

commit 1028ca0bae2a46dc6109b5e5b401d0e0b8687fef
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Tue Aug 4 23:30:54 2015 +0200

    Repack the upstream releases using uscan + Files-Excluded.
---
 debian/README.source | 23 +++++++++++------------
 debian/changelog     |  1 +
 debian/copyright     |  4 ++++
 debian/rules         | 20 --------------------
 debian/watch         |  3 ++-
 5 files changed, 18 insertions(+), 33 deletions(-)

diff --git a/debian/README.source b/debian/README.source
index 18727b4..8b22c32 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -1,17 +1,16 @@
-jts for Debian
+JTS for Debian
 --------------
 
-The dfsg source can be downloaded and built by running:
+The upstream source can be downloaded and repacked by running:
 
-debian/rules create-orig-tar
+ uscan --verbose --force-download
 
-This rule creates the final original tarball, with various cleanups
-and move it under ../tarballs. Note that it does not include an ANT
-build.xml, it needs to be taken from the project CVS and adapted.
-Also note that the original upstream stuff provides pre-built .jar
-files for JTS and its pre-dependencies, and Javadoc compiled doc.
-At every new release I found one or more issues in rebuilding
-from scratch the whole stuff, so be warned and consult the 
-development mailing list.
+The repacked upstream tarball excludes pre-built documentation, and
+the jars for the bundled dependencies.
+
+The upstream sources don't include an ANT build.xml, it needs to be
+taken from the project VCS repository and adapted.
+
+Every new release tends to have one or more issues with building
+from scratch, so be warned and consult the development mailing list.
 
- -- Francesco Paolo Lovergine <frankie at debian.org>, Thu Sep 24 12:04:25 CEST 2009
diff --git a/debian/changelog b/debian/changelog
index a37c7eb..76b738f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ jts (1.11-2) UNRELEASED; urgency=medium
   * Update copyright file using copyright-format 1.0.
   * Add watch file using sf.net redirector.
   * Don't install extra license file in libjts-java-doc.
+  * Repack the upstream releases using uscan + Files-Excluded.
 
  -- Bas Couwenberg <sebastic at debian.org>  Tue, 04 Aug 2015 19:27:19 +0200
 
diff --git a/debian/copyright b/debian/copyright
index 89e1926..00eb23c 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,6 +2,10 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: JTS Topology Suite
 Upstream-Contact: jts-topo-suite-user at lists.sourceforge.net
 Source: http://downloads.sourceforge.net/project/jts-topo-suite/jts/
+ Pre-built documentation and libraries are excluded from the upstream tarball.
+Files-Excluded: doc/javadoc/*
+ doc/*.pdf
+ lib/*
 
 Files: *
 Copyright: 2001, Vivid Solutions
diff --git a/debian/rules b/debian/rules
index 76334b0..cf65247 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,23 +18,3 @@ install/libjts-java::
 	install -m 644 target/jts.jar debian/libjts-java/usr/share/java/jts-$(UPSTREAM_VERSION).jar
 	ln -s jts-$(UPSTREAM_VERSION).jar debian/libjts-java/usr/share/java/jts.jar
 
-#
-# Custom rule to create a clean tarball
-#
-
-download-upstream:
-	-mkdir $(CURDIR)/upstream
-	wget -O $(CURDIR)/upstream/jts-$(UPSTREAM_VERSION).zip \
-		http://downloads.sourceforge.net/project/jts-topo-suite/jts/$(UPSTREAM_VERSION)/jts-$(UPSTREAM_VERSION).zip?use_mirror=garr
-
-create-orig-tar: download-upstream
-	cd $(CURDIR)/upstream && unzip -u -d jts-$(UPSTREAM_VERSION) jts-$(UPSTREAM_VERSION).zip && \
-		rm -rf jts-$(UPSTREAM_VERSION)/lib && rm -rf jts-$(UPSTREAM_VERSION)/doc/javadoc && \
-		find jts-$(UPSTREAM_VERSION)/doc -name "*.pdf" -delete && \
-		tar czvf jts_$(UPSTREAM_VERSION).orig.tar.gz jts-$(UPSTREAM_VERSION) && \
-		rm -rf jts-$(UPSTREAM_VERSION) jts-$(UPSTREAM_VERSION).zip
-		-mkdir $(CURDIR)/../tarballs
-		mv $(CURDIR)/upstream/jts_$(UPSTREAM_VERSION).orig.tar.gz $(CURDIR)/../tarballs/.
-		rmdir $(CURDIR)/upstream
-
-.PHONY: download-upstream create-orig-tar
diff --git a/debian/watch b/debian/watch
index 2c65d97..b815643 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,6 +1,7 @@
 version=3
 opts=\
 dversionmangle=s/\+(debian|dfsg|ds|deb)\d*$//,\
-uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha)\d*)$/$1~$2/;s/RC/rc/ \
+uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha)\d*)$/$1~$2/;s/RC/rc/,\
+repacksuffix=+ds \
 http://sf.net/jts-topo-suite/ \
 (?:.*?/)?jts[_\.\-\+]?(\d\S+)\.(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/jts.git