[Pkg-cli-apps-commits] [SCM] monobristol branch, master, updated. debian/0.60.3-2

[Jo Shields]

The following commit has been merged in the master branch:
commit 6cf87506bb8e72180e5239bc48dcf165945bbc66
Author: Jo Shields <directhex at apebox.org>
Date:   Fri Jan 20 13:11:12 2012 +0000

    Automake 1.11.2 enforces C-libs-only in pkglib, so reuse the custom-defined programfilesdir for installing the main assembly.

diff --git a/debian/patches/dont_use_pkglibdir_because_automake_sucks b/debian/patches/dont_use_pkglibdir_because_automake_sucks
new file mode 100644
index 0000000..2e3d209
--- /dev/null
+++ b/debian/patches/dont_use_pkglibdir_because_automake_sucks
@@ -0,0 +1,17 @@
+Index: monobristol/Makefile.include
+===================================================================
+--- monobristol.orig/Makefile.include	2012-01-20 13:09:42.000000000 +0000
++++ monobristol/Makefile.include	2012-01-20 13:10:01.000000000 +0000
+@@ -62,11 +62,10 @@
+ CLEANFILES += $(ASSEMBLY) $(ASSEMBLY).mdb $(BINARIES) $(build_resx_resources) $(build_satellite_assembly_list)
+ DISTCLEANFILES = $(GENERATED_FILES) $(pc_files) $(BUILD_DIR)/*
+ 
+-pkglib_SCRIPTS = $(ASSEMBLY)
+ bin_SCRIPTS = $(BINARIES)
+ 
+ programfilesdir = @libdir@/@PACKAGE@
+-programfiles_DATA = $(PROGRAMFILES)
++programfiles_DATA = $(PROGRAMFILES) $(ASSEMBLY)
+ 
+ 
+ # macros
diff --git a/debian/patches/series b/debian/patches/series
index 7cefa62..d04c94d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
+dont_use_pkglibdir_because_automake_sucks
 01_use_mono-csc
 02_fix_config

-- 
monobristol