[pkg-bacula-commits] [bacula] 01/01: Update watch file and gbp.conf to use unmodified upstream sources

[Carsten Leonhardt]

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

leo pushed a commit to branch master
in repository bacula.

commit d5467ac9da4bd4c52d2f219118e4ccafb2978c47
Author: Carsten Leonhardt <leo at debian.org>
Date:   Thu Nov 16 17:48:30 2017 +0100

    Update watch file and gbp.conf to use unmodified upstream sources
    
    The sha1.[ch] files in upstream can be considered dfsg-free now
    
    According to the outcome of the discussion on debian-legal,
    specifically this message:
    
    https://lists.debian.org/debian-legal/2017/11/msg00014.html
---
 debian/gbp.conf | 12 ++++++++----
 debian/watch    |  4 ++--
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/debian/gbp.conf b/debian/gbp.conf
index 1a412e3..e0cdc46 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -6,7 +6,11 @@ pristine-tar = True
 ### this is to remove the non-DFSG-free files from the upstream archive
 ### to import a new upstream version, use:
 ### gbp import-orig --uscan --upstream-version=<version>+dfsg
-[import-orig]
-filter = [
-       'src/lib/sha1.[ch]'
-       ]
+###
+### according to new discussions on debian-legal in 2017-11 this seems
+### to no longer be necessary
+###
+#[import-orig]
+#filter = [
+#       'src/lib/sha1.[ch]'
+#       ]
diff --git a/debian/watch b/debian/watch
index 81d42a6..28bbcaa 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,3 @@
 version=4
-opts="dversionmangle=s/[~+]dfsg//,repacksuffix=+dfsg,pgpsigurlmangle=s/$/.sig/" \
-http://sf.net/bacula/bacula-?_?([\w+\d+\.]+|\d+)\.tar\.gz debian uupdate
+opts="pgpsigurlmangle=s/$/.sig/" \
+http://sf.net/bacula/bacula-?_?([\w+\d+\.]+|\d+)\.tar\.gz

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