[Git][debian-gis-team/jmapviewer][master] Document repacking in copyright file, drop obsolete README.source & get-orig-source target.

[Bas Couwenberg]

Bas Couwenberg pushed to branch master at Debian GIS Project / jmapviewer


Commits:
10bd5611 by Bas Couwenberg at 2018-04-28T16:31:35+02:00
Document repacking in copyright file, drop obsolete README.source & get-orig-source target.

- - - - -


4 changed files:

- − debian/README.source
- debian/changelog
- debian/copyright
- debian/rules


Changes:

=====================================
debian/README.source deleted
=====================================
--- a/debian/README.source
+++ /dev/null
@@ -1,9 +0,0 @@
-JMapViewer-1.0-Source.tar.gz is generated by 'get-orig-source' target.
-
-+dfsg1 suffix has been added because bing_maps.png shall be removed at import:
-  gbp import-orig --filter bing_maps.png --filter-pristine-tar --pristine-tar -u1.0+dfsg1 \
-      ../JMapViewer-1.0-Source.tar.gz
-
-As an alternative, you can use the result of uscan (get-orig-source target),
-which is also configured for removal of bing_maps.png (by means of Files-Excluded:
-in debian/copyright).
\ No newline at end of file


=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ jmapviewer (2.7+dfsg-2) UNRELEASED; urgency=medium
   * Update Vcs-* URLs for Salsa.
   * Drop override for vcs-deprecated-in-debian-infrastructure.
   * Bump Standards-Version to 4.1.4, no changes.
+  * Document repacking in copyright file, drop obsolete README.source &
+    get-orig-source target.
 
  -- Bas Couwenberg <sebastic at debian.org>  Sat, 31 Mar 2018 12:02:08 +0200
 


=====================================
debian/copyright
=====================================
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,6 +1,8 @@
 Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: JMapViewer
 Source: https://svn.openstreetmap.org/applications/viewer/jmapviewer
+Comment: The upstream source is repacked to exclude the Bing logo which is
+ non-free, see: https://lists.debian.org/debian-gis/2014/10/msg00147.html
 Files-Excluded: src/org/openstreetmap/gui/jmapviewer/images/bing_maps.png
 
 Files: *


=====================================
debian/rules
=====================================
--- a/debian/rules
+++ b/debian/rules
@@ -33,6 +33,3 @@ override_dh_auto_install:
 	install -m 644 $(CURDIR)/JMapViewer_Demo.jar $(CURDIR)/debian/jmapviewer/usr/share/jmapviewer/JMapViewer_Demo.jar
 	install -m 755 $(CURDIR)/debian/jmapviewer_demo.sh $(CURDIR)/debian/jmapviewer/usr/bin/jmapviewer
 
-get-orig-source:
-	uscan --verbose --force-download --repack --compress xz --destdir ..
-



View it on GitLab: https://salsa.debian.org/debian-gis-team/jmapviewer/commit/10bd561189fb0d1604377b0d08c64ba972e6f5ff

---
View it on GitLab: https://salsa.debian.org/debian-gis-team/jmapviewer/commit/10bd561189fb0d1604377b0d08c64ba972e6f5ff
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20180428/d51cdd60/attachment-0001.html>