[SCM] Packaging of padre perl editor branch, master, updated. debian/0.36-3-49-g5d8f9c8

Damyan Ivanov dmn at debian.org
Mon Oct 26 22:12:01 UTC 2009


The following commit has been merged in the master branch:
commit d98449ccbd547cf2d7c5790386257d4359bfdae2
Author: Damyan Ivanov <dmn at debian.org>
Date:   Mon Oct 26 23:03:19 2009 +0200

    update debian/repack.sh to remove share/padre-splash-ccnc.bmp and plug it into debian/watch

diff --git a/debian/changelog b/debian/changelog
index 8be9205..3d17e80 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,5 @@
 padre (0.43-1) UNRELEASED; urgency=low
 
-    TODO: the splash image is licensed under CC-BY-NC-SA-2.0
-          this looks non-free to me due to the rescriction of commercial usage.
-          http://creativecommons.org/licenses/by-nc-sa/2.0/deed.en
-
   * New Upstream Version
     + new dependencies:
       - libfile-next-perl 1.04
@@ -18,6 +14,8 @@ padre (0.43-1) UNRELEASED; urgency=low
     + drop patches applied upstream: fix-perl-interpreter-path.patch,
       fix-pod-errors.patch and fix-whatis.patch
   * Standards-Version: 3.8.3 (no changes)
+  * update debian/repack.sh to remove share/padre-splash-ccnc.bmp and plug it
+    into debian/watch
 
  -- Damyan Ivanov <dmn at debian.org>  Mon, 17 Aug 2009 20:59:03 +0300
 
diff --git a/debian/repack.sh b/debian/repack.sh
index 9fadebf..1e6343e 100644
--- a/debian/repack.sh
+++ b/debian/repack.sh
@@ -1,8 +1,7 @@
 #!/bin/sh
 #
-# Repack upstream source removing generated (.mo) files
-# and eg/hangman.p6, which has no license and is certainly
-# copyrighted
+# Repack upstream source removing share/padre-splash-ccnc.bmp
+# which uses a license forbidding commercial usage (CC-NC)
 #
 # To be called via debian/watch (uscan or uscan --force)
 # or
@@ -49,20 +48,8 @@ tar xzf $UPSTREAM_TAR -C $TMPDIR
 echo " done."
 
 # clean generated files
-echo "Cleaning upstream sources from generated files..."
-for f in `cd $TMPDIR/$UPSTREAM_DIR/share/locale; ls -1 *.mo` ;
-do
-    echo "  share/locale/$f"
-    rm $TMPDIR/$UPSTREAM_DIR/share/locale/$f
-done
-
-echo "Remmoving copyrighted files without a license..."
-for f in eg/hangman.p6 ;
-do
-    echo "  $f"
-    rm $TMPDIR/$UPSTREAM_DIR/$f
-done
-
+echo "Cleaning non-DFSG files..."
+rm -v $TMPDIR/$UPSTREAM_DIR/share/padre-splash-ccnc.bmp
 
 mv $TMPDIR/$UPSTREAM_DIR $TMPDIR/$ORIG_DIR
 
diff --git a/debian/watch b/debian/watch
index f58bee0..f4413d7 100644
--- a/debian/watch
+++ b/debian/watch
@@ -2,4 +2,4 @@
 version=3
 # URL to the package page followed by a regex to search
 opts=dversionmangle=s/\.ds\d+// \
-http://search.cpan.org/dist/Padre/   .*/Padre-v?(\d[\d_.-]+)\.(?:tar(?:\.gz|\.bz2)?|tgz|zip)$ debian
+http://search.cpan.org/dist/Padre/   .*/Padre-v?(\d[\d_.-]+)\.(?:tar(?:\.gz|\.bz2)?|tgz|zip)$ debian sh debian/repack.sh

-- 
Packaging of padre perl editor



More information about the Pkg-perl-cvs-commits mailing list