diff --git a/debian/README.Debian b/debian/README.Debian index 0b2fe6d840..6f293917db 100644 --- a/debian/README.Debian +++ b/debian/README.Debian @@ -12,10 +12,14 @@ GStreamer is split into a number of base packages: gstreamer-doc documentation gstreamer-tools useful tools +pseudo plugins package: + + gstreamer-all depends on all the packages below + recommended plugins: - gstreamer-elements core plugins - gstreamer-common many independent plugins + gstreamer-core core plugins + gstreamer-misc many independent plugins optional plugins: diff --git a/debian/changelog b/debian/changelog index d466887ae1..903027a8c2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,13 +1,36 @@ +gstreamer (0.3.0-3) unstable; urgency=low + + * Remove upstream ChangeLog from packages: 128k changelog.gz per + plugin package for 40 packages is too much + + -- David I. Lehn Tue, 25 Dec 2001 23:36:28 -0500 + +gstreamer (0.3.0-2) unstable; urgency=low + + * Fix bug that slipped into 0.3.0: s/aasink/xvideosink/ in + gstplay/gstplay.c + + -- David I. Lehn Tue, 25 Dec 2001 17:56:29 -0500 + gstreamer (0.3.0-1) unstable; urgency=low - * New upstream release (lots of changes) - * Update Build-Depends versions as needed + * New upstream release + * Attempt to update various Build-Depends versions * Added plugin packages: -a52dec, -dvd, -mikmod, -sid - * Added speed and qcam to -common + * Renamed -elements to -core + * Added to -core: gstbasicscheduler + * Moved from -common to -core: gsttypes, autoplug related + * Renamed -common to -misc + * Added to -misc: speed, qcam, bytesteram, control, silence, sinesrc, + mpegstream, playondemand, resample * Added gstreamer-guilaunch to gstreamer-tools package * Added dependencies on unofficial LAME packages + * Use PIC libs for Xv + * Disable broken building of PDF/PS docs + * Renamed -all-plugins to -all + * Disable docs -- too hard to build - -- David I. Lehn Tue, 11 Dec 2001 21:27:22 -0500 + -- David I. Lehn Fri, 21 Dec 2001 12:00:02 -0500 gstreamer (0.2.1-4) unstable; urgency=low diff --git a/debian/control b/debian/control index 78699ae467..36f735606d 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: gstreamer Section: x11 Priority: optional Maintainer: David I. Lehn -Build-Depends: debhelper (>= 3.0.0), xlibs-dev (>= 4.1.0), xlibs-pic (>= 4.1.0), libxml-dev (>= 1.8.10), zlib1g-dev (>= 1:1.1.3), libghttp-dev (>= 1.0.6), libglib1.2-dev (>= 1.2.8), libgtk1.2-dev (>= 1.2.8), libglade0-dev (>= 0.14), libglade-gnome0-dev (>= 0.14), libesd0-dev (>= 0.2.22), libcdparanoia0-dev (>= 3a9.7), libvorbis-dev (>= 1.0rc2), libgnome-dev (>= 1.2.11), libasound1-dev (>= 0.5.10) | libasound2-dev (>= 0.9), libghttp-dev (>= 1.0.9), libjpeg62-dev (>= 6b), aalib1-dev (>= 1.4p4), libmad0-dev (>= 0.14.1b), hermes1-dev (>= 1.3.1), libarts-dev (>= 2.1.2), libgsm1-dev (>= 1.0.10), libgnome-vfs-dev (>= 1.0.3), libsdl1.2-dev (>= 1.2.2), libaudiofile-dev (>= 0.2.1), libavifile0.6-dev (>= 0.6.0.20011207), festival-dev (>= 1.4.1p), libflac-dev (>= 1.0.2), libmpeg2-0-dev (>= 0.2.0), libmpeg2dec0-dev (>= 0.2.0), pkg-config (>= 0.8.0), libsidplay1-dev (>= 1.36.47), libmikmod2-dev (>= 3.1.9), liba52-dev (>= 0.7.1), libdvdread2 (>= 0.9.1), lame-dev (>= 3.89), liblame0 (>= 3.89) +Build-Depends: debhelper (>= 3.0.0), xlibs-dev (>= 4.1.0), xlibs-pic (>= 4.1.0), libxml-dev (>= 1.8.10), zlib1g-dev (>= 1:1.1.3), libghttp-dev (>= 1.0.6), libglib1.2-dev (>= 1.2.8), libgtk1.2-dev (>= 1.2.8), libglade0-dev (>= 0.14), libglade-gnome0-dev (>= 0.14), libesd0-dev (>= 0.2.22), libcdparanoia0-dev (>= 3a9.7), libvorbis-dev (>= 1.0rc2), libgnome-dev (>= 1.2.11), libasound1-dev (>= 0.5.10) | libasound2-dev (>= 0.9), libghttp-dev (>= 1.0.9), libjpeg62-dev (>= 6b), aalib1-dev (>= 1.4p4), libmad0-dev (>= 0.14.1b), hermes1-dev (>= 1.3.1), libarts-dev (>= 2.1.2), libgsm1-dev (>= 1.0.10), libgnome-vfs-dev (>= 1.0.3), libsdl1.2-dev (>= 1.2.2), libaudiofile-dev (>= 0.2.1), libavifile0.6-dev (>= 0.6.0.20011207), festival-dev (>= 1.4.1p), libflac-dev (>= 1.0.2), libmpeg2-0-dev (>= 0.2.0), libmpeg2dec0-dev (>= 0.2.0), pkg-config (>= 0.8.0), libsidplay1-dev (>= 1.36.47), libmikmod2-dev (>= 3.1.9), liba52-0-dev (>= 0.7.2), libdvdread2 (>= 0.9.1), lame-dev (>= 3.89), liblame0 (>= 3.89) 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) Standards-Version: 3.5.6 @@ -10,7 +10,7 @@ Package: libgst1 Architecture: [alpha arm hppa i386 mips powerpc sparc] Section: libs Depends: ${shlibs:Depends} -Suggests: gstreamer-elements, gstreamer-common +Suggests: gstreamer-core, gstreamer-misc Description: Core GStreamer shared library Core GStreamer shared library @@ -42,7 +42,7 @@ Package: gstreamer-tools Architecture: any Section: x11 Depends: ${shlibs:Depends} -Suggests: gstreamer-common +Suggests: gstreamer-misc Description: Tools for use with GStreamer Tools for use with GStreamer . @@ -53,7 +53,7 @@ Description: Tools for use with GStreamer Package: libgstmediaplay0 Architecture: any Section: libs -Depends: ${shlibs:Depends}, gstreamer-elements, gstreamer-common, gstreamer-oss, gstreamer-colorspace, gstreamer-gnomevfs, gstreamer-x +Depends: ${shlibs:Depends}, gstreamer-core, gstreamer-misc, gstreamer-oss, gstreamer-colorspace, gstreamer-gnomevfs, gstreamer-x Description: GStreamer media player library GStreamer media player library @@ -90,17 +90,16 @@ Package: gsteditor Architecture: any Section: x11 Depends: ${shlibs:Depends} -Suggests: gstreamer-common +Suggests: gstreamer-misc Description: GStreamer editor GStreamer editor -Package: gstreamer-all-plugins +Package: gstreamer-all Architecture: any Section: libs -Depends: gstreamer-a52dec, gstreamer-aa, gstreamer-alsa, gstreamer-arts, gstreamer-artsd, gstreamer-audiofile, gstreamer-avifile, gstreamer-cdparanoia, gstreamer-colorspace, gstreamer-common, gstreamer-dvd, gstreamer-elements, gstreamer-esd, gstreamer-festival, gstreamer-flac, gstreamer-gnomevfs, gstreamer-gsm, gstreamer-jpeg, gstreamer-lame, gstreamer-mad, gstreamer-mikmod, gstreamer-mpeg2dec, gstreamer-mpg123, gstreamer-oss, gstreamer-sdl, gstreamer-sid, gstreamer-vorbis, gstreamer-x +Depends: gstreamer-a52dec, gstreamer-aa, gstreamer-alsa, gstreamer-arts, gstreamer-artsd, gstreamer-audiofile, gstreamer-avifile, gstreamer-cdparanoia, gstreamer-colorspace, gstreamer-misc, gstreamer-dvd, gstreamer-core, gstreamer-esd, gstreamer-festival, gstreamer-flac, gstreamer-gnomevfs, gstreamer-gsm, gstreamer-jpeg, gstreamer-lame, gstreamer-mad, gstreamer-mikmod, gstreamer-mpeg2dec, gstreamer-mpg123, gstreamer-oss, gstreamer-sdl, gstreamer-sid, gstreamer-vorbis, gstreamer-x Description: Pseudo package for all GStreamer plugins - Pseudo package which depends on all current GStreamer plugin - packages. + Pseudo package which depends on all current GStreamer plugin packages. . NOTE: This package depends on many other packages. @@ -182,14 +181,28 @@ Depends: ${shlibs:Depends}, gstreamer-runtime (= ${Source-Version}) Description: colorspace conversion plugin for GStreamer colorspace conversion plugin for GStreamer -Package: gstreamer-common +Package: gstreamer-core Architecture: any Section: libs Depends: ${shlibs:Depends}, gstreamer-runtime (= ${Source-Version}) -Description: Collection of GStreamer plugins - Collection of various GStreamer plugins +Description: Core plugins for GStreamer + Core plugins for GStreamer . - These plugins have no special dependencies. + Includes various basic elements: + * file source and sink + * tee and aggregator + * fake source and sink for testing + * identity + * http source + * pipe filter + * statistics + . + And other important yet plugable pieces: + * autoplugging support + * standard scheduler + * type detection support + . + These plugins have no external dependencies. Package: gstreamer-dvd Architecture: any @@ -198,15 +211,6 @@ Depends: ${shlibs:Depends}, gstreamer-runtime (= ${Source-Version}) Description: DVD plugin for GStreamer DVD plugin for GStreamer based on libdvdread. -Package: gstreamer-elements -Architecture: any -Section: libs -Depends: ${shlibs:Depends}, gstreamer-runtime (= ${Source-Version}) -Description: Core elements plugin for GStreamer - Core elements plugin for GStreamer - . - These plugins have no special dependencies. - Package: gstreamer-esd Architecture: any Section: libs @@ -283,6 +287,15 @@ Description: MikMod decoder plugin for GStreamer . http://www.mikmod.org/ +Package: gstreamer-misc +Architecture: any +Section: libs +Depends: ${shlibs:Depends}, gstreamer-runtime (= ${Source-Version}) +Description: Collection of various GStreamer plugins + Collection of various GStreamer plugins + . + These plugins have no external dependencies. + Package: gstreamer-mpeg2dec Architecture: any Section: libs @@ -309,6 +322,15 @@ Depends: ${shlibs:Depends}, gstreamer-runtime (= ${Source-Version}) Description: OSS plugin for GStreamer OSS plugin for GStreamer +Package: gstreamer-sdl +Architecture: any +Section: libs +Depends: ${shlibs:Depends}, gstreamer-runtime (= ${Source-Version}) +Description: SDL videosink plugin for GStreamer + SDL videosink plugin for GStreamer + . + http://www.libsdl.org/ + Package: gstreamer-sid Architecture: any Section: libs @@ -321,15 +343,6 @@ Description: C64 SID decoder plugin for GStreamer http://stud1.tuwien.ac.at/~e9426444/ http://sidplay2.sourceforge.net/ -Package: gstreamer-sdl -Architecture: any -Section: libs -Depends: ${shlibs:Depends}, gstreamer-runtime (= ${Source-Version}) -Description: SDL videosink plugin for GStreamer - SDL videosink plugin for GStreamer - . - http://www.libsdl.org/ - Package: gstreamer-vorbis Architecture: any Section: libs diff --git a/debian/gstreamer-alsa.files b/debian/gstreamer-alsa.files index 969dc6efe5..a7df92e5aa 100644 --- a/debian/gstreamer-alsa.files +++ b/debian/gstreamer-alsa.files @@ -1,2 +1 @@ -usr/lib/gst/libalsasrc.* -usr/lib/gst/libalsasink.* +usr/lib/gst/libalsa.* diff --git a/debian/gstreamer-core.files b/debian/gstreamer-core.files new file mode 100644 index 0000000000..c9516b5a0a --- /dev/null +++ b/debian/gstreamer-core.files @@ -0,0 +1,7 @@ +usr/lib/gst/libgstautoplugcache.* +usr/lib/gst/libgstautoplugger.* +usr/lib/gst/libgstbasicscheduler.* +usr/lib/gst/libgstelements.* +usr/lib/gst/libgststaticautoplug.* +usr/lib/gst/libgststaticautoplugrender.* +usr/lib/gst/libgsttypes.* diff --git a/debian/gstreamer-doc.files b/debian/gstreamer-doc.files index c6ff27539a..630c4eab79 100644 --- a/debian/gstreamer-doc.files +++ b/debian/gstreamer-doc.files @@ -1 +1 @@ -usr/share/gstreamer +usr/share/doc/gstreamer-doc diff --git a/debian/gstreamer-elements.files b/debian/gstreamer-elements.files deleted file mode 100644 index 1941134be3..0000000000 --- a/debian/gstreamer-elements.files +++ /dev/null @@ -1,3 +0,0 @@ -usr/lib/gst/libgstelements.* -usr/lib/gst/libgststaticautoplug.* -usr/lib/gst/libgststaticautoplugrender.* diff --git a/debian/gstreamer-common.files b/debian/gstreamer-misc.files similarity index 89% rename from debian/gstreamer-common.files rename to debian/gstreamer-misc.files index 3e7d3c9d55..47eac32646 100644 --- a/debian/gstreamer-common.files +++ b/debian/gstreamer-misc.files @@ -14,9 +14,9 @@ usr/lib/gst/libcutter.* usr/lib/gst/libdeinterlace.* usr/lib/gst/libflxdec.* usr/lib/gst/libgstaudio.* -usr/lib/gst/libgstautoplugcache.* -usr/lib/gst/libgstautoplugger.* +usr/lib/gst/libgstbytestream.* usr/lib/gst/libgstcolorspace.* +usr/lib/gst/libgstcontrol.* usr/lib/gst/libgstgetbits.* usr/lib/gst/libgstidct.* usr/lib/gst/libgstladspa.* @@ -24,6 +24,8 @@ usr/lib/gst/libgstparseau.* usr/lib/gst/libgstparsewav.* usr/lib/gst/libgstputbits.* usr/lib/gst/libgstriff.* +usr/lib/gst/libgstsilence.* +usr/lib/gst/libgstsinesrc.* usr/lib/gst/libgstspectrum.* usr/lib/gst/libgsttypes.* usr/lib/gst/libgstvideoscale.* @@ -48,8 +50,11 @@ usr/lib/gst/libmpeg2subt.* usr/lib/gst/libmpeg2types.* usr/lib/gst/libmpeg_play.* usr/lib/gst/libmpegaudio.* +usr/lib/gst/libmpegstream.* usr/lib/gst/libmulaw.* usr/lib/gst/libpassthrough.* +usr/lib/gst/libplayondemand.* +usr/lib/gst/libresample.* usr/lib/gst/librtjpeg.* usr/lib/gst/libspeed.* usr/lib/gst/libsmooth.* diff --git a/debian/libgst-dev.files b/debian/libgst-dev.files index 4712d42bbb..f0b9bcf71d 100644 --- a/debian/libgst-dev.files +++ b/debian/libgst-dev.files @@ -2,5 +2,6 @@ usr/include usr/share/aclocal usr/lib/pkgconfig usr/bin/gstreamer-config +usr/lib/libgst.a usr/lib/libgst.la usr/lib/libgst.so diff --git a/debian/libgsteditor-dev.files b/debian/libgsteditor-dev.files index 0e4c1bcdf7..d482b8e4c2 100644 --- a/debian/libgsteditor-dev.files +++ b/debian/libgsteditor-dev.files @@ -1,2 +1,3 @@ +usr/lib/libgsteditor.a usr/lib/libgsteditor.la usr/lib/libgsteditor.so diff --git a/debian/libgstmediaplay-dev.files b/debian/libgstmediaplay-dev.files index b6c11f62fb..1a7fe184e3 100644 --- a/debian/libgstmediaplay-dev.files +++ b/debian/libgstmediaplay-dev.files @@ -1,2 +1,3 @@ +usr/lib/libgstmediaplay.a usr/lib/libgstmediaplay.la usr/lib/libgstmediaplay.so diff --git a/debian/rules b/debian/rules index cdd7711d52..77df94d30f 100755 --- a/debian/rules +++ b/debian/rules @@ -16,7 +16,7 @@ export DH_OPTIONS # Link special names to a template file. # still need "*.files" to be done by hand -PLUGINS=a52dec aa alsa arts artsd audiofile avifile cdparanoia colorspace common dvd elements esd festival flac gnomevfs gsm jpeg lame mad mikmod mpeg2dec mpg123 oss sdl sid vorbis x +PLUGINS=a52dec aa alsa arts artsd audiofile avifile cdparanoia colorspace core dvd esd festival flac gnomevfs gsm jpeg lame mad mikmod misc mpeg2dec mpg123 oss sdl sid vorbis x setup-links: for i in $(PLUGINS); do \ @@ -47,11 +47,15 @@ configure-stamp: --disable-plugin-builddir \ --disable-tests \ --disable-examples \ - --enable-docs-build \ + --disable-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 @@ -74,14 +78,16 @@ clean: dh_clean - rm -rf debian/gstreamer + # get rid of the sym links for i in $(PLUGINS); do \ rm -f debian/gstreamer-$$i.postinst; \ rm -f debian/gstreamer-$$i.postrm; \ done - # FIXME + # FIXME some extra clean up rm -rf \ + debian/gstreamer \ + docs/gst/gstreamer-scan.o \ docs/gst/gstreamer-decl-list.txt \ docs/gst/gstreamer-decl.txt \ docs/gst/gstreamer.html \ @@ -99,10 +105,19 @@ install: build dh_installdirs # Add here commands to install the package into debian/gstreamer. - $(MAKE) install prefix=$(CURDIR)/debian/gstreamer/usr + $(MAKE) prefix=$(CURDIR)/debian/gstreamer/usr install + + # move around the doc dirs + mkdir -p debian/gstreamer/usr/share/doc/gstreamer-doc/html + -mv debian/gstreamer/usr/share/gstreamer/gst-plugin-writers-guide \ + debian/gstreamer/usr/share/gstreamer/gstreamer-manual \ + debian/gstreamer/usr/share/gstreamer/html/gstreamer-libs \ + debian/gstreamer/usr/share/gst/html/gstreamer \ + debian/gstreamer/usr/share/doc/gstreamer-doc/html 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 @@ -111,7 +126,7 @@ binary-indep: build install dh_testdir dh_testroot # dh_installdebconf - dh_installdocs + dh_installdocs -A debian/README.Debian dh_installexamples dh_installmenu # dh_installemacsen @@ -121,7 +136,7 @@ binary-indep: build install dh_installman # dh_installinfo # dh_undocumented - dh_installchangelogs ChangeLog + dh_installchangelogs dh_strip # dh_link dh_compress @@ -144,7 +159,7 @@ binary-arch: build install setup-links dh_testdir dh_testroot # dh_installdebconf - dh_installdocs + dh_installdocs -A debian/README.Debian dh_installexamples dh_installmenu # dh_installemacsen @@ -153,8 +168,8 @@ binary-arch: build install setup-links # dh_installcron dh_installman # dh_installinfo - dh_undocumented - dh_installchangelogs ChangeLog +# dh_undocumented + dh_installchangelogs dh_strip # dh_link dh_compress