[SCM] jamin/master: ACK NMU (bug#588554), thanks to Alexander Reichle-Schmehl for the good job:

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 216c10a98b55676936ffac1d9670017f234b8569
Author: Alessio Treglia <alessio at debian.org>
Date:   Mon May 9 12:06:47 2011 +0200

    ACK NMU (bug#588554), thanks to Alexander Reichle-Schmehl for the good job:
    
    - debian/patches/1004_install_correct_dir.patch: Install files into
      /usr/lib instead of /usr/lib64.

diff --git a/debian/changelog b/debian/changelog
index 8688051..8dd3862 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+jamin (0.97.14~cvs~81203-3.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * debian/patches/1004_install_correct_dir.patch: Install files into
+    /usr/lib instead of /usr/lib64 (Closes: #588554)
+
+ -- Alexander Reichle-Schmehl <tolimar at debian.org>  Thu, 15 Jul 2010 15:00:24 +0200
+
 jamin (0.97.14~cvs~81203-3) unstable; urgency=low
 
   * Revert to depend (not just recommend) swh-plugins.
diff --git a/debian/patches/1004_install_correct_dir.patch b/debian/patches/1004_install_correct_dir.patch
new file mode 100644
index 0000000..4dd4468
--- /dev/null
+++ b/debian/patches/1004_install_correct_dir.patch
@@ -0,0 +1,16 @@
+--- a/configure.in
++++ b/configure.in
+@@ -97,13 +97,6 @@ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GE
+ AM_GLIB_GNU_GETTEXT
+ 
+ libnn=lib
+-case "${host_os}" in
+-  linux*)
+-  case "${host_cpu}" in
+-    x86_64|mips64|ppc64|sparc64|s390x)
+-    libnn=lib64
+-  esac
+-esac
+ 
+ if test "${libdir}" = '${exec_prefix}/lib'; then
+   libdir='${exec_prefix}/'${libnn}
diff --git a/debian/patches/series b/debian/patches/series
index 7704b3b..6b0e168 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 #1001_use_AM_CFLAGS_for_CFLAGS.patch
 #1002_compile_with_-fPIC.patch
 1003_add_dynamic_linking.patch
+1004_install_correct_dir.patch

-- 
jamin packaging