[Pkg-cli-apps-commits] [SCM] tangerine branch, master, updated. debian/0.3.4-1

[Chow Loong Jin]

The following commit has been merged in the master branch:
commit b548e453d0314835080902580088dd5664ba831b
Author: Chow Loong Jin <hyperair at debian.org>
Date:   Mon Jan 9 02:55:11 2012 +0800

    Drop upstreamed patches
    
     - CVE-2010-3381-insecure-library-loading
     - kfreebsd_use_assemblyrefs_in_configure.ac.patch

diff --git a/debian/patches/CVE-2010-3381-insecure-library-loading b/debian/patches/CVE-2010-3381-insecure-library-loading
deleted file mode 100644
index d5beffc..0000000
--- a/debian/patches/CVE-2010-3381-insecure-library-loading
+++ /dev/null
@@ -1,24 +0,0 @@
-Index: tangerine.git/Tangerine.Daemon/tangerine.in
-===================================================================
---- tangerine.git.orig/Tangerine.Daemon/tangerine.in	2010-10-24 16:58:40.074049837 +0100
-+++ tangerine.git/Tangerine.Daemon/tangerine.in	2010-10-24 16:58:14.092044082 +0100
-@@ -4,7 +4,7 @@
- libdir=@libdir@
- includedir=@includedir@
- 
--export LD_LIBRARY_PATH=@libdir@/tangerine:$LD_LIBRARY_PATH
-+export LD_LIBRARY_PATH=@libdir@/tangerine${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
- export MONO_PATH=$MONO_PATH:@BANSHEE_INDEXER_DLL@
- 
- if test "x$TANGERINE_DEBUG" != "x"; then \
-Index: tangerine.git/TangerineProperties/tangerine-properties.in
-===================================================================
---- tangerine.git.orig/TangerineProperties/tangerine-properties.in	2010-10-24 16:58:39.834031305 +0100
-+++ tangerine.git/TangerineProperties/tangerine-properties.in	2010-10-24 16:58:35.203673858 +0100
-@@ -5,5 +5,5 @@
- libdir=@libdir@
- includedir=@includedir@
- 
--export LD_LIBRARY_PATH=@libdir@/tangerine:$LD_LIBRARY_PATH
-+export LD_LIBRARY_PATH=@libdir@/tangerine${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
- exec -a tangerine-properties mono @libdir@/tangerine/tangerine-properties.exe "$@"
diff --git a/debian/patches/kfreebsd_use_assemblyrefs_in_configure.ac.patch b/debian/patches/kfreebsd_use_assemblyrefs_in_configure.ac.patch
deleted file mode 100644
index e5f586e..0000000
--- a/debian/patches/kfreebsd_use_assemblyrefs_in_configure.ac.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-Index: tangerine.git/configure.ac
-===================================================================
---- tangerine.git.orig/configure.ac	2010-10-24 16:55:23.438870031 +0100
-+++ tangerine.git/configure.ac	2010-10-24 16:55:31.419486112 +0100
-@@ -117,6 +117,54 @@
-         build_session_plugin="yes"
-         platform="LINUX"
-         ;;
-+    *-*-kfreebsd*)
-+        PKG_CHECK_MODULES(GLIB_SHARP_20, glib-sharp-2.0)
-+        AC_SUBST(GLIB_SHARP_20_LIBS)
-+
-+        PKG_CHECK_MODULES(GTK_SHARP_20, gtk-sharp-2.0)
-+        AC_SUBST(GTK_SHARP_LIBS_20)
-+
-+        PKG_CHECK_MODULES(GLADE_SHARP_20, glade-sharp-2.0)
-+        AC_SUBST(GLADE_SHARP_LIBS_20)
-+
-+        PKG_CHECK_MODULES(NDESK_DBUS_10, ndesk-dbus-1.0)
-+        AC_SUBST([NDESK_DBUS_10_LIBS])
-+
-+        PKG_CHECK_MODULES(NDESK_DBUS_GLIB_10, ndesk-dbus-glib-1.0)
-+        AC_SUBST([NDESK_DBUS_GLIB_10_LIBS])
-+
-+        PKG_CHECK_MODULES(X_SESSION, sm)
-+        AC_SUBST([X_SESSION_LIBS])
-+
-+        have_inotify="no"
-+        build_gui="yes"
-+        build_session_plugin="yes"
-+        platform="LINUX"
-+        ;;
-+    *-*-kfreebsd*)
-+        PKG_CHECK_MODULES(GLIB_SHARP_20, glib-sharp-2.0)
-+        AC_SUBST(GLIB_SHARP_20_LIBS)
-+
-+        PKG_CHECK_MODULES(GTK_SHARP_20, gtk-sharp-2.0)
-+        AC_SUBST(GTK_SHARP_LIBS_20)
-+
-+        PKG_CHECK_MODULES(GLADE_SHARP_20, glade-sharp-2.0)
-+        AC_SUBST(GLADE_SHARP_LIBS_20)
-+
-+        PKG_CHECK_MODULES(NDESK_DBUS_10, ndesk-dbus-1.0)
-+        AC_SUBST([NDESK_DBUS_10_LIBS])
-+
-+        PKG_CHECK_MODULES(NDESK_DBUS_GLIB_10, ndesk-dbus-glib-1.0)
-+        AC_SUBST([NDESK_DBUS_GLIB_10_LIBS])
-+
-+        PKG_CHECK_MODULES(X_SESSION, sm)
-+        AC_SUBST([X_SESSION_LIBS])
-+
-+        have_inotify="no"
-+        build_gui="yes"
-+        build_session_plugin="yes"
-+        platform="LINUX"
-+        ;;
-     *-*-darwin*)
-         have_inotify="no"
-         build_gui="no"
diff --git a/debian/patches/series b/debian/patches/series
index ebfe800..76beab4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,2 @@
 port_file_plugin_to_db4o_8.0.patch
-kfreebsd_use_assemblyrefs_in_configure.ac.patch
-CVE-2010-3381-insecure-library-loading
 dbus-sharp.patch

-- 
tangerine