[SCM] Packaging for Gargoyle, IF player branch, master, updated. upstream/2009-08-25-4-g8238c44

[Sylvain Beucler]

The following commit has been merged in the master branch:
commit 8238c44fa2bddb8dfa433ace62a12ba91532d31e
Author: Sylvain Beucler <beuc at beuc.net>
Date:   Sat Sep 12 12:25:03 2009 +0200

    Don't link to -lsmpeg -lvorbisfile directly

diff --git a/debian/patches/sdl_sound_debian.patch b/debian/patches/sdl_sound_debian.patch
index 32f4fbd..4f88f2b 100644
--- a/debian/patches/sdl_sound_debian.patch
+++ b/debian/patches/sdl_sound_debian.patch
@@ -1,26 +1,27 @@
 Description: dynamically link SDL_sound
  Should be used upstream in the next release, since statically linking
- was only used to work-around an old bug in SDL_sound
-Origin: upstream, http://groups.google.com/group/garglk-dev/browse_thread/thread/62a038ac4986d2a
+ was only used to work-around an old bug in SDL_sound.
+ I'm discussing a refinement with them.
+Origin: http://groups.google.com/group/garglk-dev/browse_thread/thread/62a038ac4986d2a
 Author: Ben Cressey <bcressey at gmail.com>, Sylvain Beucler <beuc at beuc.net>
 
-Index: gargoyle-free-2009-08-25/Jamrules
+Index: gargoyle-free/Jamrules
 ===================================================================
---- gargoyle-free-2009-08-25.orig/Jamrules	2009-09-12 00:53:56.000000000 +0200
-+++ gargoyle-free-2009-08-25/Jamrules	2009-09-12 00:54:15.000000000 +0200
+--- gargoyle-free.orig/Jamrules	2009-09-12 11:56:00.000000000 +0200
++++ gargoyle-free/Jamrules	2009-09-12 12:10:54.000000000 +0200
 @@ -54,7 +54,7 @@
  	if $(USESDL)
  	{
  	    GARGLKCCFLAGS += -I/usr/include/SDL ;
 -	    SHRLINKLIBS += -lSDL_mixer -lSDL -lsmpeg -lvorbisfile ;
-+	    SHRLINKLIBS += -lSDL_mixer -lSDL -lSDL_sound -lsmpeg -lvorbisfile ;
++	    SHRLINKLIBS += -lSDL_mixer -lSDL -lSDL_sound ;
  	}
  
      case SOLARIS :
-Index: gargoyle-free-2009-08-25/garglk/Jamfile
+Index: gargoyle-free/garglk/Jamfile
 ===================================================================
---- gargoyle-free-2009-08-25.orig/garglk/Jamfile	2009-09-12 01:00:08.000000000 +0200
-+++ gargoyle-free-2009-08-25/garglk/Jamfile	2009-09-12 01:00:30.000000000 +0200
+--- gargoyle-free.orig/garglk/Jamfile	2009-09-12 11:56:00.000000000 +0200
++++ gargoyle-free/garglk/Jamfile	2009-09-12 12:10:30.000000000 +0200
 @@ -14,11 +14,6 @@
      SubDirHdrs $(TOP) support sdl-1.2.13 ;
  }

-- 
Packaging for Gargoyle, IF player