[Pkg-cli-apps-commits] [SCM] sysinfo branch, master, updated. upstream/0.7-11-g0fde65a

[Chow Loong Jin]

The following commit has been merged in the master branch:
commit b636e7fde162d303121b652ff0d3188eb6b72286
Author: Chow Loong Jin <hyperair at debian.org>
Date:   Thu Jan 19 03:49:48 2012 +0800

    Add patch to fix automake error with pkglibdir

diff --git a/debian/patches/14-fix-pkglibdir-error.patch b/debian/patches/14-fix-pkglibdir-error.patch
new file mode 100644
index 0000000..70fc0d7
--- /dev/null
+++ b/debian/patches/14-fix-pkglibdir-error.patch
@@ -0,0 +1,30 @@
+From: Chow Loong Jin <hyperair at debian.org>
+Description: Fix automake error when using pkglibdir with SCRIPTS and DATA
+Index: sysinfo/Makefile.am
+===================================================================
+--- sysinfo.orig/Makefile.am	2012-01-19 03:44:53.146955388 +0800
++++ sysinfo/Makefile.am	2012-01-19 03:45:05.593645959 +0800
+@@ -11,7 +11,8 @@
+ sysinfodesktop_DATA = \
+   sysinfo.desktop
+ 
+-pkglib_DATA =  $(DLL_REFERENCES)
++moduledir = $(pkglibdir)
++module_DATA =  $(DLL_REFERENCES)
+ DLL_REFERENCES =  
+ EXTRA_DIST =  \
+ 	$(DLL_REFERENCES)\
+Index: sysinfo/Makefile.include
+===================================================================
+--- sysinfo.orig/Makefile.include	2012-01-19 03:44:53.176955443 +0800
++++ sysinfo/Makefile.include	2012-01-19 03:45:45.253727392 +0800
+@@ -18,7 +18,8 @@
+ CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb $(DLL_REFERENCES)
+ DISTCLEANFILES = $(GENERATED_FILES) $(build_datafiles) $(pc_files)
+ 
+-pkglib_SCRIPTS = $(ASSEMBLY) $(build_datafiles)
++moduledir = $(pkglibdir)
++module_SCRIPTS = $(ASSEMBLY) $(build_datafiles)
+ bin_SCRIPTS = $(ASSEMBLY_WRAPPER)
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = $(pc_files)
diff --git a/debian/patches/series b/debian/patches/series
index 48ecb8e..7ff2a41 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -12,3 +12,4 @@
 11-typo.diff
 12-fix-nre-no-bogomips.patch
 13-fix-reordered-cpuinfo.patch
+14-fix-pkglibdir-error.patch

-- 
sysinfo