[DRE-commits] [ruby-wikicloth] 01/01: Use Files-Excluded to make upstream tarball DFSG free

[Per Andersson]

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

avtobiff pushed a commit to branch master
in repository ruby-wikicloth.

commit 7cff61bfb59081c032f483a05f2b75c1d29d73a0
Author: Per Andersson <avtobiff at debian.org>
Date:   Sat Oct 10 21:44:25 2015 +0200

    Use Files-Excluded to make upstream tarball DFSG free
    
    * Remove Wikipedia logo from upstream tarball, since it is not DFSG free.
    
    * Use Files-Excluded in d/copyright instead of custom get-orig-source
      script.
---
 debian/README.source      |  7 +++----
 debian/changelog          |  6 ++++++
 debian/copyright          |  3 +++
 debian/get-orig-source.sh | 16 ----------------
 debian/rules              |  3 ---
 5 files changed, 12 insertions(+), 23 deletions(-)

diff --git a/debian/README.source b/debian/README.source
index 03fb47c..93b4450 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -3,9 +3,8 @@ FETCH NEW UPSTREAM SOURCE
 
 Upstream ships the Wikipedia logo which is not DFSG free.
 
-In order to get a DFSG free tarball, just run the `get-orig-source` target in
-`debian/rules`, or execute the shell script `debian/get-orig-source.sh` that
-does the work.
+In order to get a DFSG free tarball, just run uscan(1). This uses
+Files-Excluded in debian/copyright to repackage a DFSG free upstream tarball.
 
 --
-Per Andersson <avtobiff at gmail.com>
+Per Andersson <avtobiff at debian.org>
diff --git a/debian/changelog b/debian/changelog
index f23ad92..440d1a4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ruby-wikicloth (0.8.1+dfsg-4) UNRELEASED; urgency=low
+
+ * Replace custom upstream tarball repackaging with uscan(1) Files-Excluded.
+
+ -- Per Andersson <avtobiff at debian.org>  Sat, 10 Oct 2015 23:00:07 +0200
+
 ruby-wikicloth (0.8.1+dfsg-3) unstable; urgency=low
 
   * Team upload.
diff --git a/debian/copyright b/debian/copyright
index 7e52618..2996546 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: wikicloth
 Source: http://github.com/nricciar/wikicloth
+Files-Excluded: sample_documents/wiki.png
+Comment:
+ The Wikipedia logo is not DFSG-free, hence removed.
 
 Files: *
 Copyright: 2010-2014 David Ricciardi <nricciar at gmail.com>
diff --git a/debian/get-orig-source.sh b/debian/get-orig-source.sh
deleted file mode 100755
index 6297801..0000000
--- a/debian/get-orig-source.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-
-set -e
-
-package="ruby-wikicloth"
-
-file=$(uscan --verbose | \
-        sed -n '/Successfully downloaded updated package/ {s/.*updated package \(.*\)$/\1/; p}')
-version="$(echo $file | sed 's/^v\(.*\)\.tar\.gz/\1/')+dfsg"
-path=../$file
-
-gzip -d < $path | \
-    tar --delete --wildcards -f - '*/sample_documents/wiki.png' | \
-    gzip > ../$package-$version.tar.gz
-rm $path
-echo "Repackaged ../$package-$version.tar.gz"
diff --git a/debian/rules b/debian/rules
index 9b36b7e..49145ae 100755
--- a/debian/rules
+++ b/debian/rules
@@ -32,6 +32,3 @@ override_dh_auto_install:
 
 override_dh_compress:
 	dh_compress -O--buildsystem=ruby --exclude=.wiki
-
-get-orig-source:
-	debian/get-orig-source.sh

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