[DRE-commits] [ruby-distribution] 01/02: use Files-Excluded: to filter non-dfsg files

[Cédric Boutillier]

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

boutil pushed a commit to branch master
in repository ruby-distribution.

commit 1e23403874eed83d9dd718069136070fcb6c7321
Author: Cédric Boutillier <boutil at debian.org>
Date:   Sun Aug 24 10:02:46 2014 +0200

    use Files-Excluded: to filter non-dfsg files
---
 debian/README.source | 7 +++----
 debian/copyright     | 1 +
 debian/gbp.conf      | 6 +++---
 debian/watch         | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/debian/README.source b/debian/README.source
index 0cc5e52..5bc11a6 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -3,9 +3,8 @@ This package uses the Debian 3.0 (quilt) source package format.
 The upstream tarball has been repacked to remove the compiled
 Java archive vendor/java/commons-math-2.2.jar.
 
-The removal has been done with git-buildpackage, during the import
-of the upstream tarball via git import-orig command and its filter
-option (see debian/gbp.conf).
+The removal has been done with uscan, using the Files-Excluded: field
+in debian/copyright.
 
 Cédric Boutillier
-Last Update: 2012-12-11
+Last Update: 2014-08-24
diff --git a/debian/copyright b/debian/copyright
index 408ed51..ff9b76e 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,6 +1,7 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: distribution
 Source: https://github.com/clbustos/distribution
+Files-Excluded: vendor/*
  Source has been repacked to remove the vendor/ directory
  which contained vendor/java/commons-math-2.2.jar.
 
diff --git a/debian/gbp.conf b/debian/gbp.conf
index 139659c..ba07123 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,4 +1,4 @@
-[git-import-orig]
-filter=vendor
-filter-pristine-tar=true
+#[git-import-orig]
+#filter=vendor
+#filter-pristine-tar=true
 
diff --git a/debian/watch b/debian/watch
index f5fba7e..40fd4ba 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,3 @@
 version=3
-opts=dversionmangle=s/\+dfsg// \
+opts=uversionmangle=s/$/+dfsg/ \
 http://pkg-ruby-extras.alioth.debian.org/cgi-bin/gemwatch/distribution .*/distribution-(.*).tar.gz

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