[svgsalamander] 01/06: fix license short name, add watch file, use Files-Excluded:

Felix Natter fnatter-guest at moszumanska.debian.org
Sat Jul 30 09:36:06 UTC 2016


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

fnatter-guest pushed a commit to branch master
in repository svgsalamander.

commit fa9b86a3ff5431402d3a6cb594f9f287767e0126
Author: Felix Natter <fnatter at gmx.net>
Date:   Sat Jul 30 11:19:36 2016 +0200

    fix license short name, add watch file, use Files-Excluded:
---
 debian/copyright | 18 +++++++++++++-----
 debian/rules     | 16 ++--------------
 debian/watch     |  3 +++
 3 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index 8d67d0d..8d5abaa 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,14 +1,22 @@
-Format: http://dep.debian.net/deps/dep5
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: svgsalamander
-Source: <http://svgsalamander.java.net/>
+Source: https://github.com/blackears/svgSalamander
+Upstream-Contact: Mark McKay <mark at kitfox.com>
+Files-Excluded: libraries/*.jar
+                libraries/*.zip
+                java-one-2007/*
+                svg-core/src/main/java/com/kitfox/svg/batik/*
+                www/binaries/*
+                doc/dev/GetTRDoc.pdf
 
 Files: *
 Copyright: 2010, Mark McKay <mark at kitfox.com>
-License: LGPL-2.0 or BSD
+License: LGPL-2.0 or BSD-3-clause
 
 Files: debian/*
 Copyright: 2011 Nicolas Dandrimont <nicolas.dandrimont at crans.org>
-License: BSD
+           2016 Felix Natter <fnatter at gmx.net>
+License: BSD-3-clause
 
 License: LGPL-2.0
  This package is free software; you can redistribute it and/or
@@ -27,7 +35,7 @@ License: LGPL-2.0
  On Debian systems, the complete text of the GNU Lesser General
  Public License can be found in "/usr/share/common-licenses/LGPL-2".
 
-License: BSD
+License: BSD-3-clause
  All rights reserved.
  .
  Redistribution and use in source and binary forms, with or without
diff --git a/debian/rules b/debian/rules
index ba36eec..9f07395 100755
--- a/debian/rules
+++ b/debian/rules
@@ -29,18 +29,6 @@ override_dh_clean:
 	dh_clean
 
 .PHONY: get-orig-source
+
 get-orig-source:
-	rm -rf get-orig-source $(TARBALL)
-	mkdir get-orig-source
-	svn export -r $(SVN_REVISION) https://svn.java.net/svn/svgsalamander~svn/trunk \
-	get-orig-source/$(PACKAGE)-$(SRC_VERSION).orig
-	find get-orig-source/ -name *.jar -delete
-	find get-orig-source/ -name *.zip -delete
-
-	# Strip old sourceless stuff :
-	rm get-orig-source/$(PACKAGE)-$(SRC_VERSION).orig/doc/dev/GetTRDoc.pdf
-	rm -r get-orig-source/$(PACKAGE)-$(SRC_VERSION).orig/svg-core/src/main/java/com/kitfox/svg/batik
-
-	GZIP='--best --no-name' tar czf $(TARBALL) -C get-orig-source $(PACKAGE)-$(SRC_VERSION).orig
-	rm -rf get-orig-source
-	echo "  "$(TARBALL)" created; move it to the right destination to build the package"
+	uscan --force-download --rename --repack
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 0000000..5c8f258
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,3 @@
+version=4
+opts=filenamemangle=s#.*/v(.*)#svgsalamander-$1#,dversionmangle=s/\+dfsg\d// \
+https://github.com/blackears/svgSalamander/releases/ .*/(?:.*?)([\d\.]+)\.tar\.gz
\ No newline at end of file

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



More information about the pkg-java-commits mailing list