[SCM] liblivemedia packaging branch, master, updated. debian/2008.07.25-2-12-g51e2a07

[xtophe-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 7abe85fe49d884bd7403b15b82403cf172a37e46
Author: Christophe Mutricy <xtophe at videolan.org>
Date:   Sat Dec 5 14:03:07 2009 +0000

    Remove patches applied upstream

diff --git a/debian/patches/010_proper_link_order.diff b/debian/patches/010_proper_link_order.diff
deleted file mode 100644
index 2e0ecea..0000000
--- a/debian/patches/010_proper_link_order.diff
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: liblivemedia/mediaServer/Makefile.tail
-===================================================================
---- liblivemedia.orig/mediaServer/Makefile.tail	2009-07-11 23:38:24.000000000 +0100
-+++ liblivemedia/mediaServer/Makefile.tail	2009-07-12 00:00:10.000000000 +0100
-@@ -25,7 +25,7 @@
- GROUPSOCK_DIR = ../groupsock
- GROUPSOCK_LIB = $(GROUPSOCK_DIR)/libgroupsock.$(LIB_SUFFIX)
- LOCAL_LIBS =	$(LIVEMEDIA_LIB) $(GROUPSOCK_LIB) \
--		$(USAGE_ENVIRONMENT_LIB) $(BASIC_USAGE_ENVIRONMENT_LIB)
-+		$(BASIC_USAGE_ENVIRONMENT_LIB) $(USAGE_ENVIRONMENT_LIB)
- LIBS =			$(LOCAL_LIBS) $(LIBS_FOR_CONSOLE_APPLICATION)
- 
- live555MediaServer$(EXE):	$(MEDIA_SERVER_OBJS) $(LOCAL_LIBS)
-Index: liblivemedia/testProgs/Makefile.tail
-===================================================================
---- liblivemedia.orig/testProgs/Makefile.tail	2009-07-11 23:38:24.000000000 +0100
-+++ liblivemedia/testProgs/Makefile.tail	2009-07-12 00:00:10.000000000 +0100
-@@ -59,7 +59,7 @@
- GROUPSOCK_DIR = ../groupsock
- GROUPSOCK_LIB = $(GROUPSOCK_DIR)/libgroupsock.$(LIB_SUFFIX)
- LOCAL_LIBS =	$(LIVEMEDIA_LIB) $(GROUPSOCK_LIB) \
--		$(USAGE_ENVIRONMENT_LIB) $(BASIC_USAGE_ENVIRONMENT_LIB)
-+		$(BASIC_USAGE_ENVIRONMENT_LIB) $(USAGE_ENVIRONMENT_LIB)
- LIBS =			$(LOCAL_LIBS) $(LIBS_FOR_CONSOLE_APPLICATION)
- 
- testMP3Streamer$(EXE):	$(MP3_STREAMER_OBJS) $(LOCAL_LIBS)
diff --git a/debian/patches/010_static_link.diff b/debian/patches/010_static_link.diff
deleted file mode 100644
index 884dcca..0000000
--- a/debian/patches/010_static_link.diff
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: liblivemedia/config.linux
-===================================================================
---- liblivemedia.orig/config.linux	2009-07-12 00:00:10.000000000 +0100
-+++ liblivemedia/config.linux	2009-07-12 00:00:10.000000000 +0100
-@@ -9,8 +9,8 @@
- LINK =			c++ -o
- LINK_OPTS =		-L.
- CONSOLE_LINK_OPTS =	$(LINK_OPTS)
--LIBRARY_LINK =		ld -o
--LIBRARY_LINK_OPTS =	$(LINK_OPTS) -r -Bstatic
-+LIBRARY_LINK =		ar rcvu 
-+LIBRARY_LINK_OPTS =	
- LIB_SUFFIX =			a
- LIBS_FOR_CONSOLE_APPLICATION =
- LIBS_FOR_GUI_APPLICATION =
diff --git a/debian/patches/series b/debian/patches/series
index a26612e..e987893 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,4 @@
 010_propagate_cflags.diff 
-010_proper_link_order.diff 
-010_static_link.diff 
 020_invalid_casts.diff 
 021_ip_mreq_source.diff
 022_safe_setlocale.diff 

-- 
liblivemedia packaging