[SCM] dirac/master: libdirac-dev: "Multi-Arch: same" but dirac-stdint.h differs across architectures

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 6ef0a8be8224db23dbeced058f71cedd173ff16f
Author: Alessio Treglia <alessio at debian.org>
Date:   Tue Feb 7 09:42:52 2012 +0100

    libdirac-dev: "Multi-Arch: same" but dirac-stdint.h differs across architectures
    
    - Avoid regenerating /usr/include/dirac/libdirac_common/dirac-stdint.h,
      the only difference among the arch-specific copies is just a comment.
    
    Closes: #658910
    Thanks: Jakub Wilk for the report.

diff --git a/debian/clean b/debian/clean
new file mode 100644
index 0000000..a7935d0
--- /dev/null
+++ b/debian/clean
@@ -0,0 +1 @@
+libdirac_common/dirac-stdint.h
diff --git a/debian/dirac-stdint.h b/debian/dirac-stdint.h
new file mode 100644
index 0000000..dc1e83f
--- /dev/null
+++ b/debian/dirac-stdint.h
@@ -0,0 +1,8 @@
+#ifndef _DIRAC_LIBDIRAC_COMMON_DIRAC_STDINT_H
+#define _DIRAC_LIBDIRAC_COMMON_DIRAC_STDINT_H 1
+#ifndef _GENERATED_STDINT_H
+#define _GENERATED_STDINT_H "dirac 1.0.2"
+#define _STDINT_HAVE_STDINT_H 1
+#include <stdint.h>
+#endif
+#endif
diff --git a/debian/patches/multiarch.patch b/debian/patches/multiarch.patch
new file mode 100644
index 0000000..7fe2920
--- /dev/null
+++ b/debian/patches/multiarch.patch
@@ -0,0 +1,17 @@
+Subject: Avoid regenerating dirac-stdint.h.
+Author: Alessio Treglia <alessio at debian.org>
+Forwarded: not-needed
+---
+ configure.ac |    1 -
+ 1 file changed, 1 deletion(-)
+
+--- dirac.orig/configure.ac
++++ dirac/configure.ac
+@@ -100,7 +100,6 @@ AC_LANG_POP(C++)
+ dnl ** We probably need this line, but not now
+ dnl AC_CHECK_HEADERS(stdint.h unistd.h fcntl.h)
+ 
+-AX_CREATE_STDINT_H([libdirac_common/dirac-stdint.h])
+ 
+ dnl -----------------------------------------------
+ dnl Checks for libraries.
diff --git a/debian/patches/series b/debian/patches/series
index 58f3719..9d53a03 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ build-system-modifications.patch
 bootstrap.patch
 gcc45.patch
 gcc46.patch
+multiarch.patch
diff --git a/debian/rules b/debian/rules
index ce2eb52..06fa7bf 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,3 +2,7 @@
 
 %:
 	dh $@ --parallel
+
+override_dh_auto_configure:
+	dh_auto_configure
+	cp debian/dirac-stdint.h libdirac_common/

-- 
dirac packaging