summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog10
-rw-r--r--gconf/gstreamer.schemas.in20
-rw-r--r--gst-libs/gst/gconf/Makefile.am2
-rw-r--r--pkgconfig/gstreamer-interfaces-uninstalled.pc.in1
-rw-r--r--pkgconfig/gstreamer-libs-uninstalled.pc.in1
-rw-r--r--pkgconfig/gstreamer-play-uninstalled.pc.in1
6 files changed, 21 insertions, 14 deletions
diff --git a/ChangeLog b/ChangeLog
index 193a43fa..8d5c79f7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2004-03-05 Thomas Vander Stichele <thomas at apestaart dot org>
+
+ * gconf/gstreamer.schemas.in:
+ * gst-libs/gst/gconf/Makefile.am:
+ version installation path the same way as for 0.6
+ * pkgconfig/gstreamer-interfaces-uninstalled.pc.in:
+ * pkgconfig/gstreamer-libs-uninstalled.pc.in:
+ * pkgconfig/gstreamer-play-uninstalled.pc.in:
+ remove comment that was fixed
+
2004-03-05 David Schleef <ds@schleef.org>
* gst/qtdemux/qtdemux.c: (gst_qtdemux_get_src_formats),
diff --git a/gconf/gstreamer.schemas.in b/gconf/gstreamer.schemas.in
index ac38edfe..e40af399 100644
--- a/gconf/gstreamer.schemas.in
+++ b/gconf/gstreamer.schemas.in
@@ -1,8 +1,8 @@
<gconfschemafile>
<schemalist>
<schema>
- <key>/schemas/system/gstreamer-@GST_MAJORMINOR@/default/audiosink</key>
- <applyto>/system/gstreamer-@GST_MAJORMINOR@/default/audiosink</applyto>
+ <key>/schemas/system/gstreamer/@GST_MAJORMINOR@/default/audiosink</key>
+ <applyto>/system/gstreamer/@GST_MAJORMINOR@/default/audiosink</applyto>
<owner>gstreamer</owner>
<type>string</type>
<default>osssink</default>
@@ -12,8 +12,8 @@
</locale>
</schema>
<schema>
- <key>/schemas/system/gstreamer-@GST_MAJORMINOR@/default/videosink</key>
- <applyto>/system/gstreamer-@GST_MAJORMINOR@/default/videosink</applyto>
+ <key>/schemas/system/gstreamer/@GST_MAJORMINOR@/default/videosink</key>
+ <applyto>/system/gstreamer/@GST_MAJORMINOR@/default/videosink</applyto>
<owner>gstreamer</owner>
<type>string</type>
<default>xvimagesink</default>
@@ -23,8 +23,8 @@
</locale>
</schema>
<schema>
- <key>/schemas/system/gstreamer-@GST_MAJORMINOR@/default/audiosrc</key>
- <applyto>/system/gstreamer-@GST_MAJORMINOR@/default/audiosrc</applyto>
+ <key>/schemas/system/gstreamer/@GST_MAJORMINOR@/default/audiosrc</key>
+ <applyto>/system/gstreamer/@GST_MAJORMINOR@/default/audiosrc</applyto>
<owner>gstreamer</owner>
<type>string</type>
<default>osssrc</default>
@@ -34,8 +34,8 @@
</locale>
</schema>
<schema>
- <key>/schemas/system/gstreamer-@GST_MAJORMINOR@/default/videosrc</key>
- <applyto>/system/gstreamer-@GST_MAJORMINOR@/default/videosrc</applyto>
+ <key>/schemas/system/gstreamer/@GST_MAJORMINOR@/default/videosrc</key>
+ <applyto>/system/gstreamer/@GST_MAJORMINOR@/default/videosrc</applyto>
<owner>gstreamer</owner>
<type>string</type>
<default>v4lsrc</default>
@@ -45,8 +45,8 @@
</locale>
</schema>
<schema>
- <key>/schemas/system/gstreamer-@GST_MAJORMINOR@/default/visualization</key>
- <applyto>/system/gstreamer-@GST_MAJORMINOR@/default/visualization</applyto>
+ <key>/schemas/system/gstreamer/@GST_MAJORMINOR@/default/visualization</key>
+ <applyto>/system/gstreamer/@GST_MAJORMINOR@/default/visualization</applyto>
<owner>gstreamer</owner>
<type>string</type>
<default>goom</default>
diff --git a/gst-libs/gst/gconf/Makefile.am b/gst-libs/gst/gconf/Makefile.am
index b7a409ef..64bebf9f 100644
--- a/gst-libs/gst/gconf/Makefile.am
+++ b/gst-libs/gst/gconf/Makefile.am
@@ -10,7 +10,7 @@ libgstgconf_@GST_MAJORMINOR@include_HEADERS = gconf.h
noinst_PROGRAMS = test-gconf
# add define for GST_GCONF_DIR
-DIR_CFLAGS=-DGST_GCONF_DIR=\"/system/gstreamer-@GST_MAJORMINOR@\"
+DIR_CFLAGS=-DGST_GCONF_DIR=\"/system/gstreamer/@GST_MAJORMINOR@\"
test_gconf_CFLAGS = $(GST_CFLAGS) $(GCONF_CFLAGS) $(DIR_CFLAGS)
test_gconf_LDADD = $(GST_LIBS) $(GCONF_LIBS) libgstgconf-@GST_MAJORMINOR@.la
diff --git a/pkgconfig/gstreamer-interfaces-uninstalled.pc.in b/pkgconfig/gstreamer-interfaces-uninstalled.pc.in
index 3c1665f6..ae346b76 100644
--- a/pkgconfig/gstreamer-interfaces-uninstalled.pc.in
+++ b/pkgconfig/gstreamer-interfaces-uninstalled.pc.in
@@ -1,4 +1,3 @@
-# the standard variables don't make sense for an uninstalled copy
prefix=
exec_prefix=
libdir=${pcfiledir}/../gst-libs/gst
diff --git a/pkgconfig/gstreamer-libs-uninstalled.pc.in b/pkgconfig/gstreamer-libs-uninstalled.pc.in
index 55c9bc54..46161505 100644
--- a/pkgconfig/gstreamer-libs-uninstalled.pc.in
+++ b/pkgconfig/gstreamer-libs-uninstalled.pc.in
@@ -1,4 +1,3 @@
-# the standard variables don't make sense for an uninstalled copy
prefix=
exec_prefix=
libdir=${pcfiledir}/../gst-libs/gst
diff --git a/pkgconfig/gstreamer-play-uninstalled.pc.in b/pkgconfig/gstreamer-play-uninstalled.pc.in
index 7d77ee82..27cdf6ff 100644
--- a/pkgconfig/gstreamer-play-uninstalled.pc.in
+++ b/pkgconfig/gstreamer-play-uninstalled.pc.in
@@ -1,4 +1,3 @@
-# the standard variables don't make sense for an uninstalled copy
prefix=
exec_prefix=
libdir=${pcfiledir}/../gst-libs/gst/play