[SCM] Packaging of padre perl editor branch, master, updated. debian/0.90.ds1-1-17-ge088874

[Dominique Dumont]

The following commit has been merged in the master branch:
commit e088874f3d801c405f1626816b08fc788914f3f3
Author: Dominique Dumont <dod at debian.org>
Date:   Sun Jan 1 14:28:15 2012 +0100

    rules: make sure that non-DFSG file is not distributed

diff --git a/debian/README.debian b/debian/README.debian
index 5d2e7ff..a921f94 100644
--- a/debian/README.debian
+++ b/debian/README.debian
@@ -14,6 +14,7 @@ Changes to upstream source
   replaces this with one generated during build, using Perl::APIReference
   (libperl-apiregerence-perl package).
 
-* the 'primary' padre splash image is distributed under a license forbidding
-  commersial usage. Since this violates Debian Free Software Guidelines, the
-  image is removed and a substitute (also provided upstream) is used.
+* the 'primary' padre splash image is distributed under a license
+  forbidding commercial usage (i.e. cc-by-nc-sa). Since this violates
+  Debian Free Software Guidelines, the image is removed and a
+  substitute (also provided upstream) is used.
diff --git a/debian/changelog b/debian/changelog
index cd9ed7e..8b8beeb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,7 @@ padre (0.92.ds1-1) UNRELEASED; urgency=low
   * rules: remove dekstop cruft (replaced in debian dir)
   * control: removed Breaks statement. Add dod to uploaders. Updated
     dependencies
+  * rules: make sure that non-DFSG file is not distributed
 
  -- Damyan Ivanov <dmn at debian.org>  Thu, 15 Dec 2011 13:25:50 +0100
 
diff --git a/debian/rules b/debian/rules
index 0781fd5..e65286a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -30,7 +30,7 @@ override_dh_auto_install:
 	dh_auto_install
 	mkdir -p $(TMP)/usr/share/pixmaps
 	convert \
-	    $(TMP)/usr/share/perl5/auto/share/dist/Padre/icons/padre/16x16/logo.png \
+	    $(DISTPADRE)/icons/padre/16x16/logo.png \
 	    $(TMP)/usr/share/pixmaps/padre.xpm
 	# remove cruft from perlopquick directory
 	rm  $(PERLOPQUICK)/Copying  \
@@ -40,6 +40,11 @@ override_dh_auto_install:
 	# remove dekstop cruft (replaced in debian dir)
 	rm $(DISTPADRE)/padre.desktop
 
+	# remove cc-by-nc-sa (non DFSG) splash file (Padre's code
+	# gracefully fallack to a DFSG-ok file). See share/README.txt
+	# for license details
+	rm $(DISTPADRE)/padre-splash-ccnc.png
+
 	# these manuals are empty, only containing stubs
 	cat debian/not-real-manual.list | while read size f; do \
 	    ff=$${f#lib/} ; \

-- 
Packaging of padre perl editor