[padre] 03/06: use upstream-provided .desktop file

[Damyan Ivanov]

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

dmn pushed a commit to branch master
in repository padre.

commit 5a9b1fdd358b42437abbe5d8dcb06e440f271b90
Author: Damyan Ivanov <dmn at debian.org>
Date:   Wed Sep 25 20:24:02 2013 +0000

    use upstream-provided .desktop file
    
    needs patches to fix the path to the icon and
    to add Keywords statement
---
 debian/padre.desktop                  |    8 --------
 debian/padre.install                  |    1 -
 debian/patches/desktop-icon.patch     |   17 +++++++++++++++++
 debian/patches/desktop-keywords.patch |   13 +++++++++++++
 debian/patches/series                 |    2 ++
 debian/rules                          |    4 ++--
 6 files changed, 34 insertions(+), 11 deletions(-)

diff --git a/debian/padre.desktop b/debian/padre.desktop
deleted file mode 100644
index cc75413..0000000
--- a/debian/padre.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Type=Application
-Name=Padre
-Comment=Perl Application Development and Refactoring Environment
-Icon=/usr/share/pixmaps/padre.xpm
-Exec=/usr/bin/padre
-Categories=Development;IDE;TextTools;
diff --git a/debian/padre.install b/debian/padre.install
deleted file mode 100644
index 018e6c7..0000000
--- a/debian/padre.install
+++ /dev/null
@@ -1 +0,0 @@
-debian/padre.desktop usr/share/applications/
diff --git a/debian/patches/desktop-icon.patch b/debian/patches/desktop-icon.patch
new file mode 100644
index 0000000..7f1434c
--- /dev/null
+++ b/debian/patches/desktop-icon.patch
@@ -0,0 +1,17 @@
+Description: correct path to the icon
+ Upstream claims to fix this properly one day in padre.desktop.README, so no
+ need to forward the patch, even if all environments used the same path
+Author: Damyan Ivanov <dmn at debian.org>
+Forwarded: not-needed
+
+--- a/share/padre.desktop
++++ b/share/padre.desktop
+@@ -4,7 +4,7 @@ Name=Padre
+ Comment=The Perl IDE
+ # change to corresponding path
+ Exec=padre
+-Icon=/usr/local/share/perl/5.10.1/auto/share/dist/Padre/icons/padre/64x64/logo.png
++Icon=/usr/share/perl5/auto/share/dist/Padre/icons/padre/64x64/logo.png
+ Categories=Application;Development;Perl;IDE
+ Version=1.0
+ Type=Application
diff --git a/debian/patches/desktop-keywords.patch b/debian/patches/desktop-keywords.patch
new file mode 100644
index 0000000..d07b84c
--- /dev/null
+++ b/debian/patches/desktop-keywords.patch
@@ -0,0 +1,13 @@
+Description: add Keywords setting
+ https://wiki.gnome.org/GnomeGoals/DesktopFileKeywords
+Author: Damyan Ivanov <dmn at debian.org>
+Forwarded: no
+
+--- a/share/padre.desktop
++++ b/share/padre.desktop
+@@ -9,4 +9,4 @@ Categories=Application;Development;Perl;
+ Version=1.0
+ Type=Application
+ Terminal=0
+-
++Keywords=perl IDE development editor debugger
diff --git a/debian/patches/series b/debian/patches/series
index 8096acd..e348046 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,5 @@ disable-tcp-server.patch
 example-interpreter.patch
 fix-mime-test
 no-experimental.patch
+desktop-keywords.patch
+desktop-icon.patch
diff --git a/debian/rules b/debian/rules
index ba940b4..93ad61f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -34,8 +34,8 @@ override_dh_auto_install:
 	    $(PERLOPQUICK)/Artistic \
 	    $(PERLOPQUICK)/README
 
-	# remove dekstop cruft (replaced in debian dir)
-	rm $(DISTPADRE)/padre.desktop
+	# fix permissions
+	chmod 0644 $(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

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/padre.git