Untested conversion to 0.3.1 layout

Original commit message from CVS:
Untested conversion to 0.3.1 layout

diff --git a/debian/README.Debian b/debian/README.Debian
index 6f293917db6d77528eeee3757f013e6095ab9093..d63332485633b4f3ea2831660824f350a047dfb0 100644 (file)
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -4,60 +4,13 @@ This package contains the GStreamer distribution.
 
 More information can be found at http://gstreamer.net/
 
-GStreamer is split into a number of base packages:
+GStreamer core is split into the following packages:
 
-   libgst1              shared core libs
+   libgst2              shared core libs
    libgst-dev           development libs and headers
    gstreamer-runtime    tools required by the libs (gstreamer-register)
    gstreamer-doc        documentation
    gstreamer-tools      useful tools
-
-pseudo plugins package:
-
-   gstreamer-all      depends on all the packages below
-
-recommended plugins:
-
-   gstreamer-core     core plugins
-   gstreamer-misc     many independent plugins
-
-optional plugins:
-
-   gstreamer-a52dec
-   gstreamer-aa
-   gstreamer-alsa
-   gstreamer-arts
-   gstreamer-artsd
-   gstreamer-audiofile
-   gstreamer-avifile
-   gstreamer-cdparanoia
-   gstreamer-colorspace
-   gstreamer-dvd
-   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
-
-and applications and their supporting libs:
-
-   libgstmediaplay0     media player libs
-   libgstmediaplay-dev  media player dev support
-   gstmediaplay         media player application
-
-   libgsteditor0        stream pipeline visual editor libs
-   libgsteditor-dev     stream pipeline visual editor dev support
-   gsteditor            stream pipeline visual editor application
+   gstreamer-core       core plugins and lib plugins
 
 David I. Lehn <dlehn@vt.edu>  Fri, 19 Jan 2001 19:13:06 -0500

diff --git a/debian/changelog b/debian/changelog
index 903027a8c200b2fdacaf5e43a052dd9cf902d3b2..238bbd6c9c54e7c5113cac29552973fed4a8ef95 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+gstreamer (0.3.1-1) unstable; urgency=low
+
+  * New upstream release
+  * Upstream broken into multiple packages
+  * Core plugins left in -core
+  * Core lib plugins moved to -core
+  * Other plugins now built from gst-plugins source pacakge
+  * libgst1 -> libgst2
+  * Tool prefix renamed upstream: s/gstreamer/gst/
+  * Moved gstreamer-guilaunch to gst-editor source package
+  * Removed gstreamer-config and .m4 in favor of pkg-config use
+
+ -- David I. Lehn <dlehn@vt.edu>  Mon,  7 Jan 2002 17:45:55 -0500
+
 gstreamer (0.3.0-3) unstable; urgency=low
 
   * Remove upstream ChangeLog from packages: 128k changelog.gz per

diff --git a/debian/control b/debian/control
index 36f735606dd0ab2a5335f4c26d0bf6c9fe532b97..a67c6b4216a3cd74ab4a18293ac444c819359460 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -1,12 +1,13 @@
 Source: gstreamer
-Section: x11
+Section: libs
 Priority: optional
 Maintainer: David I. Lehn <dlehn@vt.edu>
-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)
+Build-Depends: debhelper (>= 3.0.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), hermes1-dev (>= 1.3.1), pkg-config (>= 0.8.0)
+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)
+
 Standards-Version: 3.5.6
 
-Package: libgst1
+Package: libgst2
 Architecture: [alpha arm hppa i386 mips powerpc sparc]
 Section: libs
 Depends: ${shlibs:Depends}
@@ -17,7 +18,7 @@ Description: Core GStreamer shared library
 Package: libgst-dev
 Architecture: any
 Section: devel
-Depends: libgst1 (= ${Source-Version}), libc6-dev, pkg-config
+Depends: libgst2 (= ${Source-Version}), libc6-dev, pkg-config
 Recommends: gstreamer-doc (= ${Source-Version})
 Description: GStreamer development libraries and headers
  GStreamer development libraries and headers
@@ -28,8 +29,8 @@ Section: libs
 Depends: ${shlibs:Depends}
 Suggests: gstreamer-tools
 Description: gstreamer-register binary needed to manage plugin registry
- gstreamer-register: binary needed to manage plugin registry
- gstreamer-compprep: register components for gstreamer-complete
+ gst-register: binary needed to manage plugin registry
+ gst-compprep: register components for gstreamer-complete
 
 Package: gstreamer-doc
 Architecture: all
@@ -46,154 +47,22 @@ Suggests: gstreamer-misc
 Description: Tools for use with GStreamer
  Tools for use with GStreamer
  .
- gstreamer-inspect: query details of installed plugins
- gstreamer-launch: command line pipeline generator
- gstreamer-complete: gstreamer-launch bash command line completion tool
-
-Package: libgstmediaplay0
-Architecture: any
-Section: libs
-Depends: ${shlibs:Depends}, gstreamer-core, gstreamer-misc, gstreamer-oss, gstreamer-colorspace, gstreamer-gnomevfs, gstreamer-x
-Description: GStreamer media player library
- GStreamer media player library
-
-Package: libgstmediaplay-dev
-Architecture: any
-Section: devel
-Depends: libgstmediaplay0 (= ${Source-Version}), libc6-dev
-Description: GStreamer media player development library and header
- GStreamer media player development library and headers
-
-Package: gstmediaplay
-Architecture: any
-Section: x11
-Depends: ${shlibs:Depends}
-Suggests: gstreamer-avifile, gstreamer-mad, gstreamer-mpeg2dec, gstreamer-vorbis
-Description: GStreamer media player
- GStreamer media player
-
-Package: libgsteditor0
-Architecture: any
-Section: libs
-Depends: ${shlibs:Depends}
-Description: GStreamer editor library
- GStreamer editor library
-
-Package: libgsteditor-dev
-Architecture: any
-Section: devel
-Depends: libgsteditor0 (= ${Source-Version}), libc6-dev
-Description: GStreamer editor development library and header
- GStreamer editor development library and header
-
-Package: gsteditor
-Architecture: any
-Section: x11
-Depends: ${shlibs:Depends}
-Suggests: gstreamer-misc
-Description: GStreamer editor
- GStreamer editor
-
-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-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.
- .
- NOTE: This package depends on many other packages.
-
-Package: gstreamer-a52dec
-Architecture: any
-Section: libs
-Depends: ${shlibs:Depends}, gstreamer-runtime (= ${Source-Version})
-Description: ATSC A/52 audio decoder plugin for GStreamer
- ATSC A/52 audio decoder plugin for GStreamer
- Uses liba52.
- .
- http://liba52.sourceforge.net/
-
-Package: gstreamer-aa
-Architecture: any
-Section: libs
-Depends: ${shlibs:Depends}, gstreamer-runtime (= ${Source-Version})
-Description: AA-lib plugin for GStreamer
- AA-lib plugin for GStreamer
- .
- http://aa-project.sourceforge.net/aalib/
-
-Package: gstreamer-alsa
-Architecture: any
-Section: libs
-Depends: ${shlibs:Depends}, gstreamer-runtime (= ${Source-Version})
-Description: ALSA plugin for GStreamer
- ALSA plugin for GStreamer
- .
- http://www.alsa-project.org/
-
-Package: gstreamer-arts
-Architecture: any
-Section: libs
-Depends: ${shlibs:Depends}, gstreamer-runtime (= ${Source-Version})
-Description: aRts plugin for GStreamer
- Analog Realtime Synthesizer (aRts) plugin for GStreamer
- .
- http://www.arts-projects.org/
-
-Package: gstreamer-artsd
-Architecture: any
-Section: libs
-Depends: ${shlibs:Depends}, gstreamer-runtime (= ${Source-Version})
-Description: aRtsd plugin for GStreamer
- Analog Realtime Synthesizer daemon (aRtsd) plugin for GStreamer
- .
- http://www.arts-projects.org/
-
-Package: gstreamer-audiofile
-Architecture: any
-Section: libs
-Depends: ${shlibs:Depends}, gstreamer-runtime (= ${Source-Version})
-Description: AudioFile plugin for GStreamer
- AudioFile plugin for GStreamer
-
-Package: gstreamer-avifile
-Architecture: any
-Section: libs
-Depends: ${shlibs:Depends}, gstreamer-runtime (= ${Source-Version})
-Description: avifile plugin for GStreamer
- avifile plugin for GStreamer
- .
- Allows the use of win32 codecs
-
-Package: gstreamer-cdparanoia
-Architecture: any
-Section: libs
-Depends: ${shlibs:Depends}, gstreamer-runtime (= ${Source-Version})
-Description: cdparanoia plugin for GStreamer
- cdparanoia plugin for GStreamer
- .
- http://www.xiph.org/paranoia/
-
-Package: gstreamer-colorspace
-Architecture: any
-Section: libs
-Depends: ${shlibs:Depends}, gstreamer-runtime (= ${Source-Version})
-Description: colorspace conversion plugin for GStreamer
- colorspace conversion plugin for GStreamer
+ gst-inspect: query details of installed plugins
+ gst-launch: command line pipeline generator
+ gst-complete: gstreamer-launch bash command line completion tool
 
 Package: gstreamer-core
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, gstreamer-runtime (= ${Source-Version})
-Description: Core plugins for GStreamer
- Core plugins for GStreamer
+Description: Core element and library plugins for GStreamer
+ Core element and library plugins for GStreamer
  .
  Includes various basic elements:
  * file source and sink
  * tee and aggregator
  * fake source and sink for testing
  * identity
- * http source
  * pipe filter
  * statistics
  .
@@ -202,164 +71,10 @@ Description: Core plugins for GStreamer
  * standard scheduler
  * type detection support
  .
- These plugins have no external dependencies.
-
-Package: gstreamer-dvd
-Architecture: any
-Section: libs
-Depends: ${shlibs:Depends}, gstreamer-runtime (= ${Source-Version})
-Description: DVD plugin for GStreamer
- DVD plugin for GStreamer based on libdvdread.
-
-Package: gstreamer-esd
-Architecture: any
-Section: libs
-Depends: ${shlibs:Depends}, gstreamer-runtime (= ${Source-Version})
-Description: Enlightened Sound Daemon plugin for GStreamer
- Enlightened Sound Daemon plugin for GStreamer
-
-Package: gstreamer-festival
-Architecture: any
-Section: libs
-Depends: ${shlibs:Depends}, gstreamer-runtime (= ${Source-Version})
-Description: Festival speech synthesis plugin for GStreamer
- Festival speech synthesis plugin for GStreamer
-
-Package: gstreamer-flac
-Architecture: any
-Section: libs
-Depends: ${shlibs:Depends}, gstreamer-runtime (= ${Source-Version})
-Description: FLAC plugin for GStreamer
- Free Lossless Audio Codec (FLAC) plugin for GStreamer
- .
- http://flac.sourceforge.net/
-
-Package: gstreamer-gnomevfs
-Architecture: any
-Section: libs
-Depends: ${shlibs:Depends}, gstreamer-runtime (= ${Source-Version})
-Description: Gnome VFS plugin for GStreamer
- Gnome VFS plugin for GStreamer
-
-Package: gstreamer-gsm
-Architecture: any
-Section: libs
-Depends: ${shlibs:Depends}, gstreamer-runtime (= ${Source-Version})
-Description: gsm plugin for GStreamer
- gsm plugin for GStreamer
-
-Package: gstreamer-jpeg
-Architecture: any
-Section: libs
-Depends: ${shlibs:Depends}, gstreamer-runtime (= ${Source-Version})
-Description: jpeg plugin for GStreamer
- jpeg plugin for GStreamer
-
-Package: gstreamer-lame
-Architecture: any
-Section: libs
-Depends: ${shlibs:Depends}, gstreamer-runtime (= ${Source-Version})
-Description: LAME plugin for GStreamer
- LAME plugin for GStreamer
- .
- http://www.mp3dev.org/
- .
- Debian packages can be found at:
- http://www.mayin.org/~gandalf/downloads/
-
-Package: gstreamer-mad
-Architecture: any
-Section: libs
-Depends: ${shlibs:Depends}, gstreamer-runtime (= ${Source-Version})
-Description: MAD MPEG audio decoder plugin for GStreamer
- MAD MPEG audio decoder plugin for GStreamer
- .
- http://www.mars.org/home/rob/proj/mpeg/
-
-Package: gstreamer-mikmod
-Architecture: any
-Section: libs
-Depends: ${shlibs:Depends}, gstreamer-runtime (= ${Source-Version})
-Description: MikMod decoder plugin for GStreamer
- MikMod decoder plugin for GStreamer.
- MikMod is able to decode the IT, XM, S3M, MTM, 669, STM, ULT, FAR,
- MED, AMF, DSM, IMF, GDM, STX, OKT and of course MOD module formats.
- .
- 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
+ Some library plugins:
+ * bytestream
+ * control
+ * putbits
+ * getbits
  .
  These plugins have no external dependencies.
-
-Package: gstreamer-mpeg2dec
-Architecture: any
-Section: libs
-Depends: ${shlibs:Depends}, gstreamer-runtime (= ${Source-Version})
-Description: MPEG1 and MPEG2 video decoder plugin for GStreamer
- MPEG1 and MPEG2 video decoder plugin for GStreamer
- Uses libmpeg2
- .
- http://libmpeg2.sourceforge.net/
-
-Package: gstreamer-mpg123
-Architecture: any
-Section: libs
-Depends: ${shlibs:Depends}, gstreamer-runtime (= ${Source-Version})
-Description: mpg123 plugin for GStreamer
- mpg123 plugin for GStreamer
- .
- http://www.mpg123.de/
-
-Package: gstreamer-oss
-Architecture: any
-Section: libs
-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
-Depends: ${shlibs:Depends}, gstreamer-runtime (= ${Source-Version})
-Description: C64 SID decoder plugin for GStreamer
- C64 SID decoder plugin for GStreamer.
- Capable of playing music written for C64 SID chip (MOS 6581) and
- CPU (6510).
- .
- http://stud1.tuwien.ac.at/~e9426444/
- http://sidplay2.sourceforge.net/
-
-Package: gstreamer-vorbis
-Architecture: any
-Section: libs
-Depends: ${shlibs:Depends}, gstreamer-runtime (= ${Source-Version})
-Description: Vorbis plugin for GStreamer
- Vorbis plugin for GStreamer
- .
- http://www.vorbis.com/
-
-Package: gstreamer-x
-Architecture: any
-Section: libs
-Depends: ${shlibs:Depends}, gstreamer-runtime (= ${Source-Version})
-Description: X videosink plugin for GStreamer
- X videosink plugin for GStreamer
- .
- Has support for XVideo extension acceleration
- .
- http://www.x.org/
- http://www.xfree86.org/

diff --git a/debian/gsteditor.files b/debian/gsteditor.files
deleted file mode 100644 (file)
index 22e2d6e..0000000
--- a/debian/gsteditor.files
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/bin/gsteditor
-usr/share/gsteditor

diff --git a/debian/gsteditor.manpages b/debian/gsteditor.manpages
deleted file mode 100644 (file)
index a9813c2..0000000
--- a/debian/gsteditor.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/gstreamer/usr/share/man/man1/gsteditor.1

diff --git a/debian/gsteditor.menu b/debian/gsteditor.menu
deleted file mode 100644 (file)
index c78b4d2..0000000
--- a/debian/gsteditor.menu
+++ /dev/null
@@ -1,5 +0,0 @@
-?package(gsteditor): \
-  needs=X11 \
-  section=Apps/Viewers \
-  title="GStreamer Editor" \
-  command="/usr/bin/gsteditor"

diff --git a/debian/gstmediaplay.files b/debian/gstmediaplay.files
deleted file mode 100644 (file)
index be0f4c8..0000000
--- a/debian/gstmediaplay.files
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/bin/gstmediaplay
-usr/share/gstmediaplay

diff --git a/debian/gstmediaplay.manpages b/debian/gstmediaplay.manpages
deleted file mode 100644 (file)
index 27951e8..0000000
--- a/debian/gstmediaplay.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/gstreamer/usr/share/man/man1/gstmediaplay.1

diff --git a/debian/gstmediaplay.menu b/debian/gstmediaplay.menu
deleted file mode 100644 (file)
index 904038c..0000000
--- a/debian/gstmediaplay.menu
+++ /dev/null
@@ -1,5 +0,0 @@
-?package(gstmediaplay): \
-  needs=X11 \
-  section=Apps/Viewers \
-  title="GStreamer Media Player" \
-  command="/usr/bin/gstmediaplay"

diff --git a/debian/gstreamer-a52dec.files b/debian/gstreamer-a52dec.files
deleted file mode 100644 (file)
index 667bcf3..0000000
--- a/debian/gstreamer-a52dec.files
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/gst/libgsta52dec.*

diff --git a/debian/gstreamer-aa.files b/debian/gstreamer-aa.files
deleted file mode 100644 (file)
index 8bf52c5..0000000
--- a/debian/gstreamer-aa.files
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/gst/libaasink.*

diff --git a/debian/gstreamer-alsa.files b/debian/gstreamer-alsa.files
deleted file mode 100644 (file)
index a7df92e..0000000
--- a/debian/gstreamer-alsa.files
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/gst/libalsa.*

diff --git a/debian/gstreamer-arts.files b/debian/gstreamer-arts.files
deleted file mode 100644 (file)
index 450704b..0000000
--- a/debian/gstreamer-arts.files
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/gst/libgst_arts.*

diff --git a/debian/gstreamer-artsd.files b/debian/gstreamer-artsd.files
deleted file mode 100644 (file)
index 02dd469..0000000
--- a/debian/gstreamer-artsd.files
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/gst/libartsdsink.*

diff --git a/debian/gstreamer-audiofile.files b/debian/gstreamer-audiofile.files
deleted file mode 100644 (file)
index 69b8a83..0000000
--- a/debian/gstreamer-audiofile.files
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/gst/libafsrc.*
-usr/lib/gst/libafsink.*

diff --git a/debian/gstreamer-avifile.files b/debian/gstreamer-avifile.files
deleted file mode 100644 (file)
index f9535c6..0000000
--- a/debian/gstreamer-avifile.files
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/gst/libwincodec.*

diff --git a/debian/gstreamer-cdparanoia.files b/debian/gstreamer-cdparanoia.files
deleted file mode 100644 (file)
index b347fa1..0000000
--- a/debian/gstreamer-cdparanoia.files
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/gst/libcdparanoia.*

diff --git a/debian/gstreamer-colorspace.files b/debian/gstreamer-colorspace.files
deleted file mode 100644 (file)
index 0b854e9..0000000
--- a/debian/gstreamer-colorspace.files
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/gst/libcolorspace.*

diff --git a/debian/gstreamer-core.postinst b/debian/gstreamer-core.postinst
new file mode 100644 (file)
index 0000000..e2168e8
--- /dev/null
+++ b/debian/gstreamer-core.postinst
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+set -e
+
+if [ "$1" = "configure" ]; then
+   gst-register --gst-mask=0 || true
+   gst-compprep --gst-mask=0 || true
+fi
+
+#DEBHELPER#
+
+exit 0
+

diff --git a/debian/gstreamer-core.postrm b/debian/gstreamer-core.postrm
new file mode 100644 (file)
index 0000000..5c2fdf1
--- /dev/null
+++ b/debian/gstreamer-core.postrm
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+set -e
+
+if [ "$1" = "remove" ]; then
+   gst-register --gst-mask=0 || true
+   gst-compprep --gst-mask=0 || true
+fi
+
+#DEBHELPER#
+
+exit 0
+

diff --git a/debian/gstreamer-dvd.files b/debian/gstreamer-dvd.files
deleted file mode 100644 (file)
index fe4adc7..0000000
--- a/debian/gstreamer-dvd.files
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/gst/libdvdsrc.*

diff --git a/debian/gstreamer-esd.files b/debian/gstreamer-esd.files
deleted file mode 100644 (file)
index dbfa96f..0000000
--- a/debian/gstreamer-esd.files
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/gst/libesdsink.*

diff --git a/debian/gstreamer-festival.files b/debian/gstreamer-festival.files
deleted file mode 100644 (file)
index 127f39f..0000000
--- a/debian/gstreamer-festival.files
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/gst/libgstfestival.*

diff --git a/debian/gstreamer-flac.files b/debian/gstreamer-flac.files
deleted file mode 100644 (file)
index 06b032f..0000000
--- a/debian/gstreamer-flac.files
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/gst/libgstflac.*

diff --git a/debian/gstreamer-gnomevfs.files b/debian/gstreamer-gnomevfs.files
deleted file mode 100644 (file)
index 3480c6d..0000000
--- a/debian/gstreamer-gnomevfs.files
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/gst/libgnomevfssrc.*
-usr/lib/gst/libgnomevfssink.*

diff --git a/debian/gstreamer-gsm.files b/debian/gstreamer-gsm.files
deleted file mode 100644 (file)
index 0fb8f30..0000000
--- a/debian/gstreamer-gsm.files
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/gst/libgstgsm.*

diff --git a/debian/gstreamer-jpeg.files b/debian/gstreamer-jpeg.files
deleted file mode 100644 (file)
index 699d50a..0000000
--- a/debian/gstreamer-jpeg.files
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/gst/libgstjpeg.*

diff --git a/debian/gstreamer-lame.files b/debian/gstreamer-lame.files
deleted file mode 100644 (file)
index ab21a06..0000000
--- a/debian/gstreamer-lame.files
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/gst/libgstlame.*

diff --git a/debian/gstreamer-mad.files b/debian/gstreamer-mad.files
deleted file mode 100644 (file)
index 689b13b..0000000
--- a/debian/gstreamer-mad.files
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/gst/libgstmad.*

diff --git a/debian/gstreamer-mikmod.files b/debian/gstreamer-mikmod.files
deleted file mode 100644 (file)
index ecc9c5f..0000000
--- a/debian/gstreamer-mikmod.files
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/gst/libgstmikmod.*

diff --git a/debian/gstreamer-misc.files b/debian/gstreamer-misc.files
deleted file mode 100644 (file)
index 47eac32..0000000
--- a/debian/gstreamer-misc.files
+++ /dev/null
@@ -1,72 +0,0 @@
-usr/lib/gst/libac3dec.*
-usr/lib/gst/libac3parse.*
-usr/lib/gst/libadder.*
-usr/lib/gst/libalaw.*
-usr/lib/gst/libaudioscale.*
-usr/lib/gst/libaviaudiodecoder.*
-usr/lib/gst/libavidecoder.*
-usr/lib/gst/libavidemux.*
-usr/lib/gst/libaviencoder.*
-usr/lib/gst/libavimux.*
-usr/lib/gst/libavitypes.*
-usr/lib/gst/libchart.*
-usr/lib/gst/libcutter.*
-usr/lib/gst/libdeinterlace.*
-usr/lib/gst/libflxdec.*
-usr/lib/gst/libgstaudio.*
-usr/lib/gst/libgstbytestream.*
-usr/lib/gst/libgstcolorspace.*
-usr/lib/gst/libgstcontrol.*
-usr/lib/gst/libgstgetbits.*
-usr/lib/gst/libgstidct.*
-usr/lib/gst/libgstladspa.*
-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.*
-usr/lib/gst/libgstudp.*
-usr/lib/gst/libintfloatconvert.*
-usr/lib/gst/libjpeg.*
-usr/lib/gst/liblavencode.*
-usr/lib/gst/liblevel.*
-usr/lib/gst/libmedian.*
-usr/lib/gst/libmono2stereo.*
-usr/lib/gst/libmp1videoparse.*
-usr/lib/gst/libmp2videoparse.*
-usr/lib/gst/libmp3parse.*
-usr/lib/gst/libmp3types.*
-usr/lib/gst/libmpeg1encoder.*
-usr/lib/gst/libmpeg1parse.*
-usr/lib/gst/libmpeg1types.*
-usr/lib/gst/libmpeg2enc.*
-usr/lib/gst/libmpeg2parse.*
-usr/lib/gst/libmpeg2play.*
-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.*
-usr/lib/gst/libsmoothwave.*
-usr/lib/gst/libstereo.*
-usr/lib/gst/libstereo2mono.*
-usr/lib/gst/libsynaesthesia.*
-usr/lib/gst/libsystem_encode.*
-usr/lib/gst/libgstqcam.*
-usr/lib/gst/libv4lsrc.*
-usr/lib/gst/libvcdsrc.*
-usr/lib/gst/libvideoscale.*
-usr/lib/gst/libvolenv.*
-usr/lib/gst/libvolume.*
-usr/lib/gst/libvumeter.*

diff --git a/debian/gstreamer-mpeg2dec.files b/debian/gstreamer-mpeg2dec.files
deleted file mode 100644 (file)
index e648f5c..0000000
--- a/debian/gstreamer-mpeg2dec.files
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/gst/libgstmpeg2dec.*

diff --git a/debian/gstreamer-mpg123.files b/debian/gstreamer-mpg123.files
deleted file mode 100644 (file)
index f360298..0000000
--- a/debian/gstreamer-mpg123.files
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/gst/libmpg123.*

diff --git a/debian/gstreamer-oss.files b/debian/gstreamer-oss.files
deleted file mode 100644 (file)
index 3701b79..0000000
--- a/debian/gstreamer-oss.files
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/gst/libgstossaudio.*
-usr/lib/gst/libgstosshelper.*

diff --git a/debian/gstreamer-plugin-template.postinst b/debian/gstreamer-plugin-template.postinst
deleted file mode 100644 (file)
index 9afaa89..0000000
--- a/debian/gstreamer-plugin-template.postinst
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-
-set -e
-
-if [ "$1" = "configure" ]; then
-   gstreamer-register --gst-mask=0 || true
-   gstreamer-compprep --gst-mask=0 || true
-fi
-
-#DEBHELPER#
-
-exit 0
-

diff --git a/debian/gstreamer-plugin-template.postrm b/debian/gstreamer-plugin-template.postrm
deleted file mode 100644 (file)
index b8658f3..0000000
--- a/debian/gstreamer-plugin-template.postrm
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-
-set -e
-
-if [ "$1" = "remove" ]; then
-   gstreamer-register --gst-mask=0 || true
-   gstreamer-compprep --gst-mask=0 || true
-fi
-
-#DEBHELPER#
-
-exit 0
-

diff --git a/debian/gstreamer-runtime.files b/debian/gstreamer-runtime.files
index a471c04e4ed4f3ee01f7a53ed2b57e4e671fcf6b..eb2cfac01caaed94784ca7bf74851a63014bc551 100644 (file)
--- a/debian/gstreamer-runtime.files
+++ b/debian/gstreamer-runtime.files
@@ -1,2 +1,2 @@
-usr/bin/gstreamer-register
-usr/bin/gstreamer-compprep
+usr/bin/gst-register
+usr/bin/gst-compprep

diff --git a/debian/gstreamer-runtime.manpages b/debian/gstreamer-runtime.manpages
index b27541d207c76f7f522e9310a1406f8790b66555..79a46c31920f65d6f91dd8548e8eb5b08be5bec3 100644 (file)
--- a/debian/gstreamer-runtime.manpages
+++ b/debian/gstreamer-runtime.manpages
@@ -1,2 +1,2 @@
-debian/gstreamer/usr/share/man/man1/gstreamer-register.1
-debian/gstreamer/usr/share/man/man1/gstreamer-compprep.1
+debian/gstreamer/usr/share/man/man1/gst-register.1
+debian/gstreamer/usr/share/man/man1/gst-compprep.1

diff --git a/debian/gstreamer-runtime.postinst b/debian/gstreamer-runtime.postinst
index 9afaa890b39dc94a9d29812547cb344e7bc5938c..e2168e8357613cb2f2eb2e7ff2ba5061401d5570 100644 (file)
--- a/debian/gstreamer-runtime.postinst
+++ b/debian/gstreamer-runtime.postinst
@@ -3,8 +3,8 @@
 set -e
 
 if [ "$1" = "configure" ]; then
-   gstreamer-register --gst-mask=0 || true
-   gstreamer-compprep --gst-mask=0 || true
+   gst-register --gst-mask=0 || true
+   gst-compprep --gst-mask=0 || true
 fi
 
 #DEBHELPER#

diff --git a/debian/gstreamer-sdl.files b/debian/gstreamer-sdl.files
deleted file mode 100644 (file)
index 8f82c6a..0000000
--- a/debian/gstreamer-sdl.files
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/gst/libsdlvideosink.*

diff --git a/debian/gstreamer-sid.files b/debian/gstreamer-sid.files
deleted file mode 100644 (file)
index 8df35d3..0000000
--- a/debian/gstreamer-sid.files
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/gst/libgstsid.*

diff --git a/debian/gstreamer-tools.files b/debian/gstreamer-tools.files
index 0a0aa9b9055fe17c8a5b22c741c66f02181d7e60..04e00760de8d6c7c4b2261f95d07e64bf826c45f 100644 (file)
--- a/debian/gstreamer-tools.files
+++ b/debian/gstreamer-tools.files
@@ -1,4 +1,3 @@
-usr/bin/gstreamer-complete
-usr/bin/gstreamer-guilaunch
-usr/bin/gstreamer-inspect
-usr/bin/gstreamer-launch
+usr/bin/gst-complete
+usr/bin/gst-inspect
+usr/bin/gst-launch

diff --git a/debian/gstreamer-tools.manpages b/debian/gstreamer-tools.manpages
index 99e2a0051fd36d81a95af7f7810ae6a2cfecf0ef..71bbb8faeb73c850cc5e62a2795f00bfd36da813 100644 (file)
--- a/debian/gstreamer-tools.manpages
+++ b/debian/gstreamer-tools.manpages
@@ -1,4 +1,4 @@
-debian/gstreamer/usr/share/man/man1/gstreamer-complete.1
-debian/gstreamer/usr/share/man/man1/gstreamer-guilaunch.1
-debian/gstreamer/usr/share/man/man1/gstreamer-inspect.1
-debian/gstreamer/usr/share/man/man1/gstreamer-launch.1
+debian/gstreamer/usr/share/man/man1/gst-complete.1
+debian/gstreamer/usr/share/man/man1/gst-guilaunch.1
+debian/gstreamer/usr/share/man/man1/gst-inspect.1
+debian/gstreamer/usr/share/man/man1/gst-launch.1

diff --git a/debian/gstreamer-vorbis.files b/debian/gstreamer-vorbis.files
deleted file mode 100644 (file)
index 416b741..0000000
--- a/debian/gstreamer-vorbis.files
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/gst/libgstvorbis.*

diff --git a/debian/gstreamer-x.files b/debian/gstreamer-x.files
deleted file mode 100644 (file)
index 3174acf..0000000
--- a/debian/gstreamer-x.files
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/gst/libxvideosink.*

diff --git a/debian/libgst-dev.files b/debian/libgst-dev.files
index f0b9bcf71d3e9e413a2e8889f8d3a01f2015fea0..13506b0c9f6ad58e0936ff73940541ba827568b8 100644 (file)
--- a/debian/libgst-dev.files
+++ b/debian/libgst-dev.files
@@ -1,7 +1,5 @@
 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/libgst-dev.manpages b/debian/libgst-dev.manpages
deleted file mode 100644 (file)
index f557ac5..0000000
--- a/debian/libgst-dev.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/gstreamer/usr/share/man/man1/gstreamer-config.1

diff --git a/debian/libgst1.files b/debian/libgst1.files
deleted file mode 100644 (file)
index 1f4bb43..0000000
--- a/debian/libgst1.files
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/libgst.so.*

diff --git a/debian/libgst2.files b/debian/libgst2.files
new file mode 100644 (file)
index 0000000..1f4bb43
--- /dev/null
+++ b/debian/libgst2.files
@@ -0,0 +1 @@
+usr/lib/libgst.so.*

diff --git a/debian/libgsteditor-dev.files b/debian/libgsteditor-dev.files
deleted file mode 100644 (file)
index d482b8e..0000000
--- a/debian/libgsteditor-dev.files
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/lib/libgsteditor.a
-usr/lib/libgsteditor.la
-usr/lib/libgsteditor.so

diff --git a/debian/libgsteditor0.files b/debian/libgsteditor0.files
deleted file mode 100644 (file)
index f220031..0000000
--- a/debian/libgsteditor0.files
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/libgsteditor.so.*

diff --git a/debian/libgstmediaplay-dev.files b/debian/libgstmediaplay-dev.files
deleted file mode 100644 (file)
index 1a7fe18..0000000
--- a/debian/libgstmediaplay-dev.files
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/lib/libgstmediaplay.a
-usr/lib/libgstmediaplay.la
-usr/lib/libgstmediaplay.so

diff --git a/debian/libgstmediaplay0.files b/debian/libgstmediaplay0.files
deleted file mode 100644 (file)
index 763c8fc..0000000
--- a/debian/libgstmediaplay0.files
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/libgstmediaplay.so.*

diff --git a/debian/rules b/debian/rules
index 77df94d30f1e027a8383391b65d2b35a1fcbe1f4..2edb8ec4eb97b9eb370f97498a331bfca39c7af4 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -12,22 +12,6 @@ export DH_COMPAT=3
 # This has to be exported to make some magic below work.
 export DH_OPTIONS
 
-# The plugins are basically the same.
-# 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 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 \
-               (cd debian; \
-               ln -fs gstreamer-plugin-template.postinst \
-                       gstreamer-$$i.postinst; \
-               ln -fs gstreamer-plugin-template.postrm \
-                       gstreamer-$$i.postrm; \
-               ) \
-       done
-
 export DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
@@ -78,12 +62,6 @@ clean:
 
        dh_clean
 
-       # 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 some extra clean up
        rm -rf \
                debian/gstreamer \
@@ -154,7 +132,7 @@ binary-indep: build install
 # Build architecture-dependent files here.
 # Pass -a to all debhelper commands in this target to reduce clutter.
 binary-arch: DH_OPTIONS=-a
-binary-arch: build install setup-links
+binary-arch: build install
 # Need this version of debhelper for DH_OPTIONS to work.
        dh_testdir
        dh_testroot
@@ -179,7 +157,7 @@ binary-arch: build install setup-links
        dh_makeshlibs
        dh_installdeb
 #      dh_perl
-       dh_shlibdeps -l`pwd`/debian/libgst1/usr/lib:`pwd`/debian/libgstmediaplay0/usr/lib:`pwd`/debian/libgsteditor0/usr/lib
+       dh_shlibdeps -l`pwd`/debian/libgst2/usr/lib
        dh_gencontrol
        dh_md5sums
        dh_builddeb