Merge lp:~l3on/ubuntu/precise/monobristol/fix-ftbfs into lp:ubuntu/precise/monobristol

[Leo Iannacone]

Resolve FTBFS with automake 1.11.3:
 + pkglib_SCRIPT is compatible with last automake version.
   Use instead a simple workaround to install file in the same place.

[Luke Yelavich (themuso)]

Thanks for your work.

review: Approve

=== modified file '.pc/applied-patches'
--- .pc/applied-patches	2011-08-03 15:16:24 +0000
+++ .pc/applied-patches	2012-02-19 15:21:17 +0000
@@ -1,3 +1,4 @@
 01_use_mono-csc
 02_fix_config
 03_attach_events
+04_fix_automake_1.11.3

=== modified file 'Makefile.include'
--- Makefile.include	2010-11-24 20:31:45 +0000
+++ Makefile.include	2012-02-19 15:21:17 +0000
@@ -62,12 +62,11 @@
 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_SCRIPTS = $(ASSEMBLY)
 
 # macros
 
@@ -113,4 +112,4 @@
 install-satellite-assemblies: $(install_satellite_assembly_list)
 	
 uninstall-satellite-assemblies:
-	rm -rf $(install_satellite_assembly_list)
\ No newline at end of file
+	rm -rf $(install_satellite_assembly_list)

=== modified file 'debian/changelog'
--- debian/changelog	2011-08-03 15:16:24 +0000
+++ debian/changelog	2012-02-19 15:21:17 +0000
@@ -1,3 +1,9 @@
+monobristol (0.60.3-1ubuntu2) precise; urgency=low
+
+  * Fix FTBFS with automake 1.11.3 (LP: #934976).
+
+ -- Leo Iannacone <[e-mail]>  Sun, 19 Feb 2012 16:02:04 +0100
+
 monobristol (0.60.3-1ubuntu1) oneiric; urgency=low
 
   * Apply patch from Takashi Sakamoto resolving inability to call

=== added file 'debian/patches/04_fix_automake_1.11.3'
--- debian/patches/04_fix_automake_1.11.3	1970-01-01 00:00:00 +0000
+++ debian/patches/04_fix_automake_1.11.3	2012-02-19 15:21:17 +0000
@@ -0,0 +1,25 @@
+Description: Resolve FTBFS with automake 1.11.3:
+ + pkglib_SCRIPT is compatible with last automake version.
+   Use instead a simple workaround to install file in the same place.
+Author: Leo Iannacone <[e-mail]>
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/934976
+---
+ Makefile.include |    3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+--- monobristol.orig/Makefile.include
++++ monobristol/Makefile.include
+@@ -62,12 +62,11 @@ EXTRA_DIST += $(build_sources) $(build_r
+ 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_SCRIPTS = $(ASSEMBLY)
+ 
+ # macros
+ 

=== modified file 'debian/patches/series'
--- debian/patches/series	2011-08-03 15:16:24 +0000
+++ debian/patches/series	2012-02-19 15:21:17 +0000
@@ -1,3 +1,4 @@
 01_use_mono-csc
 02_fix_config
 03_attach_events
+04_fix_automake_1.11.3