[DRE-commits] [librarian-puppet] 02/07: Use Files-Excluded in debian/copyright

[Stig Sandbeck Mathisen]

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

ssm pushed a commit to branch master
in repository librarian-puppet.

commit 4e40b1a9736afbde86da3dbc93e00637032d703c
Author: Stig Sandbeck Mathisen <ssm at debian.org>
Date:   Thu Dec 12 09:30:22 2013 +0100

    Use Files-Excluded in debian/copyright
    
     - An import of the original source without reading debian/README.source
       would include vendored gems as well.
    
     - Now that uscan reads Files-Excluded from debian/copyright, it is
       better to use thaa, and filter during download.
    
     - The version extension will change. uscan has the extension "+dfsg"
       hardcoded for changed source tarballs, while "+ds" has been used
       previously.
---
 debian/README.source | 18 ------------------
 debian/copyright     |  3 +++
 debian/watch         |  2 +-
 3 files changed, 4 insertions(+), 19 deletions(-)

diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index 8c1939c..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,18 +0,0 @@
-The orig tarball has been changed from the upstream release.
-
-The upstream source tarball contains vendored gems and libraries, which has
-been removed before packaging.
-
- - The "vendor" directory was removed
- - The metadata.yml file was edited to reflect the removed vendor directory
- - a +ds suffix was added to the upstream version
-
-Until "git import-orig" can use repackage scripts with uscan,
-(http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=635920), the following is
-used:
-
- - git import-orig is run with:
-   "--pristine-tar --filter=vendor --filter-pristine-tar" options.
-
- - medatata.yml is edited with:
-   sed -i '/^files:/,/^[[:alnum:]]*:/ {/^- vendor\//d}' metadata.yml
diff --git a/debian/copyright b/debian/copyright
index 46176b2..80b90fb 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,6 +1,9 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: librarian-puppet
 Source: https://github.com/rodjek/librarian-puppet
+Files-Excluded:
+ vendor/*
+ .gitignore
 
 Files: *
 Copyright: 2012 Tim Sharpe
diff --git a/debian/watch b/debian/watch
index 704bb73..8a3317f 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,3 @@
 version=3
-opts=dversionmangle=s/\+ds$// \
+opts=dversionmangle=s/\+(?:ds|dfsg)$// \
 http://pkg-ruby-extras.alioth.debian.org/cgi-bin/gemwatch/librarian-puppet .*/librarian-puppet-(.*).tar.gz

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/librarian-puppet.git