[Pkg-gstreamer-commits] [SCM] GStreamer Core 1.0 Packaging branch, master, updated. debian/0.11.1-2-21-g928c650

[Sebastian Dröge]

The following commit has been merged in the master branch:
commit fc4dfde8a6df718be4f553fca5f3d9195e5dd669
Author: Sebastian Dröge <sebastian.droege at collabora.co.uk>
Date:   Wed May 2 17:12:41 2012 +0200

    79_multiarch-backwards-compat.patch: Dropped, there's no need for backwards compatibility anymore.

diff --git a/debian/changelog b/debian/changelog
index 873c1c2..dc9866a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,8 +13,10 @@ gstreamer1.0 (0.11.90-1) experimental; urgency=low
 
   [ Sebastian Dröge ]
   * Fix symbols file versions.
+  * 79_multiarch-backwards-compat.patch: Dropped, there's no need for
+    backwards compatibility anymore.
 
- -- Sebastian Dröge <slomo at debian.org>  Wed, 02 May 2012 17:11:52 +0200
+ -- Sebastian Dröge <slomo at debian.org>  Wed, 02 May 2012 17:12:27 +0200
 
 gstreamer0.11 (0.11.1-3) UNRELEASED; urgency=low
 
diff --git a/debian/patches/79_multiarch-backwards-compat.patch b/debian/patches/79_multiarch-backwards-compat.patch
deleted file mode 100644
index 9e9bfdb..0000000
--- a/debian/patches/79_multiarch-backwards-compat.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-=== modified file 'gst/gstregistry.c'
-Index: gstreamer0.11/gst/gstregistry.c
-===================================================================
---- gstreamer0.11.orig/gst/gstregistry.c	2011-12-12 11:37:12.173735080 +0100
-+++ gstreamer0.11/gst/gstregistry.c	2011-12-12 11:50:39.093747189 +0100
-@@ -1507,7 +1507,7 @@
-    * path, and the plugins installed in the user's home directory */
-   plugin_path = g_getenv ("GST_PLUGIN_SYSTEM_PATH");
-   if (plugin_path == NULL) {
--    char *home_plugins;
-+    char *home_plugins, *backwards_compat_plugins;
- 
-     GST_DEBUG ("GST_PLUGIN_SYSTEM_PATH not set");
- 
-@@ -1524,6 +1524,13 @@
-     GST_DEBUG ("scanning main plugins %s", PLUGINDIR);
-     changed |= gst_registry_scan_path_internal (&context, PLUGINDIR);
- 
-+    /* finally, look in the /usr/lib backwards-compatibility path. */
-+    backwards_compat_plugins = g_build_filename ("/usr/lib",
-+        "gstreamer-" GST_API_VERSION, NULL);
-+    GST_DEBUG ("scanning plugins %s", backwards_compat_plugins);
-+    changed |= gst_registry_scan_path_internal (&context, backwards_compat_plugins);
-+    g_free (backwards_compat_plugins);
-+
- #ifdef G_OS_WIN32
-     {
-       char *base_dir;
diff --git a/debian/patches/series b/debian/patches/series
index aa61f96..1858e7c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
-79_multiarch-backwards-compat.patch
 80_ia32-hack.patch
 99_ltmain_as-needed.patch

-- 
GStreamer Core 1.0 Packaging