[DRE-commits] [ruby-gsl] 04/10: Repack source to remove non-free documentation (Closes: #709497)

Sat Nov 30 17:13:15 UTC 2013

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

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

commit 584b203424c791c3ac902642bb2459fff62f4993
Author: Cédric Boutillier <boutil at debian.org>
Date:   Sat Nov 30 16:56:12 2013 +0100

    Repack source to remove non-free documentation (Closes: #709497)
    
    * Repack source to remove non-free documentation (Closes: #709497)
      - add debian/gbp.conf to filter out rdoc directory, containing files under
      - do not build the doc in debian/rules
      - add dversionmangle option in debian/watch to strip +dfsg suffix
      - document in debian/README.source how the repack is handled
---
 debian/README.source | 19 ++++++++---
 debian/changelog     | 11 ++++--
 debian/copyright     | 94 +++++++++++++++++++++++++++++++++-------------------
 debian/rules         |  4 +--
 debian/watch         |  1 +
 5 files changed, 84 insertions(+), 45 deletions(-)

diff --git a/debian/README.source b/debian/README.source
index 804f390..ed6027f 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -1,7 +1,16 @@
-This package includes patches managed with the «quilt» patch
-management system. Changes to the upstream sources are stored as diffs
-in debian/patches and applied during the build.
+This package uses the Debian 3.0 (quilt) source package format.
 
-See /usr/share/doc/quilt/README.source for a detailed explanation.
+The upstream tarball has been repacked to remove the rdoc/ directory,
+containing the source of the manual for ruby-gsl. It is a derived work
+of some earlier version of the GSL manual, released under the GNU
+Documentation license with invariant sections, thus considered non-free.
 
- -- Deepak Tripathi <apenguinliux at gmail.com>, Fri, 14 May 2010 09:25:14 -0400
+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).
+
+This issue is reported here:
+  http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=709497
+  https://github.com/david-macmahon/rb-gsl/issues/3
+
+ -- Cédric Boutillier <boutil at debian.org>  Sat, 30 Nov 2013 16:20:35 +0100
diff --git a/debian/changelog b/debian/changelog
index 5f77f45..0252f2a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-ruby-gsl (1.15.3-1) UNRELEASED; urgency=low
+ruby-gsl (1.15.3+dfsg-1) UNRELEASED; urgency=low
 
   * Team upload
   * Imported Upstream version 1.15.3
@@ -16,8 +16,13 @@ ruby-gsl (1.15.3-1) UNRELEASED; urgency=low
       when passing
     - add 20131016_deactivate_failing_tests.patch: skip failing tests on amd64
   * debian/rules: drop --with quilt switch
-  * add debian/gbp.conf to filter out rdoc directory, containing files under
-    the GNU Documentation license with invariant sections.
+  * Repack source to remove non-free documentation (Closes: #709497)
+    - add debian/gbp.conf to filter out rdoc directory, containing files under
+      the GNU Documentation license with invariant sections.
+    - do not build the doc in debian/rules
+    - add dversionmangle option in debian/watch to strip +dfsg suffix
+    - document in debian/README.source how the repack is handled
+  * debian/copyright: port to copyright-format/1.0
 
  -- Cédric Boutillier <boutil at debian.org>  Tue, 24 Sep 2013 11:11:18 +0200
 
diff --git a/debian/copyright b/debian/copyright
index 56d578b..ef97952 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,34 +1,60 @@
-This package was debianized by Lucas Nussbaum <lucas at lucas-nussbaum.net> on
-Tue, 06 Jun 2006 20:54:10 +0100.
-
-It was downloaded from http://rubyforge.org/frs/?group_id=285
-
-Upstream Author: 
-	
-  Yoshiki Tsunesada <y-tsunesada at mm.em-net.ne.jp>
-  David MacMahon <davidm at astro.berkeley.edu>
-
-Copyright:
-
-  Copyright 2001-2006 Yoshiki Tsunesada <ytsunesada at yahoo.co.jp>
-  
-  ext/histogram_oper.c 
-    Copyright (C) 2000  Simone Piccardi under the GPL version 2.
- 
-License:
-
- Ruby/GSL is released under the terms of the GNU General Public License. No
- specific version is mentionned in the README file, but the included COPYING
- file is GPL v2.
-
- On Debian systems, the complete text of the GNU General Public
- License can be found in the file `/usr/share/common-licenses/GPL-2'.
-
- The setup.rb file included in the package's source is released under the GNU
- LGPL. On Debian systems, the complete text of the GNU Lesser General Public
- can be found in `/usr/share/common-licenses/LGPL-2.1'.
-
---
-The Debian packaging is:
-  Copyright (C) 2010 Deepak Tripathi <apenguinlinux at gmail.com> and is licensed
-  under the GPL, see `/usr/share/common-licenses/GPL-2'.
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: rb-gsl
+Upstream-Contact: https://github.com/david-macmahon/rb-gsl/issues
+                  Yoshiki Tsunesada <y-tsunesada at mm.em-net.ne.jp>
+                  David MacMahon <davidm at astro.berkeley.edu>
+Source: https://github.com/david-macmahon/rb-gsl
+Comment: The upstream tarball has been repacked to remove the
+  rdoc/ directory containing files under the (non-free) GNU
+  Documentation license with invariant sections.
+  See debian/README.source for details.
+
+Files: *
+Copyright: 2001-2006 Yoshiki Tsunesada <ytsunesada at yahoo.co.jp>
+License: GPL-2
+
+Files: setup.rb
+Copyright: 2000-2005 Minero Aoki
+License: LGPL-2.1
+
+Files: ext/fcmp.c
+Copyright: 2002 Gert Van den Eynde
+License: GPL-2+
+
+Files: ext/histogram_oper.c
+Copyright: 2000  Simone Piccardi
+License: GPL-2+
+
+Files: ext/histogram_find.c ext/oper_complex_source.c
+Copyright: 1996-2000 Brian Gough
+License: GPL-2+
+
+Files: debian/*
+Copyright: 2010 Deepak Tripathi <apenguinlinux at gmail.com>
+ 2013 Cédric Boutillier <boutil at debian.org>
+License: GPL-2
+
+License: GPL-2
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; version 2 dated June, 1991.
+ .
+ On Debian systems, the complete text of version 2 of the GNU General
+ Public License can be found in '/usr/share/common-licenses/GPL-2'.
+
+License: GPL-2+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; version 2 dated June, 1991, or (at
+ your option) any later version.
+ .
+ On Debian systems, the complete text of version 2 of the GNU General
+ Public License can be found in '/usr/share/common-licenses/GPL-2'.
+
+License: LGPL-2.1
+ This program is free software; you can redistribute it and/or modify it
+ under the terms of the GNU Lesser General Public License as published by the
+ Free Software Foundation; version 2.1 of the License.
+ .
+ On Debian systems, the complete text of version 2.1 of the GNU Lesser
+ Public License can be found in `/usr/share/common-licenses/LGPL-2.1'.
diff --git a/debian/rules b/debian/rules
index a5262df..ce849da 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,9 +17,7 @@ override_dh_strip:
 	dh_strip --dbg-package=ruby-gsl-dbg
 
 override_dh_installdocs:
-	rdoc -o html rdoc/*
-	dh_installdocs html examples
-	rm -rf debian/ruby-gsl/usr/share/doc/ruby-gsl/html/.xvpics
+	dh_installdocs examples
 	rm -rf debian/ruby-gsl/usr/share/doc/ruby-gsl/examples/fit/*.dat
 	rm -rf debian/ruby-gsl/usr/share/doc/ruby-gsl/examples/linalg/linalg.replaced
 	rm -rf debian/ruby-gsl/usr/share/doc/ruby-gsl/examples/gallery/rgplot/rgplot.replaced
diff --git a/debian/watch b/debian/watch
index a037be1..335eac6 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,3 @@
 version=3
+opts=dversionmangle=s/\+dfsg(\d)*// \
 http://pkg-ruby-extras.alioth.debian.org/cgi-bin/gemwatch/gsl .*/gsl-(.*).tar.gz

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

