use common upload.mak

Original commit message from CVS:
use common upload.mak

diff --git a/ChangeLog b/ChangeLog
index 9483bd0..2237c0b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -57,7 +57,7 @@
 
        * ext/alsa/gstalsasink.c: (gst_alsasink_getcaps),
        (alsasink_parse_spec):
-        query witdh capabilities from alsa, fixes #338919
+         query witdh capabilities from alsa, fixes #338919
 
 2006-04-28  Wim Taymans  <wim@fluendo.com>
 

diff --git a/common b/common
index a6710e6..6b67aa6 160000 (submodule)
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit a6710e67fd82147e32a18f1b63177583faffd498
+Subproject commit 6b67aa6dd111fb139e1be0f6a386e3ff84cce091

diff --git a/docs/Makefile.am b/docs/Makefile.am
index 3d88b9f..b1feeb8 100644 (file)
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -8,7 +8,6 @@ SUBDIRS = $(GTK_DOC_DIRS)
 DIST_SUBDIRS = libs plugins
 
 EXTRA_DIST = \
-        upload.mak \
         version.entities.in
 
 upload:

diff --git a/docs/libs/Makefile.am b/docs/libs/Makefile.am
index c54dbd7..b9811ed 100644 (file)
--- a/docs/libs/Makefile.am
+++ b/docs/libs/Makefile.am
@@ -8,7 +8,7 @@ DOC_MODULE=gst-plugins-base-libs
 DOC=gst-plugins-base-libs
 FORMATS=html
 html: html-build.stamp
-include $(srcdir)/../upload.mak
+include $(top_srcdir)/common/upload.mak
 
 # generated basefiles
 #basefiles = \

diff --git a/docs/libs/tmpl/gstcolorbalance.sgml b/docs/libs/tmpl/gstcolorbalance.sgml
index ccb0ae2..7ac9f04 100644 (file)
--- a/docs/libs/tmpl/gstcolorbalance.sgml
+++ b/docs/libs/tmpl/gstcolorbalance.sgml
@@ -23,15 +23,6 @@ interface for adjusting color balance settings
 </para>
 
 
-<!-- ##### SIGNAL GstColorBalance::value-changed ##### -->
-<para>
-
-</para>
-
-@gstcolorbalance: the object which received the signal.
-@arg1: 
-@arg2: 
-
 <!-- ##### STRUCT GstColorBalanceClass ##### -->
 <para>
 

diff --git a/docs/plugins/Makefile.am b/docs/plugins/Makefile.am
index ed7ce59..e04d457 100644 (file)
--- a/docs/plugins/Makefile.am
+++ b/docs/plugins/Makefile.am
@@ -11,7 +11,7 @@ DOC_MODULE=$(MODULE)-plugins
 DOC=$(MODULE)-plugins
 FORMATS=html
 html: html-build.stamp
-include $(srcdir)/../upload.mak
+include $(top_srcdir)/common/upload.mak
 
 # generated basefiles
 #basefiles = \

diff --git a/docs/upload.mak b/docs/upload.mak
deleted file mode 100644 (file)
index 9df285d..0000000
--- a/docs/upload.mak
+++ /dev/null
@@ -1,33 +0,0 @@
-# this snippet is to be included by both our docbook manuals
-# and gtk-doc API references
-
-# it adds an upload target to each of these dir's Makefiles
-
-# each Makefile.am should define the following variables:
-# - DOC: the base name of the documentation
-#        (faq, manual, pwg, gstreamer, gstreamer-libs)
-# - FORMATS: the formats in which DOC is output
-#            (html ps pdf)
-
-# if you want to use it, make sure your ..sh/config file contains the
-# correct User entry for the Host entry for the DOC_SERVER
-
-# these variables define the location of the online docs
-DOC_SERVER=gstreamer.freedesktop.org
-DOC_BASE=/srv/gstreamer.freedesktop.org/www/data/doc
-DOC_URL=$(DOC_SERVER):$(DOC_BASE)
-
-upload: $(FORMATS)
-       @if test "x$(PACKAGE_VERSION_NANO)" = x0; then \
-            export DOCVERSION=$(VERSION); \
-        else export DOCVERSION=head; \
-        fi; \
-        export DIR=$(DOC_BASE)/gstreamer/$$DOCVERSION/$(DOC); \
-       ssh $(DOC_SERVER) mkdir -p $$DIR; \
-       if echo $(FORMATS) | grep html > /dev/null; then export SRC="$$SRC html"; fi; \
-       if echo $(FORMATS) | grep ps > /dev/null; then export SRC="$$SRC $(DOC).ps"; fi; \
-       if echo $(FORMATS) | grep pdf > /dev/null; then export SRC="$$SRC $(DOC).pdf"; fi; \
-       echo Uploading $$SRC to $(DOC_SERVER):$$DIR; \
-       rsync -rv -e ssh --delete $$SRC $(DOC_SERVER):$$DIR; \
-       ssh $(DOC_SERVER) chmod -R g+w $$DIR; \
-       echo Done