[Pkg-cli-libs-commits] [SCM] zeitgeist-sharp branch, master, updated. debian/0.8.0.0-3

[Iain Lane]

The following commit has been merged in the master branch:
commit 9ff076702ce0a242e39ee86efafefdfa7b1a4724
Author: Iain Lane <laney at debian.org>
Date:   Thu Jun 21 14:28:20 2012 +0100

    Add new patch to cope with changed behaviour in automake 1.11.2
    
    You cannot install into "suspicious" directory/primary couples now,
    without a workaround such as this.

diff --git a/debian/patches/automake-pkglibdir-data.patch b/debian/patches/automake-pkglibdir-data.patch
new file mode 100644
index 0000000..b451be8
--- /dev/null
+++ b/debian/patches/automake-pkglibdir-data.patch
@@ -0,0 +1,28 @@
+Description: Use a custom target, programfilesdir, to install to pkglibdir.
+ Automake 1.11.2 changed behaviour here, breaking the build.
+Author: Iain Lane <laney at debian.org>
+Forwarded: no
+
+Index: b/Makefile.am
+===================================================================
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,3 +1,3 @@
+ EXTRA_DIST =  expansions.m4
+ SUBDIRS = Zeitgeist
+-EXTRA_DIST = LICENSE MAINTAINERS NEWS
++EXTRA_DIST += LICENSE MAINTAINERS NEWS
+Index: b/Zeitgeist/Makefile.am
+===================================================================
+--- a/Zeitgeist/Makefile.am
++++ b/Zeitgeist/Makefile.am
+@@ -13,7 +13,8 @@
+ ZS_GACUTIL_UNINSTALL = $(GACUTIL) -u $(ZS_ASSEMBLY_NAME) $(GACUTIL_FLAGS)
+ 
+ # magic automake variables
+-pkglib_DATA = \
++programfilesdir = $(pkglibdir)
++programfiles_DATA = \
+ 	$(ZS_ASSEMBLY_TARGET) $(ZS_ASSEMBLY_TARGET).mdb
+ 
+ EXTRA_DIST = \
diff --git a/debian/patches/series b/debian/patches/series
index 2d251b3..e7b9ac1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 tweak_pcfile_location_for_debianisms.patch
 zeitgeist-daemon-ac-check-prog.patch
+automake-pkglibdir-data.patch

-- 
zeitgeist-sharp