[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 370ac89bbf3a9076b0663924f54ff14bcdb93c04
Author: Dominique Dumont <dod at debian.org>
Date:   Sun Jan 1 12:56:20 2012 +0100

    rules: remove dekstop cruft (replaced in debian dir)

diff --git a/debian/changelog b/debian/changelog
index 2904a19..99d32e3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,7 @@ padre (0.92.ds1-1) UNRELEASED; urgency=low
   * removed fix-spelling patch (applied upstream)
   * lintian-override: use wildcard to avoid listing a gazillion files
   * updated size of some 'not-real-man-page' entries
+  * rules: remove dekstop cruft (replaced in debian dir)
 
  -- Damyan Ivanov <dmn at debian.org>  Thu, 15 Dec 2011 13:25:50 +0100
 
diff --git a/debian/rules b/debian/rules
index d630df5..0781fd5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -23,6 +23,7 @@ override_dh_auto_test:
 PERLOPQUICK := $(TMP)/usr/share/perl5/auto/share/dist/Padre/doc/perlopquick
 LOCALE    := $(TMP)/usr/share/perl5/auto/share/dist/Padre/locale/
 TIMELINE  := $(TMP)/usr/share/perl5/auto/share/dist/Padre/timeline
+DISTPADRE := $(TMP)/usr/share/perl5/auto/share/dist/Padre/
 LIB       := $(TMP)/usr/share/perl5/Padre
 
 override_dh_auto_install:
@@ -35,7 +36,10 @@ override_dh_auto_install:
 	rm  $(PERLOPQUICK)/Copying  \
 	    $(PERLOPQUICK)/Artistic \
 	    $(PERLOPQUICK)/README
-	
+
+	# remove dekstop cruft (replaced in debian dir)
+	rm $(DISTPADRE)/padre.desktop
+
 	# 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