diff --git a/debian/README.Debian b/debian/README.Debian index 12807bff41..754f6fb4f4 100644 --- a/debian/README.Debian +++ b/debian/README.Debian @@ -12,7 +12,7 @@ GStreamer core is split into the following packages: gstreamer-doc documentation gstreamer-tools useful tools gstreamer-core core plugins - gstreamer-lib-core core lib plugins - gstreamer-lib-core-dev development files for core lib plugins + gstreamer-core-libs core lib plugins + gstreamer-core-libs-dev development files for core lib plugins David I. Lehn Fri, 19 Jan 2001 19:13:06 -0500 diff --git a/debian/changelog b/debian/changelog index a8ce292501..d004799760 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,23 @@ +gstreamer (0.4.0-1) unstable; urgency=low + + * New upstream + * Update library package: libgstreamer0.3.4 -> libgstreamer0.4.0 + * Add automake Python support to find python binary to run devhelp doc + helper script. This touches -every- Makefile.in and since the package + diff will already be large just use automake 1.6 instead of 1.5 as used + upstream. Sorry. + * Update config.{guess,sub} + * Temporarily comment out figures from manual so it builds + * Apply CVS patch for s/%/%/ in XML docs + * Added devhelp support + * Added gst-feedback to gstreamer-tools + * Break stuff: blindly reanme gstreamer-lib-core{-dev} to + gstreamer-core-libs{-dev}. Hard to chose naming as these are half-plugins + and half-linkable libs. Picking a scheme that also works with + gstreamer-plugins-* packages. Still looking for a better solution... + + -- David I. Lehn Tue, 16 Jul 2002 02:20:40 -0400 + gstreamer (0.3.4-1) unstable; urgency=low * New upstream diff --git a/debian/control b/debian/control index c3a4e565e3..eaaf9d8391 100644 --- a/debian/control +++ b/debian/control @@ -2,16 +2,14 @@ Source: gstreamer Section: libs Priority: optional Maintainer: David I. Lehn -Build-Depends: debhelper (>= 3.0.0), libxml2-dev (>= 2.4.16), zlib1g-dev (>= 1:1.1.4), libglib2.0-dev (>= 2.0.1), pkg-config (>= 0.11.0), libpopt-dev, bison, flex -Build-Depends-Indep: debhelper (>= 3.0.0), gtk-doc-tools (>= 0.4), jade (>= 1.2.1), transfig (>= 3.2.3.c), docbook-utils (>= 0.6.9), xsltproc (>= 1.0.6), gs +Build-Depends: debhelper (>= 3.0.0), libxml2-dev (>= 2.4.16), zlib1g-dev (>= 1:1.1.4), libglib2.0-dev (>= 2.0.4), pkg-config (>= 0.11.0), libpopt-dev, bison, flex +Build-Depends-Indep: debhelper (>= 3.0.0), gtk-doc-tools (>= 0.4), jade (>= 1.2.1), transfig (>= 3.2.3.c), docbook-utils (>= 0.6.9), xsltproc (>= 1.0.6), gs, python (>= 2.1) Standards-Version: 3.5.6 -Package: libgstreamer0.3.4 +Package: libgstreamer0.4.0 Architecture: [alpha arm hppa i386 mips mipsel powerpc sparc] Section: libs Depends: ${shlibs:Depends} -Conflicts: libgstreamer0.3.3 -Replaces: libgstreamer0.3.3 Suggests: gstreamer-core, gstreamer-misc Description: Core GStreamer shared library Core GStreamer shared library @@ -19,7 +17,7 @@ Description: Core GStreamer shared library Package: libgstreamer-dev Architecture: any Section: devel -Depends: libgstreamer0.3.4 (= ${Source-Version}), libc6-dev, pkg-config, libpopt-dev, libglib2.0-dev +Depends: libgstreamer0.4.0 (= ${Source-Version}), libc6-dev, pkg-config, libpopt-dev, libglib2.0-dev Recommends: gstreamer-doc (= ${Source-Version}) Description: GStreamer development libraries and headers GStreamer development libraries and headers @@ -77,7 +75,7 @@ Description: Core element and library plugins for GStreamer * standard scheduler * type detection support -Package: gstreamer-lib-core +Package: gstreamer-core-libs Architecture: any Section: libs Depends: ${shlibs:Depends} @@ -88,10 +86,10 @@ Description: Core library plugins for GStreamer * putbits * getbits -Package: gstreamer-lib-core-dev +Package: gstreamer-core-libs-dev Architecture: any Section: devel -Depends: gstreamer-lib-core +Depends: gstreamer-core-libs Description: Development files for core library plugins for GStreamer Development files for core library plugins for GStreamer - Includes headers for library plugins from gstreamer-lib-core + Includes headers for library plugins from gstreamer-core-libs diff --git a/debian/gstreamer-core-libs-dev.files b/debian/gstreamer-core-libs-dev.files new file mode 100644 index 0000000000..8452178ba9 --- /dev/null +++ b/debian/gstreamer-core-libs-dev.files @@ -0,0 +1,4 @@ +usr/include/gstreamer-*/gst/bytestream +usr/include/gstreamer-*/gst/control +usr/include/gstreamer-*/gst/getbits +usr/include/gstreamer-*/gst/putbits diff --git a/debian/gstreamer-lib-core.files b/debian/gstreamer-core-libs.files similarity index 100% rename from debian/gstreamer-lib-core.files rename to debian/gstreamer-core-libs.files diff --git a/debian/gstreamer-core.files b/debian/gstreamer-core.files index ab218add73..e76e11bc70 100644 --- a/debian/gstreamer-core.files +++ b/debian/gstreamer-core.files @@ -1,7 +1,8 @@ usr/lib/gst/libgstautoplugcache.so usr/lib/gst/libgstautoplugger.so usr/lib/gst/libgstbasicscheduler.so -usr/lib/gst/libgstfastscheduler.so +usr/lib/gst/libgstfastbasicscheduler.so +usr/lib/gst/libgstfaststandardscheduler.so usr/lib/gst/libgststandardscheduler.so usr/lib/gst/libgstelements.so usr/lib/gst/libgstspider.so diff --git a/debian/gstreamer-core.postinst b/debian/gstreamer-core.postinst index e2168e8357..7d55d5a290 100644 --- a/debian/gstreamer-core.postinst +++ b/debian/gstreamer-core.postinst @@ -3,8 +3,8 @@ set -e if [ "$1" = "configure" ]; then - gst-register --gst-mask=0 || true - gst-compprep --gst-mask=0 || true + gst-register --gst-mask=0 > /dev/null || true + gst-compprep --gst-mask=0 > /dev/null || true fi #DEBHELPER# diff --git a/debian/gstreamer-core.postrm b/debian/gstreamer-core.postrm index 5c2fdf1a1e..f6aa97ebd5 100644 --- a/debian/gstreamer-core.postrm +++ b/debian/gstreamer-core.postrm @@ -3,8 +3,8 @@ set -e if [ "$1" = "remove" ]; then - gst-register --gst-mask=0 || true - gst-compprep --gst-mask=0 || true + gst-register --gst-mask=0 > /dev/null || true + gst-compprep --gst-mask=0 > /dev/null || true fi #DEBHELPER# diff --git a/debian/gstreamer-doc.files b/debian/gstreamer-doc.files index 630c4eab79..8d6476a47d 100644 --- a/debian/gstreamer-doc.files +++ b/debian/gstreamer-doc.files @@ -1 +1,2 @@ usr/share/doc/gstreamer-doc +usr/share/devhelp/specs diff --git a/debian/gstreamer-doc.links b/debian/gstreamer-doc.links new file mode 100644 index 0000000000..74f1b44582 --- /dev/null +++ b/debian/gstreamer-doc.links @@ -0,0 +1,2 @@ +/usr/share/doc/gstreamer-doc/gstreamer /usr/share/devhelp/books/gstreamer +/usr/share/doc/gstreamer-doc/gstreamer-libs /usr/share/devhelp/books/gstreamer-libs diff --git a/debian/gstreamer-lib-core-dev.files b/debian/gstreamer-lib-core-dev.files deleted file mode 100644 index c5f6145f65..0000000000 --- a/debian/gstreamer-lib-core-dev.files +++ /dev/null @@ -1,4 +0,0 @@ -usr/include/gst/bytestream -usr/include/gst/control -usr/include/gst/getbits -usr/include/gst/putbits diff --git a/debian/gstreamer-runtime.postinst b/debian/gstreamer-runtime.postinst index e2168e8357..7d55d5a290 100644 --- a/debian/gstreamer-runtime.postinst +++ b/debian/gstreamer-runtime.postinst @@ -3,8 +3,8 @@ set -e if [ "$1" = "configure" ]; then - gst-register --gst-mask=0 || true - gst-compprep --gst-mask=0 || true + gst-register --gst-mask=0 > /dev/null || true + gst-compprep --gst-mask=0 > /dev/null || true fi #DEBHELPER# diff --git a/debian/gstreamer-tools.files b/debian/gstreamer-tools.files index a239a33257..7d376ce479 100644 --- a/debian/gstreamer-tools.files +++ b/debian/gstreamer-tools.files @@ -1,4 +1,5 @@ usr/bin/gst-complete +usr/bin/gst-feedback usr/bin/gst-inspect usr/bin/gst-launch usr/bin/gst-xmllaunch diff --git a/debian/gstreamer-tools.manpages b/debian/gstreamer-tools.manpages index 1554166beb..c709fd43ad 100644 --- a/debian/gstreamer-tools.manpages +++ b/debian/gstreamer-tools.manpages @@ -1,4 +1,5 @@ debian/gstreamer/usr/share/man/man1/gst-complete.1 +debian/gstreamer/usr/share/man/man1/gst-feedback.1 debian/gstreamer/usr/share/man/man1/gst-inspect.1 debian/gstreamer/usr/share/man/man1/gst-launch.1 debian/gstreamer/usr/share/man/man1/gst-xmllaunch.1 diff --git a/debian/libgstreamer-dev.files b/debian/libgstreamer-dev.files index 7bbb6f9075..2834e81d8f 100644 --- a/debian/libgstreamer-dev.files +++ b/debian/libgstreamer-dev.files @@ -1,3 +1,3 @@ -usr/include/gst/*.h +usr/include/gstreamer-*/gst/*.h usr/lib/pkgconfig usr/lib/libgstreamer.{a,la,so} diff --git a/debian/libgstreamer0.3.4.files b/debian/libgstreamer0.4.0.files similarity index 100% rename from debian/libgstreamer0.3.4.files rename to debian/libgstreamer0.4.0.files diff --git a/debian/rules b/debian/rules index ebc770bb7b..f53b61e4c1 100755 --- a/debian/rules +++ b/debian/rules @@ -1,15 +1,7 @@ #!/usr/bin/make -f -# Sample debian/rules that uses debhelper. -# GNU copyright 1997 by Joey Hess. -# -# Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 - -# This is the debhelper compatability version to use. export DH_COMPAT=3 - -# This has to be exported to make some magic below work. export DH_OPTIONS export DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) @@ -38,28 +30,19 @@ configure-stamp: --with-html-dir=\$${prefix}/share/doc/gstreamer-doc \ --sysconfdir=/etc \ --with-configdir=/etc/gstreamer \ - --enable-glib2 \ --disable-plugin-builddir \ --disable-tests \ --disable-examples \ --enable-docs-build \ - --disable-plugin-docs \ --enable-DEBUG \ --enable-debug - # FIXME reenable when build is less painful - #--enable-docs-build \ - #--disable-plugin-docs \ - touch configure-stamp build: configure-stamp build-stamp build-stamp: dh_testdir - # Add here commands to compile the package. - # FIXME missing upstream, diff doesn't include these 0 byte files: - touch docs/fwg/base.css docs/manual/base.css $(MAKE) touch build-stamp @@ -75,12 +58,6 @@ clean: dh_clean - # FIXME some extra clean up - rm -rf debian/gstreamer - find . -name \*.stamp | xargs rm || true - find . -name Makefile | grep -v omega | xargs rm || true - - install: DH_OPTIONS= install: build dh_testdir @@ -101,13 +78,17 @@ install: build -cp -r docs/fwg/gst-plugin-writers-guide \ docs/manual/gstreamer-manual \ debian/gstreamer/usr/share/doc/gstreamer-doc + + # devhelp files not installed by default + mkdir -p debian/gstreamer/usr/share/devhelp/specs + -cp docs/devhelp/*.devhelp debian/gstreamer/usr/share/devhelp/specs + # -doc lintian overrides mkdir -p debian/gstreamer-doc/usr/share/lintian/overrides/ cp -a debian/gstreamer-doc.lintian debian/gstreamer-doc/usr/share/lintian/overrides/gstreamer-doc dh_movefiles --sourcedir=debian/gstreamer - # Build architecture-independent files here. # Pass -i to all debhelper commands in this target to reduce clutter. binary-indep: DH_OPTIONS=-i @@ -115,28 +96,16 @@ binary-indep: build install # Need this version of debhelper for DH_OPTIONS to work. dh_testdir dh_testroot -# dh_installdebconf dh_installdocs -A debian/README.Debian dh_installexamples dh_installmenu -# dh_installemacsen -# dh_installpam -# dh_installinit -# dh_installcron dh_installman -# dh_installinfo -# dh_undocumented dh_installchangelogs dh_strip -# dh_link + dh_link dh_compress dh_fixperms -# You may want to make some executables suid here. -# dh_suidregister -# dh_makeshlibs dh_installdeb -# dh_perl -# dh_shlibdeps dh_gencontrol dh_md5sums dh_builddeb @@ -148,28 +117,17 @@ binary-arch: build install # Need this version of debhelper for DH_OPTIONS to work. dh_testdir dh_testroot -# dh_installdebconf dh_installdocs -A debian/README.Debian dh_installexamples dh_installmenu -# dh_installemacsen -# dh_installpam -# dh_installinit -# dh_installcron dh_installman -# dh_installinfo -# dh_undocumented dh_installchangelogs dh_strip -# dh_link dh_compress dh_fixperms -# You may want to make some executables suid here. -# dh_suidregister dh_makeshlibs dh_installdeb -# dh_perl - dh_shlibdeps -l`pwd`/debian/libgstreamer0.3.4/usr/lib + dh_shlibdeps -l`pwd`/debian/libgstreamer0.4.0/usr/lib dh_gencontrol dh_md5sums dh_builddeb