From 958a6e20a37a13048761b865f0267108ab31b3b2 Mon Sep 17 00:00:00 2001
From: Jan Schmidt <thaytan@mad.scientist.com>
Date: Fri, 8 Feb 2008 00:54:28 +0000
Subject: [PATCH] configure.ac: Make DISABLE_DEPRECATED defined *only* during
 CVS, not during pre-releases or releases.

Original commit message from CVS:
* configure.ac:
Make DISABLE_DEPRECATED defined *only* during CVS, not during
pre-releases or releases.
* docs/faq/gst-uninstalled:
Add gst-plugins-gl
* docs/random/release:
Change one of the steps - we only upload core & base to Gnome FTP
---
 ChangeLog                | 12 ++++++++++++
 common                   |  2 +-
 configure.ac             |  3 ++-
 docs/faq/gst-uninstalled |  2 +-
 docs/random/release      |  2 +-
 5 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 2f56d3ddc2..e907077377 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2008-02-08  Jan Schmidt  <jan.schmidt@sun.com>
+
+	* configure.ac:
+	Make DISABLE_DEPRECATED defined *only* during CVS, not during
+	pre-releases or releases.
+
+	* docs/faq/gst-uninstalled:
+	Add gst-plugins-gl
+
+	* docs/random/release:
+	Change one of the steps - we only upload core & base to Gnome FTP
+
 2008-02-06  Stefan Kost  <ensonic@users.sf.net>
 
 	* gst/gstconfig.h.in:
diff --git a/common b/common
index 3c5473161c..8b37d7ee83 160000
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit 3c5473161ce19a3530bad279b842d542895b1500
+Subproject commit 8b37d7ee833fab1d25b484d8574df3dae231b5f2
diff --git a/configure.ac b/configure.ac
index 9f264d3321..5c99cdda93 100644
--- a/configure.ac
+++ b/configure.ac
@@ -557,7 +557,8 @@ AC_SUBST(PROFILE_CFLAGS)
 # GST_DISABLE_DEPRECATED: hide the visibility of deprecated
 # functionality from the API that gstreamer uses
 # GST_REMOVE_DEPRECATED: don't compile deprecated functionality (breaks ABI)
-if test "x$GST_CVS" = "xyes"; then
+if test "x$PACKAGE_VERSION_NANO" = "x1"; then
+  dnl Define _only_ during CVS (not pre-releases or releases)
   DEPRECATED_CFLAGS="-DGST_DISABLE_DEPRECATED"
 else
   DEPRECATED_CFLAGS=""
diff --git a/docs/faq/gst-uninstalled b/docs/faq/gst-uninstalled
index 7c0adb8577..b764571155 100755
--- a/docs/faq/gst-uninstalled
+++ b/docs/faq/gst-uninstalled
@@ -68,7 +68,7 @@ export LD_LIBRARY_PATH
 export DYLD_LIBRARY_PATH
   
 export PKG_CONFIG_PATH=$GST/prefix/lib/pkgconfig:$GST/gstreamer/pkgconfig:$GST/gst-plugins/pkgconfig:$GST/gst-plugins-base/pkgconfig:$GST/gst-plugins-good/pkgconfig:$GST/gst-python/pkgconfig${PKG_CONFIG_PATH:+:$PKG_CONFIG_PATH}
-export GST_PLUGIN_PATH=$GST/gstreamer:$GST/gst-plugins:$GST/gst-plugins-base:$GST/gst-plugins-good:$GST/gst-plugins-ugly:$GST/gst-plugins-bad:$GST/gst-ffmpeg:$GST/gnonlin:$GST/gst-monkeysaudio:$GST/plugins${GST_PLUGIN_PATH:+:$GST_PLUGIN_PATH}
+export GST_PLUGIN_PATH=$GST/gstreamer:$GST/gst-plugins:$GST/gst-plugins-base:$GST/gst-plugins-good:$GST/gst-plugins-ugly:$GST/gst-plugins-bad:$GST/gst-ffmpeg:$GST/gnonlin:$GST/gst-monkeysaudio:$GST/gst-plugins-gl:$GST/plugins${GST_PLUGIN_PATH:+:$GST_PLUGIN_PATH}
 # don't use any system-installed plug-ins at all
 export GST_PLUGIN_SYSTEM_PATH=
 # set our registry somewhere else so we don't mess up the registry generated
diff --git a/docs/random/release b/docs/random/release
index 4cd94abcad..4f69fc425e 100644
--- a/docs/random/release
+++ b/docs/random/release
@@ -93,7 +93,7 @@ RELEASE PROCEDURE:
     + Edit src/htdocs/news/news.xml and add a new item at the bottom.
   - commit additions to website
   - add versions and milestones in bugzilla
-  - upload new tarballs to gnome ftp
+  - upload new core or base tarballs to gnome ftp
     + e.g:
        scp gstreamer-0.10.42.tar.gz master.gnome.org:
        ssh master.gnome.org