[Pkg-cli-apps-commits] [SCM] sparkleshare branch, master, updated. debian/0.8.2-1-5-g7ff3ad5

[Carlos Martín Nieto]

The following commit has been merged in the master branch:
commit 264b24c3b4372a758736ef4e44c212de4a0843d2
Author: Carlos Martín Nieto <carlos at cmartin.tk>
Date:   Sun Apr 22 19:57:08 2012 +0200

    Add 0001-Don-t-call-update-desktop-database-from-the-Makefile.patch

diff --git a/debian/patches/0001-Don-t-call-update-desktop-database-from-the-Makefile.patch b/debian/patches/0001-Don-t-call-update-desktop-database-from-the-Makefile.patch
new file mode 100644
index 0000000..ef8249e
--- /dev/null
+++ b/debian/patches/0001-Don-t-call-update-desktop-database-from-the-Makefile.patch
@@ -0,0 +1,44 @@
+From: Carlos Martín Nieto <carlos at cmartin.tk>
+Date: Sun, 22 Apr 2012 19:52:57 +0200
+Subject: Don't call update-desktop-database from the Makefile
+
+Triggers take care of that when installing
+---
+ SparkleShare/Makefile.am |    6 +++---
+ SparkleShare/Makefile.in |    6 +++---
+ 2 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/SparkleShare/Makefile.am b/SparkleShare/Makefile.am
+index 26452b7..dbbd42e 100755
+--- a/SparkleShare/Makefile.am
++++ b/SparkleShare/Makefile.am
+@@ -24,6 +24,6 @@ SOURCES =  \
+ 
+ include $(top_srcdir)/build/build.mk
+ 	
+-install-data-hook:
+-	update-desktop-database $(datadir)/applications
+-	echo "Installed protocol handler sparkleshare://"
++#install-data-hook:
++#	update-desktop-database $(datadir)/applications
++#	echo "Installed protocol handler sparkleshare://"
+diff --git a/SparkleShare/Makefile.in b/SparkleShare/Makefile.in
+index 20e1922..4ec0d7f 100644
+--- a/SparkleShare/Makefile.in
++++ b/SparkleShare/Makefile.in
+@@ -785,9 +785,9 @@ $(ASSEMBLY_FILE): $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(DEP_LINK)
+ 		cp $(EXTRA_BUNDLE) $(top_builddir)/bin; \
+ 	fi;
+ 
+-install-data-hook:
+-	update-desktop-database $(datadir)/applications
+-	echo "Installed protocol handler sparkleshare://"
++#install-data-hook:
++#	update-desktop-database $(datadir)/applications
++#	echo "Installed protocol handler sparkleshare://"
+ 
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+-- 
+1.7.10.rc0.17.g74595
+
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..4c42ea5
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-Don-t-call-update-desktop-database-from-the-Makefile.patch

-- 
sparkleshare