add patch for pkg-config stuff to release

Original commit message from CVS:
add patch for pkg-config stuff to release

7 files changed, 22 insertions, 38 deletions

diff --git a/ChangeLog b/ChangeLog
index aa5647c49..eed814dcc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,14 +1,3 @@
-2004-02-05  Thomas Vander Stichele  <thomas at apestaart dot org>
-
-	* gst-libs/gst/gconf/gstreamer-gconf-uninstalled.pc.in:
-	* pkgconfig/gstreamer-interfaces-uninstalled.pc.in:
-	* pkgconfig/gstreamer-libs-uninstalled.pc.in:
-	* pkgconfig/gstreamer-play-uninstalled.pc.in:
-          reworked patch by David Lehn to fix libdir and includedir for
-          uninstalled libraries
-          removed play and gconf from gstreamer-libs since they have their
-          own pkgconfig files
-
 2004-02-04  David Schleef  <ds@schleef.org>
 
 	* gst/wavparse/gstwavparse.c: (gst_wavparse_parse_fmt): Fix a caps
diff --git a/common b/common
-Subproject 90e64b98d566fd8df793cfc0a9b08b8e5fb356d
+Subproject 90097339543fb0a705447b599d7a36138cba423
diff --git a/pkgconfig/gstreamer-gconf-uninstalled.pc.in b/pkgconfig/gstreamer-gconf-uninstalled.pc.in
index 1255a6bfc..ad3439b48 100644
--- a/pkgconfig/gstreamer-gconf-uninstalled.pc.in
+++ b/pkgconfig/gstreamer-gconf-uninstalled.pc.in
@@ -1,13 +1,13 @@
 # the standard variables don't make sense for an uninstalled copy
 prefix=
 exec_prefix=
-libdir=${pcfiledir}/../gst-libs/gst/gconf
-includedir=${pcfiledir}/../gst-libs
+libdir=${pcfiledir}
+includedir=${pcfiledir}
 
 Name: GStreamer GConf Library, uninstalled
 Description: Streaming media framework, GConf support library, not installed
-Requires: gstreamer-@GST_MAJORMINOR@ >= @VERSION@
+Requires: gstreamer >= @VERSION@
 Version: @VERSION@
 
-Libs: ${libdir}/libgstgconf-@GST_MAJORMINOR@.la
-Cflags: -I${includedir}
+Libs: ${pcfiledir}/../gst-libs/gst/gconf/libgstgconf-@GST_MAJORMINOR@.la
+Cflags: -I${pcfiledir}/../gst-libs
diff --git a/pkgconfig/gstreamer-interfaces-uninstalled.pc.in b/pkgconfig/gstreamer-interfaces-uninstalled.pc.in
index 3c1665f63..1637411b6 100644
--- a/pkgconfig/gstreamer-interfaces-uninstalled.pc.in
+++ b/pkgconfig/gstreamer-interfaces-uninstalled.pc.in
@@ -1,13 +1,13 @@
 # the standard variables don't make sense for an uninstalled copy
 prefix=
 exec_prefix=
-libdir=${pcfiledir}/../gst-libs/gst
-includedir=${pcfiledir}/../gst-libs
+libdir=${pcfiledir}
+includedir=${pcfiledir}
 
 Name: GStreamer Interfaces library, uninstalled
 Description: Streaming-media framework, interfaces library, not installed
-Requires: gstreamer-@GST_MAJORMINOR@ >= @VERSION@
+Requires: gstreamer >= @VERSION@
 Version: @VERSION@
 
-Libs: ${libdir}/libgstinterfaces-@GST_MAJORMINOR@.la
-Cflags: -I${includedir}
+Libs: ${pcfiledir}/../gst-libs/gst/libgstinterfaces-@GST_MAJORMINOR@.la
+Cflags: -I${pcfiledir}/../gst-libs
diff --git a/pkgconfig/gstreamer-libs-uninstalled.pc.in b/pkgconfig/gstreamer-libs-uninstalled.pc.in
index 79a949b10..ba492f3f4 100644
--- a/pkgconfig/gstreamer-libs-uninstalled.pc.in
+++ b/pkgconfig/gstreamer-libs-uninstalled.pc.in
@@ -1,13 +1,9 @@
-# the standard variables don't make sense for an uninstalled copy
-prefix=
-exec_prefix=
-libdir=${pcfiledir}/../gst-libs/gst
-includedir=${pcfiledir}/../gst-libs
-
 Name: GStreamer Uninstalled Media-Specific Libraries
 Description: Streaming-media framework media-specific libraries, not installed
 Version: @VERSION@
-Requires: gstreamer-@GST_MAJORMINOR@ = @VERSION@
-
-Libs: -L${libdir}/audio -L${libdir}/video
-Cflags: -I${includedir}
+Requires: gstreamer >= @VERSION@
+Libs: -L${pcfiledir}/../gst-libs/gst/gconf \
+	-L${pcfiledir}/../gst-libs/gst/audio \
+	-L${pcfiledir}/../gst-libs/gst/video \
+	-L${pcfiledir}/../gst-libs/gst/play
+Cflags: -I${pcfiledir}/../gst-libs
diff --git a/pkgconfig/gstreamer-play-uninstalled.pc.in b/pkgconfig/gstreamer-play-uninstalled.pc.in
index 7d77ee82d..6bc27e77e 100644
--- a/pkgconfig/gstreamer-play-uninstalled.pc.in
+++ b/pkgconfig/gstreamer-play-uninstalled.pc.in
@@ -1,14 +1,13 @@
 # the standard variables don't make sense for an uninstalled copy
 prefix=
 exec_prefix=
-libdir=${pcfiledir}/../gst-libs/gst/play
-includedir=${pcfiledir}/../gst-libs
+libdir=${pcfiledir}
+includedir=${pcfiledir}
 
 Name: GStreamer Play Library, uninstalled
 Description: Streaming-media framework, play libraries, not installed
-Requires: gstreamer-@GST_MAJORMINOR@ >= @VERSION@ \
-          gstreamer-control-@GST_MAJORMINOR@ >= @VERSION@
+Requires: gstreamer >= @VERSION@ gstreamer-control >= @VERSION@
 Version: @VERSION@
 
-Libs: ${libdir}/libgstplay-@GST_MAJORMINOR@.la
-Cflags: -I${includedir}
+Libs: ${pcfiledir}/../gst-libs/gst/play/libgstplay-@GST_MAJORMINOR@.la
+Cflags: -I${pcfiledir}/../gst-libs
diff --git a/po/nl.po b/po/nl.po
index e9e06c428..d1e647393 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gst-plugins\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-02-04 22:48+0100\n"
+"POT-Creation-Date: 2004-02-05 19:24+0100\n"
 "PO-Revision-Date: 2004-02-02 23:08+0100\n"
 "Last-Translator: Thomas Vander Stichele <thomas@apestaart.org>\n"
 "Language-Team: Dutch <nl@li.org>\n"