Bug#916468: whitedune: diff for NMU version 0.30.10-2.2

[Paul Gevers]

tags 916468 + patch
tags 916468 + pending

Dear maintainer,

I've prepared an NMU for whitedune (versioned as 0.30.10-2.2) and
uploaded it to DELAYED/10. Please feel free to tell me if I should delay
it longer. I have based my NMU on top of what is currently in the salsa
archive, so it includes a bit more than needed to fix this bug.

Regards.
Paul
-------------- next part --------------
diff -Nru whitedune-0.30.10/debian/changelog whitedune-0.30.10/debian/changelog
--- whitedune-0.30.10/debian/changelog	2016-03-07 17:19:38.000000000 +0100
+++ whitedune-0.30.10/debian/changelog	2019-01-15 20:45:29.000000000 +0100
@@ -1,3 +1,24 @@
+whitedune (0.30.10-2.2) unstable; urgency=medium
+
+  * Non-maintainer upload.
+
+  [ Johannes Brandstätter ]
+  * Update watch file to new upstream release page
+
+  [ Ondřej Nový ]
+  * d/control: Set Vcs-* to salsa.debian.org
+
+  [ Felipe Sateler ]
+  * Change maintainer address to debian-multimedia at lists.debian.org
+
+  [ Ondřej Nový ]
+  * d/rules: Remove trailing whitespaces
+
+  [ Paul Gevers ]
+  * Drop /usr/bin/dune softlink (Closes: #916468)
+
+ -- Paul Gevers <elbrus at debian.org>  Tue, 15 Jan 2019 20:45:29 +0100
+
 whitedune (0.30.10-2.1) unstable; urgency=medium
 
   * Non-maintainer upload.
diff -Nru whitedune-0.30.10/debian/control whitedune-0.30.10/debian/control
--- whitedune-0.30.10/debian/control	2016-01-09 21:12:53.000000000 +0100
+++ whitedune-0.30.10/debian/control	2019-01-15 20:45:29.000000000 +0100
@@ -1,7 +1,7 @@
 Source: whitedune
 Section: graphics
 Priority: optional
-Maintainer: Debian Multimedia Maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
+Maintainer: Debian Multimedia Maintainers <debian-multimedia at lists.debian.org>
 Uploaders: Philippe Coval <rzr at gna.org>
 Build-Depends:
  autoconf,
@@ -20,8 +20,8 @@
  x11proto-core-dev
 Standards-Version: 3.9.6
 Homepage: http://vrml.cip.ica.uni-stuttgart.de/dune/
-Vcs-Git: git://anonscm.debian.org/pkg-multimedia/whitedune.git
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-multimedia/whitedune.git
+Vcs-Git: https://salsa.debian.org/multimedia-team/whitedune.git
+Vcs-Browser: https://salsa.debian.org/multimedia-team/whitedune
 
 Package: whitedune
 Architecture: any
diff -Nru whitedune-0.30.10/debian/NEWS whitedune-0.30.10/debian/NEWS
--- whitedune-0.30.10/debian/NEWS	1970-01-01 01:00:00.000000000 +0100
+++ whitedune-0.30.10/debian/NEWS	2019-01-15 20:45:29.000000000 +0100
@@ -0,0 +1,6 @@
+whitedune (0.30.10-2.2) unstable; urgency=medium
+
+  The /usr/bin/dune softlink was dropped because there was a namespace
+    clash.
+
+ -- Paul Gevers <elbrus at debian.org>  Tue, 15 Jan 2019 20:42:23 +0100
diff -Nru whitedune-0.30.10/debian/rules whitedune-0.30.10/debian/rules
--- whitedune-0.30.10/debian/rules	2016-01-09 21:44:44.000000000 +0100
+++ whitedune-0.30.10/debian/rules	2019-01-15 20:45:29.000000000 +0100
@@ -113,6 +113,6 @@
 	dh_builddeb -a
 
 binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install 
+.PHONY: build clean binary-indep binary-arch binary install
 
 #eof "$Id: rules -- rzr $"
diff -Nru whitedune-0.30.10/debian/watch whitedune-0.30.10/debian/watch
--- whitedune-0.30.10/debian/watch	2016-01-09 16:22:17.000000000 +0100
+++ whitedune-0.30.10/debian/watch	2019-01-15 20:45:29.000000000 +0100
@@ -1,3 +1,3 @@
 version=3
-http://vrml.cip.ica.uni-stuttgart.de/dune/down.html \
-  http://129.69.35.12/dune/white_dune-(\d*\.\d*pl\d*)\.tar\.gz
+http://wdune.ourproject.org/ \
+  ftp://ftp.ourproject.org/pub/wdune/wdune-(\d*\.\d*pl\d*)\.tar\.bz2
diff -Nru whitedune-0.30.10/debian/whitedune.links whitedune-0.30.10/debian/whitedune.links
--- whitedune-0.30.10/debian/whitedune.links	2016-01-09 16:40:49.000000000 +0100
+++ whitedune-0.30.10/debian/whitedune.links	1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-/usr/bin/whitedune /usr/bin/dune
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 488 bytes
Desc: OpenPGP digital signature
URL: <http://alioth-lists.debian.net/pipermail/pkg-multimedia-maintainers/attachments/20190115/d5b5d50e/attachment-0001.sig>