[SCM] portsmf/master: Put header files into portSMF subdirectory to avoid name clashes.

[bdrung at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 4bf159e0f6f8226ee91168d579c963b80a328311
Author: Benjamin Drung <bdrung at ubuntu.com>
Date:   Sun Apr 17 19:12:43 2011 +0200

    Put header files into portSMF subdirectory to avoid name clashes.
    
    Closes: #621873

diff --git a/debian/patches/header-in-subdirectory.patch b/debian/patches/header-in-subdirectory.patch
new file mode 100644
index 0000000..250a9a1
--- /dev/null
+++ b/debian/patches/header-in-subdirectory.patch
@@ -0,0 +1,24 @@
+Description: Put header files into portSMF subdirectory to avoid name clashes.
+Author: Benjamin Drung <bdrung at debian.org>
+Bug-Debian: http://bugs.debian.org/621873
+
+--- a/portSMF.pc.in
++++ b/portSMF.pc.in
+@@ -9,4 +9,4 @@
+ Version: 0.1
+ 
+ Libs: -L${libdir} -lportSMF @LIBS@
+-Cflags: -I${includedir} @CXXFLAGS@
++Cflags: -I${includedir}/portSMF @CXXFLAGS@
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -24,7 +24,8 @@
+ # but that would mean re-organising them here (a subdirectory called portSMF to
+ # keep headers in, add -I$(srcdir)/portSMF/ to AM_CXXFLAGS, change the paths
+ # to the headers here and change the name of the variable to nobase_include_...
+-include_HEADERS = allegro.h \
++library_includedir = $(includedir)/portSMF
++library_include_HEADERS = allegro.h \
+ 	mfmidi.h \
+ 	strparse.h \
+ 	trace.h
diff --git a/debian/patches/series b/debian/patches/series
index 79330eb..2e1b3b7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 libtool-support.patch
 pkgconfig-file.patch
+header-in-subdirectory.patch

-- 
portsmf packaging