[SCM] Trophy racing game - Packaging information branch, master, updated. debian/1.1.7-1-5-g65c4cc4

[Andreas Moog]

The following commit has been merged in the master branch:
commit 292b9efcc128c42d0a59bc8acc215f6555505abf
Author: Andreas Moog <amoog at ubuntu.com>
Date:   Mon Feb 6 18:47:50 2012 +0100

    debian/patches/use-pkgconfig: drop, included upstream

diff --git a/debian/changelog b/debian/changelog
index 4b61578..4d2aae6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 trophy (2.0.0-1) precise; urgency=low
 
+  * debian/patches/use-pkgconfig: drop, included upstream
   * debian/control,debian/rules: dont' build with dh-autoreconf, not needed
     anymore.
 
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 3448a2c..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-use-pkgconfig
diff --git a/debian/patches/use-pkgconfig b/debian/patches/use-pkgconfig
deleted file mode 100644
index a39d67a..0000000
--- a/debian/patches/use-pkgconfig
+++ /dev/null
@@ -1,34 +0,0 @@
-Description: When building with -Wl,--as-needed, libraries that are passed
- in LDFLAGS are not considered for symbol resolving, they should go into
- LDADD instead. Also, use pkg-config in configure rather than in Makefile.
-Author: Andreas Moog <amoog at ubuntu.com>
-Bug-Debian: http://bugs.debian.org/632562
-Forwarded: http://sourceforge.net/support/tracker.php?aid=3351840
-Last-Update: <2011-07-03>
-
---- trophy-1.1.7.orig/configure.ac
-+++ trophy-1.1.7/configure.ac
-@@ -14,10 +14,12 @@ AC_MSG_CHECKING(ClanLib version)
- 	if test "$have_clan_10" = "yes"; then
- 	    AC_MSG_RESULT(ClanLib 1.0)
- 	    AC_SUBST(CLANLIB_MODULES, ["clanSignals-1.0 clanGL-1.0 clanCore-1.0 clanSound-1.0 clanDisplay-1.0 clanApp-1.0"])
-+	    PKG_CHECK_MODULES([CLANLIB], ["clanSignals-1.0 clanGL-1.0 clanCore-1.0 clanSound-1.0 clanDisplay-1.0 clanApp-1.0"])
- 	else
-         if test "$have_clan_08" = "yes"; then
- 	    AC_MSG_RESULT(ClanLib 0.8)
- 	    AC_SUBST(CLANLIB_MODULES, ["clanSignals-0.8 clanGL-0.8 clanCore-0.8 clanSound-0.8 clanDisplay-0.8 clanApp-0.8"])
-+	    PKG_CHECK_MODULES([CLANLIB], ["clanSignals-0.8 clanGL-0.8 clanCore-0.8 clanSound-0.8 clanDisplay-0.8 clanApp-0.8"])
- 	else
- 	   AC_MSG_RESULT(no)
- 	   AC_MSG_ERROR([Unable to find a compatible version of ClanLib. Check for ClanLib 0.8 or ClanLib 1.0])
---- trophy-1.1.7.orig/src/Makefile.am
-+++ trophy-1.1.7/src/Makefile.am
-@@ -12,6 +12,6 @@ trophy_SOURCES = cagoody.cpp cainfodialo
- 		 caslotselectiondialog.cpp cafogbomb.h caimageview.h camenu.cpp canetclient.h capositiontable.cpp \
- 		 caslotselectiondialog.h
- 
--AM_LDFLAGS = `pkg-config --libs $(CLANLIB_MODULES)`
--INCLUDES = `pkg-config --cflags $(CLANLIB_MODULES)`
-+trophy_LDADD = $(CLANLIB_LIBS)
-+INCLUDES = $(CLANLIB_CFLAGS)
- AM_CPPFLAGS = -DPKGDATADIR=\"$(pkgdatadir)\"

-- 
Trophy racing game - Packaging information