[DRE-commits] [SCM] ruby-opengl.git branch, master, updated. debian/0.60.1+dfsg1-2-10-gdb8f67e

[Cédric Boutillier]

The following commit has been merged in the master branch:
commit 6a3abd6082b5a3e39b7b5165987543ea05153743
Author: Cédric Boutillier <boutil at debian.org>
Date:   Sun Jun 30 09:46:02 2013 +0200

    prepare removal of examples/NeHe from tarball

diff --git a/debian/README.source b/debian/README.source
index f6de1bd..6411034 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -4,9 +4,10 @@ The source has been repacked to comply to to Debian Free Software Guidelines:
 
 - examples/misc/fbo_test.rb has been removed, as distribution of modified
   versions is not allowed.
+- examples/NeHe/* have been removes, as a proper could not be found (#713820)
 
 This operation is done automatically by the script debian/repack.sh, called
 in the get-orig-source: target in debian/rules.
 
-Cédric Boutillier <cedric.boutillier at gmail.com>
-Last update: 2012-04-30
+Cédric Boutillier <boutil at debian.org>
+Last update: 2013-06-30
diff --git a/debian/copyright b/debian/copyright
index 557a323..020a76c 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,6 +4,7 @@ Source: http://rubyforge.org/projects/ruby-opengl/
 Comment: Source has been repacked to respect the DFSG
  the file example/misc/fbo_test.rb has been removed, as it does not allow
  the distribution of modified versions.
+ the files examples/NeHe/* as a proper license could not be found.
 
 Files: *
 Copyright: 2004 Yoshiyuki Kusano <yoshi at giganet.net>
diff --git a/debian/repack.sh b/debian/repack.sh
index 4f85d76..9ff0b50 100755
--- a/debian/repack.sh
+++ b/debian/repack.sh
@@ -4,7 +4,7 @@
 #
 # In this case the files removed are:
 # - examples/misc/fbo_test.rb
-
+# - examples/NeHe
 
 set -e
 
@@ -21,9 +21,12 @@ rm ruby-opengl_${DEB_UPSTREAM_VERSION}.orig.tar.gz
 # remove example not allowing distribution if modified
 rm ruby-opengl-$DEB_UPSTREAM_VERSION/examples/misc/fbo_test.rb
 
+# remove NeHe examples, without clear license
+rm -rf ruby-opengl-$DEB_UPSTREAM_VERSION/examples/NeHe
+
 # repack the tarball
 mv ruby-opengl-$DEB_UPSTREAM_VERSION ruby-opengl-$DEB_UPSTREAM_VERSION.orig
 GZIP=--best tar --create --gzip --owner root --group root --mode a+rX \
-	--file ../ruby-opengl_$DEB_UPSTREAM_VERSION+dfsg1.orig.tar.gz ruby-opengl-$DEB_UPSTREAM_VERSION.orig
+	--file ../ruby-opengl_$DEB_UPSTREAM_VERSION+dfsg2.orig.tar.gz ruby-opengl-$DEB_UPSTREAM_VERSION.orig
 rm -r ruby-opengl-$DEB_UPSTREAM_VERSION.orig
 

-- 
ruby-opengl.git