[Pkg-phototools-devel] [SCM] entangle branch, master, updated. debian/0.4.0-1-21-g976b636

[Matteo F. Vescovi]

The following commit has been merged in the master branch:
commit 42d2e57095b4581514b0bf03a5ed50d446f80270
Author: Matteo F. Vescovi <mfv.debian at gmail.com>
Date:   Thu Jan 10 09:18:30 2013 +0100

    debian/: entangle.desktop file re-introduced
    
    I must admit I misread Lintian output and
    wrongly removed this file. Fixing it now.
    
    Git-Dch: Ignore

diff --git a/debian/entangle.install b/debian/entangle.install
index 0cfaafb..6920ebc 100644
--- a/debian/entangle.install
+++ b/debian/entangle.install
@@ -1,4 +1,5 @@
 usr/bin
+usr/share/applications
 usr/share/entangle
 usr/share/glib-2.0
 usr/share/gtk-doc
diff --git a/debian/rules b/debian/rules
index 7fbca76..adaf4dc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,8 +12,6 @@ override_dh_auto_configure:
 override_dh_auto_install:
 	dh_auto_install --destdir=$(INSTDIR)
 	rm -f $(INSTDIR)/usr/share/glib-2.0/schemas/gschemas.compiled
-	rm -f $(INSTDIR)/usr/share/applications/entangle.desktop
-	find $(INSTDIR)/usr/share/applications/ -type d -empty -delete
 	find $(INSTDIR)/usr/share/entangle/plugins/ -type d -empty -delete
 
 override_dh_strip:

-- 
entangle packaging