[SCM] Packaging for Gargoyle - graphical player for Interactive Fiction games branch, master, updated. debian/2011.1-1-3-ge7905b1

[Sylvain Beucler]

The following commit has been merged in the master branch:
commit 64e379517769855b1e3bf703e5bb0f6b36ccfbb0
Author: Sylvain Beucler <beuc at beuc.net>
Date:   Thu May 24 22:02:43 2012 +0200

    Fix FTBFS

diff --git a/debian/changelog b/debian/changelog
index 8628a7f..6dd2e66 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+gargoyle-free (2011.1-2) unstable; urgency=low
+
+  * Fix FTBFS: sdl-sound1.2-1.0.3-6 stripped its depencies, and the
+    gargoyle build system made unnecessary references to -lsmpeg and
+    -lvorbis that are normally used when building with the bundled copy of
+    sdl-sound. (Closes: #674336)
+  * Fix FTBFS: -lrt was missing. This has never been a problem so I
+    suspect we previously got it indirectly through pkg-config --libs.
+
+ -- Sylvain Beucler <beuc at debian.org>  Thu, 24 May 2012 22:00:30 +0200
+
 gargoyle-free (2011.1-1) unstable; urgency=low
 
   * New upstream release
diff --git a/debian/patches/ignore_bundled_libraries.patch b/debian/patches/ignore_bundled_libraries.patch
index 68e144b..3801e1d 100644
--- a/debian/patches/ignore_bundled_libraries.patch
+++ b/debian/patches/ignore_bundled_libraries.patch
@@ -5,8 +5,8 @@ Last-Update: 2012-02-19
 
 Index: gargoyle-free/support/Jamfile
 ===================================================================
---- gargoyle-free.orig/support/Jamfile	2012-02-19 12:37:48.000000000 +0100
-+++ gargoyle-free/support/Jamfile	2012-02-19 12:50:45.000000000 +0100
+--- gargoyle-free.orig/support/Jamfile	2012-02-20 17:05:53.000000000 +0100
++++ gargoyle-free/support/Jamfile	2012-05-24 21:08:25.000000000 +0200
 @@ -24,47 +24,3 @@
          level9.c magscrolls.c tads.c tads2.c tads3.c zcode.c
          ;
@@ -55,3 +55,16 @@ Index: gargoyle-free/support/Jamfile
 -    }
 -}
 -
+Index: gargoyle-free/Jamrules
+===================================================================
+--- gargoyle-free.orig/Jamrules	2012-05-24 21:08:24.000000000 +0200
++++ gargoyle-free/Jamrules	2012-05-24 21:10:55.000000000 +0200
+@@ -94,7 +94,7 @@
+         if $(USESDL) = yes
+         {
+             GARGLKCCFLAGS += -I/usr/include/SDL ;
+-            GARGLKLIBS += -lSDL_mixer -lSDL_sound -lSDL -lsmpeg -lvorbisfile ;
++            GARGLKLIBS += -lSDL_mixer -lSDL_sound -lSDL ;
+         }
+ 
+         if $(STATIC) { LINKLIBS += $(GARGLKLIBS) ; }
diff --git a/debian/patches/librt.patch b/debian/patches/librt.patch
new file mode 100644
index 0000000..f5d05ea
--- /dev/null
+++ b/debian/patches/librt.patch
@@ -0,0 +1,21 @@
+Description: requires -lrt
+  Well, it has been a requirement for a while AFAICS, so my guess is
+  that it was previously gotten indirectly through pkg-config --libs,
+  but not anymore.
+Forwarded: http://groups.google.com/group/garglk-dev/browse_thread/thread/a44d0c7783a32f7d
+Author: Sylvain Beucler <beuc at beuc.net>
+Last-Update: 2012-05-24
+
+Index: gargoyle-free/Jamrules
+===================================================================
+--- gargoyle-free.orig/Jamrules	2012-05-24 21:39:10.000000000 +0200
++++ gargoyle-free/Jamrules	2012-05-24 21:39:23.000000000 +0200
+@@ -88,7 +88,7 @@
+             PKGCONFIG = "pkg-config freetype2 gtk+-x11-2.0 gdk-x11-2.0 gobject-2.0 glib-2.0 fontconfig" ;
+         }
+         GARGLKCCFLAGS = "`$(PKGCONFIG) --cflags`" -fPIC ;
+-        GARGLKLIBS = "`$(PKGCONFIG) --libs`" -ljpeg -lpng -lz ;
++        GARGLKLIBS = "`$(PKGCONFIG) --libs`" -ljpeg -lpng -lz -lrt ;
+         LINKLIBS = -lz -lm "`$(PKGCONFIG) --libs`" ;
+ 
+         if $(USESDL) = yes
diff --git a/debian/patches/series b/debian/patches/series
index c55f421..a788809 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@ ignore_bundled_libraries.patch
 desktop_menu_entry_crs.patch
 desktop_menu_entry.patch
 fhs_locate_private_binaries.patch
+librt.patch

-- 
Packaging for Gargoyle - graphical player for Interactive Fiction games