[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 e7905b1196542544ab3928de9cf2b7a41002364f
Author: Sylvain Beucler <beuc at beuc.net>
Date:   Thu May 24 22:58:55 2012 +0200

    Minimize ignore_bundled_libraries.patch

diff --git a/debian/changelog b/debian/changelog
index 46804c6..8fb3c7a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+gargoyle-free (2011.1-3) UNRELEASED; urgency=low
+
+  * Minimize ignore_bundled_libraries.patch.
+
+ -- Sylvain Beucler <beuc at debian.org>  Thu, 24 May 2012 22:58:00 +0200
+
 gargoyle-free (2011.1-2) unstable; urgency=low
 
   * Fix FTBFS: sdl-sound1.2-1.0.3-6 stripped its depencies, and the
@@ -8,7 +14,7 @@ gargoyle-free (2011.1-2) unstable; urgency=low
     suspect we previously got it indirectly through pkg-config --libs.
   * Bump Standards-Version to 3.9.3
 
- -- Sylvain Beucler <beuc at debian.org>  Thu, 24 May 2012 22:00:30 +0200
+ -- Sylvain Beucler <beuc at debian.org>  Thu, 24 May 2012 22:57:48 +0200
 
 gargoyle-free (2011.1-1) unstable; urgency=low
 
diff --git a/debian/patches/ignore_bundled_libraries.patch b/debian/patches/ignore_bundled_libraries.patch
index 3801e1d..4228b1c 100644
--- a/debian/patches/ignore_bundled_libraries.patch
+++ b/debian/patches/ignore_bundled_libraries.patch
@@ -1,64 +1,12 @@
 Description: don't build the (deleted) bundled libraries in the 'support' directory
-Forwarded: not-needed
+Forwarded: http://groups.google.com/group/garglk-dev/browse_thread/thread/a44d0c7783a32f7d
 Author: Sylvain Beucler <beuc at beuc.net>
 Last-Update: 2012-02-19
 
-Index: gargoyle-free/support/Jamfile
-===================================================================
---- 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
-         ;
- }
--
--#
--# SDL Sound
--#
--
--if $(USESDL) = yes
--{
--    SubDir TOP support ;
--    ObjDir SDL_sound ;
--
--    SubDirCcFlags
--        -DSOUND_SUPPORTS_OGG
--        -DSOUND_SUPPORTS_SMPEG
--        #-DSOUND_USE_ALTCVT
--        ;
--
--    if $(OS) = MINGW   { SubDirCcFlags -DSDL_SOUND_DLL_EXPORTS ; }
--    if $(OS) = SOLARIS { SubDirCcFlags -I/usr/include/SDL -fPIC ; }
--    if $(OS) = MACOSX  { SubDirCcFlags -I/opt/local/include/SDL -fPIC ; }
--
--    SEARCH_SOURCE =
--        [ FDirName $(TOP) support sdl_sound ]
--        [ FDirName $(TOP) support sdl_sound decoders ]
--        ;
--
--    if $(OS) = MINGW
--    {
--        SEARCH_SOURCE += [ FDirName $(SUBDIR) sdl ] ;
--
--        SharedLibrary SDL_sound :
--            ogg.c smpeg.c audio_convert.c alt_audio_convert.c extra_rwops.c SDL_sound.c
--            ;
--
--        SharedLinkLibrariesOnSharedLibrary SDL_sound : smpeg libvorbisfile-3 ;
--    }
--
--    if $(OS) = SOLARIS || $(OS) = MACOSX
--    {
--        Library SDL_sound_static :
--            ogg.c smpeg.c audio_convert.c extra_rwops.c SDL_sound.c
--            ;
--    }
--}
--
 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
+--- gargoyle-free.orig/Jamrules	2012-05-24 22:47:24.000000000 +0200
++++ gargoyle-free/Jamrules	2012-05-24 22:47:27.000000000 +0200
 @@ -94,7 +94,7 @@
          if $(USESDL) = yes
          {

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