[Pkg-cli-apps-commits] [SCM] gnome-rdp branch, master, updated. debian/0.3.0.9-2-1-g69004af

[Jo Shields]

The following commit has been merged in the master branch:
commit 69004afa006dc8494acdf6f007ccc2ea92d847d4
Author: Jo Shields <directhex at apebox.org>
Date:   Fri Jan 20 13:16:40 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/automake_developers_are_terrible_people b/debian/patches/automake_developers_are_terrible_people
new file mode 100644
index 0000000..91d1291
--- /dev/null
+++ b/debian/patches/automake_developers_are_terrible_people
@@ -0,0 +1,24 @@
+Index: gnome-rdp/Makefile.include
+===================================================================
+--- gnome-rdp.orig/Makefile.include	2012-01-20 13:16:15.000000000 +0000
++++ gnome-rdp/Makefile.include	2012-01-20 13:16:26.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
+@@ -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)
diff --git a/debian/patches/series b/debian/patches/series
index c0d9561..09aa0a9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
+automake_developers_are_terrible_people
 include_ac_expansions.patch
 use_default_compiler.patch
 fix-vnc-connections.patch

-- 
gnome-rdp