[DRE-commits] [ruby-nokogiri] 01/01: debian/copyright: explicitly list files that are excluded from the tarball

[Antonio Terceiro]

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

terceiro pushed a commit to branch master
in repository ruby-nokogiri.

commit 7f450b9193fc8643b7a26cd2c913ea64cc4fc847
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Tue Nov 17 18:07:56 2015 -0200

    debian/copyright: explicitly list files that are excluded from the tarball
---
 debian/changelog | 2 ++
 debian/copyright | 1 +
 debian/gbp.conf  | 4 ----
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 859da53..f61b2d6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,8 @@ ruby-nokogiri (1.6.6.3-1) unstable; urgency=medium
   * skip-some-tests.patch: skip tests that won't work against libxml2 2.9.2 in
     Debian, but pass when using the embedded copy + patches in the Nokogiri
     tree (Closes: #800028)
+  * debian/copyright: explicitly list files that are excluded from the
+    tarball, so that stuff is removed from the tarball by uscan
 
  -- Antonio Terceiro <terceiro at debian.org>  Tue, 17 Nov 2015 14:39:46 -0200
 
diff --git a/debian/copyright b/debian/copyright
index 4f0db6b..070b2f2 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: nokogiri
 Homepage: http://nokogiri.org/
+Files-Excluded: ports/archives/
 Comment: the upstream tarball is repacked to remove ports/archives/
  containing of convenience copies of the libraries
  libxml2 (version 2.8.0) and libxslt (version 1.1.26)
diff --git a/debian/gbp.conf b/debian/gbp.conf
index adf214e..cec628c 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,6 +1,2 @@
 [DEFAULT]
 pristine-tar = True
-
-[git-import-orig]
-filter = ['ports/archives']
-filter-pristine-tar = True

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