diff --git a/campcaster/bin/dist.sh b/campcaster/bin/dist.sh index 1f13727f1..9ae150da2 100755 --- a/campcaster/bin/dist.sh +++ b/campcaster/bin/dist.sh @@ -156,10 +156,6 @@ xmlrpcxx_dir=$toolsdir/xmlrpc++ xmlrpcxx_version=xmlrpc++-20040713 xmlrpcxx_tmpdir=$tools_tmpdir/xmlrpc++ -gstreamer_dir=$toolsdir/gstreamer -gstreamer_version=gstreamer-0.10.17 -gstreamer_tmpdir=$tools_tmpdir/gstreamer - taglib_dir=$toolsdir/taglib taglib_version=taglib-1.4 taglib_tmpdir=$tools_tmpdir/taglib @@ -252,9 +248,6 @@ cp -pPR $libodbcxx_dir/$libodbcxx_version $libodbcxx_tmpdir mkdir -p $xmlrpcxx_tmpdir cp -pPR $xmlrpcxx_dir/$xmlrpcxx_version $xmlrpcxx_tmpdir -mkdir -p $gstreamer_tmpdir -cp -pPR $gstreamer_dir/$gstreamer_version $gstreamer_tmpdir - mkdir -p $taglib_tmpdir cp -pPR $taglib_dir/$taglib_version $taglib_tmpdir diff --git a/campcaster/bin/postInstallStation.sh b/campcaster/bin/postInstallStation.sh index 8e497c9ac..c72c1b29d 100755 --- a/campcaster/bin/postInstallStation.sh +++ b/campcaster/bin/postInstallStation.sh @@ -414,20 +414,6 @@ cd $installdir cd - -#------------------------------------------------------------------------------- -# Create the gstreamer registry -#------------------------------------------------------------------------------- -echo "Creating gstreamer registry..."; - -gstreamer_dir=`find $install_lib -type d -name "gstreamer-*"` -export LD_LIBRARY_PATH=$install_lib # is this needed here? -#export GST_REGISTRY=$install_etc/gst-registry.xml -export GST_PLUGIN_PATH=$install_lib:$gstreamer_dir -#rm -f ${GST_REGISTRY} -#rm -f $install_var/cache/gstreamer-0.10/registry.xml -#$install_bin/gst-register - - #------------------------------------------------------------------------------- # Generate a random password for the scheduler's access to the storage #------------------------------------------------------------------------------- diff --git a/campcaster/doc/developmentTools.html b/campcaster/doc/developmentTools.html index 9f27acfc1..be65676a0 100644 --- a/campcaster/doc/developmentTools.html +++ b/campcaster/doc/developmentTools.html @@ -54,10 +54,6 @@ environment variable WANT_AUTOCONF_2_5="1" before compiling the tools.)
  • gzip
  • unzip
  • curl
    - -
  • bison >= 1.35
    -
  • flex -
  • lcov >= 1.4
  • pwgen
  • diff --git a/campcaster/etc/Makefile.in b/campcaster/etc/Makefile.in index 6ee115950..c547c64e4 100644 --- a/campcaster/etc/Makefile.in +++ b/campcaster/etc/Makefile.in @@ -229,7 +229,6 @@ ifeq ("@COMPILE_CPPUNIT@", "yes") endif -${MAKE} -C ${LIBODBCXX_DIR}/${LIBODBCXX_VERSION} distclean -${MAKE} -C ${XMLRPCXX_DIR}/${XMLRPCXX_VERSION} distclean - -${MAKE} -C ${GSTREAMER_DIR}/${GSTREAMER_VERSION} distclean -${MAKE} -C ${TAGLIB_DIR}/${TAGLIB_VERSION} distclean -${MAKE} -C ${LIBSERIAL_DIR}/${LIBSERIAL_VERSION} distclean ${RM} ${TMP_DIR}/tools_setup.stamp diff --git a/campcaster/etc/campcaster-scheduler b/campcaster/etc/campcaster-scheduler index d1547f14a..c06cdb199 100755 --- a/campcaster/etc/campcaster-scheduler +++ b/campcaster/etc/campcaster-scheduler @@ -6,11 +6,9 @@ CAMPCASTER_DIR=/opt/campcaster CAMPCASTER_BIN=$CAMPCASTER_DIR/bin CAMPCASTER_ETC=$CAMPCASTER_DIR/etc CAMPCASTER_LIB=$CAMPCASTER_DIR/lib -GSTREAMER_DIR=`find $CAMPCASTER_LIB -type d -name "gstreamer-*"` PATH=/sbin:/bin:/usr/sbin:/usr/bin:$CAMPCASTER_BIN LD_LIBRARY_PATH=$CAMPCASTER_LIB:$LD_LIBRARY_PATH -GST_REGISTRY=$CAMPCASTER_ETC/gst-registry.xml DAEMON=$CAMPCASTER_BIN/campcaster-scheduler NAME=campcaster-scheduler DESC="campcaster scheduler" @@ -19,7 +17,6 @@ test -x $DAEMON || exit 0 export PATH export LD_LIBRARY_PATH -export GST_REGISTRY DAEMON_OPTS="-c $CAMPCASTER_ETC/campcaster-scheduler.xml" diff --git a/campcaster/etc/configure.ac b/campcaster/etc/configure.ac index ddf1ec3ac..f12681ea8 100644 --- a/campcaster/etc/configure.ac +++ b/campcaster/etc/configure.ac @@ -372,7 +372,6 @@ AC_MSG_NOTICE( by Campcaster: cppunit 1.10.2 ${COMPILE_CPPUNIT} - gstreamer 0.10.17 yes libodbc++ 0.2.3 yes taglib 1.4 yes xmlrpc++ 2004-07-13 yes diff --git a/campcaster/etc/debian/campcaster-station.prerm b/campcaster/etc/debian/campcaster-station.prerm index 5279f0884..6054be829 100644 --- a/campcaster/etc/debian/campcaster-station.prerm +++ b/campcaster/etc/debian/campcaster-station.prerm @@ -90,7 +90,6 @@ case "$1" in fi # remove generated files - rm -rf $installdir/etc/gst-registry.xml rm -rf $installdir/etc/pear.conf rm -rf $installdir/var/Campcaster/htmlUI/var/html/img/* rm -rf $installdir/var/Campcaster/htmlUI/var/templates_c/* diff --git a/campcaster/etc/debian/control b/campcaster/etc/debian/control index 466a48e97..ccb833d38 100644 --- a/campcaster/etc/debian/control +++ b/campcaster/etc/debian/control @@ -19,8 +19,6 @@ Build-Depends: debhelper (>= 4.0.0), unzip, bzip2, curl, - bison (>= 1.35), - flex, graphviz, xsltproc, unixodbc-dev (>= 2.2), diff --git a/campcaster/etc/debian/rules b/campcaster/etc/debian/rules index 4a419535b..93c1dbb42 100755 --- a/campcaster/etc/debian/rules +++ b/campcaster/etc/debian/rules @@ -79,8 +79,6 @@ install-arch: mkdir -p $(CURDIR)/debian/campcaster-libs/opt/campcaster/usr/lib mv -f $(CURDIR)/debian/campcaster/opt/campcaster/lib \ $(CURDIR)/debian/campcaster-libs/opt/campcaster - mv -f $(CURDIR)/debian/campcaster/opt/campcaster/bin/gst-* \ - $(CURDIR)/debian/campcaster-libs/opt/campcaster/bin # now separate the station (server) files into debian/campcaster-station mkdir -p $(CURDIR)/debian/campcaster-station