Debian dir restructured following 1.0Beta2->1.0Beta3 ogg vorbis restructuring.

svn path=/trunk/vorbis/; revision=1008

debian/README.Debian

+vorbis for Debian
+----------------------
+
+<possible notes regarding this package - if none, delete this file>
+
+ -- Chris Cheney <ccheney@debian.org>, Tue, 31 Oct 2000 15:08:22 -0600

debian/changelog

+vorbis (1.0beta3-1) unstable; urgency=low
+
+  * New Maintainer.
+  * Upstream source was reorganized.
+  * Package split according to the upstream reorganization.
+
+ -- Chris Cheney <ccheney@debian.org>  Tue, 31 Oct 2000 15:08:22 -0600
+
 vorbis (1.0beta2-1) unstable; urgency=low
 
   * New upstream version. Closes: #67326, #68416
@@ -22,4 +30,5 @@ vorbis (0.0-1) unstable; urgency=low
 
 Local variables:
 mode: debian-changelog
+add-log-mailing-address "ccheney@debian.org"
 End:

debian/control

 Source: vorbis
-Section: sound
+Section: devel
 Priority: optional
-Maintainer: Michael Beattie <mjb@debian.org>
-Build-Depends: debhelper (>= 2.1.5), xmms-dev
-Standards-Version: 3.0.1
+Maintainer: Chris Cheney <ccheney@debian.org>
+Build-Depends: debhelper
+Standards-Version: 3.1.1
 
 Package: libvorbis-dev
-Section: devel
 Architecture: any
-Depends: libc6-dev (>= 2.1.3)
-Description: The OGG Vorbis lossy audio compression codec.
- This Package contains the development libraries and header files for
- Ogg Vorbis.
- .
+Depends: libvorbis (= ${Source-Version}), libc6-dev
+Description: Development library for OGG Vorbis
  Ogg Vorbis is a fully Open, non-proprietary, patent-and-royalty-free,
  general-purpose compressed audio format for high quality (44.1-48.0kHz,
- 16+ bit, polyphonic) audio and music at fixed and variable bitrates
- from 16 to 128 kbps/channel. This places Vorbis in the same class as
- audio representations including MPEG-1 audio layer 3, MPEG-4
+ 16+ bit, polyphonic) audio and music at fixed and variable bitrates 
+ from 16 to 128 kbps/channel. This places Vorbis in the same class as 
+ audio representations including MPEG-1 audio layer 3, MPEG-4 
  audio (AAC and TwinVQ), and PAC.
 
-Package: xmms-vorbis
-Architecture: any
-Depends: ${shlibs:Depends}, xmms
-Description: An xmms plugin to play Ogg Vorbis files.
- This Package contains a plugin for xmms to play files encoded using the
- Ogg Vorbis lossy audio compression codec.
- .
- Ogg Vorbis is a fully Open, non-proprietary, patent-and-royalty-free,
- general-purpose compressed audio format for high quality (44.1-48.0kHz,
- 16+ bit, polyphonic) audio and music at fixed and variable bitrates
- from 16 to 128 kbps/channel. This places Vorbis in the same class as
- audio representations including MPEG-1 audio layer 3, MPEG-4
- audio (AAC and TwinVQ), and PAC.
-
-Package: ogg123
-Architecture: any
-Depends: ${shlibs:Depends}
-Description: A player for Ogg Vorbis files.
- This Package contains a commandline player for files encoded using the
- Ogg Vorbis lossy audio compression codec.
- .
- Ogg Vorbis is a fully Open, non-proprietary, patent-and-royalty-free,
- general-purpose compressed audio format for high quality (44.1-48.0kHz,
- 16+ bit, polyphonic) audio and music at fixed and variable bitrates
- from 16 to 128 kbps/channel. This places Vorbis in the same class as
- audio representations including MPEG-1 audio layer 3, MPEG-4
- audio (AAC and TwinVQ), and PAC.
-
-Package: vorbis-tools
+Package: libvorbis
 Architecture: any
 Depends: ${shlibs:Depends}
-Suggests: ogg123 | xmms-vorbis
-Description: An encoder for the Ogg Vorbis lossy audio compression codec.
- This Package contains two Ogg Vorbis encoders, oggenc and vorbize.
- An example script for converting .mp3's to .ogg's is included.
- (/usr/share/doc/vorbize/examples/mp3tovorbis)
- NOTE: Currently vorbis only works with 44kHz, 16bit stereo raw PCM or
- wav files. Use sox to coax any other formats into line.
- .
+Description: The OGG Vorbis lossy audio compression codec.
  Ogg Vorbis is a fully Open, non-proprietary, patent-and-royalty-free,
  general-purpose compressed audio format for high quality (44.1-48.0kHz,
  16+ bit, polyphonic) audio and music at fixed and variable bitrates
  from 16 to 128 kbps/channel. This places Vorbis in the same class as
  audio representations including MPEG-1 audio layer 3, MPEG-4
  audio (AAC and TwinVQ), and PAC.
-

debian/copyright

-This package was debianized by Michael Beattie <mjb@debian.org> on
-Mon, 26 Jun 2000 18:59:56 +1200.
+This package was debianized by Chris Cheney <ccheney@debian.org> on
+Tue, 31 Oct 2000 15:08:22 -0600.
 
-It was downloaded from http://www.xiph.org/ogg/vorbis/ (via CVS)
+It was downloaded from http://www.xiph.org/ogg/vorbis/download/
 
 Upstream Author(s): Monty <monty@xiph.org>
 
 Copyright:
 
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 dated June, 1991.
+THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-2000 by Monty
+<monty@xiph.org> and The XIPHOPHORUS Company http://www.xiph.org/
 
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program;  if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-   MA 02111-1307, USA.
-
-On Debian GNU/Linux systems, the complete text of the GNU General
-Public License can be found in /usr/share/common-licenses/GPL'.
+You are free to distribute this software under the terms of the GNU
+Library General Public License.  On Debian systems, the complete text
+of the GNU Library General Public License can be found in
+/usr/share/common-licenses/LGPL-2 file.

debian/libvorbis-dev.dirs

+usr/lib
+usr/include

debian/libvorbis-dev.docs

+README
+todo.txt

debian/libvorbis-dev.examples

+examples/chaining_example.c
+examples/decoder_example.c
+examples/encoder_example.c
+examples/seeking_example.c
+examples/vorbisfile_example.c

debian/libvorbis-dev.files

+usr/include/vorbis/*.h
+usr/include/vorbis/book/*.vqh
+usr/lib/*.a
+usr/lib/*.la
+usr/lib/*.so
+usr/share/aclocal/vorbis.m4

debian/libvorbis-dev.postinst

+#! /bin/sh
+# postinst script for vorbis
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <postinst> `configure' <most-recently-configured-version>
+#        * <old-postinst> `abort-upgrade' <new version>
+#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
+#          <new-version>
+#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
+#          <failed-install-package> <version> `removing'
+#          <conflicting-package> <version>
+# for details, see /usr/share/doc/packaging-manual/
+#
+# quoting from the policy:
+#     Any necessary prompting should almost always be confined to the
+#     post-installation script, and should be protected with a conditional
+#     so that unnecessary prompting doesn't happen if a package's
+#     installation fails and the `postinst' is called with `abort-upgrade',
+#     `abort-remove' or `abort-deconfigure'.
+
+case "$1" in
+    configure)
+
+    ;;
+
+    abort-upgrade|abort-remove|abort-deconfigure)
+
+    ;;
+
+    *)
+        echo "postinst called with unknown argument \`$1'" >&2
+        exit 0
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
+
+

debian/libvorbis-dev.postrm

+#! /bin/sh
+# postrm script for vorbis
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <postrm> `remove'
+#        * <postrm> `purge'
+#        * <old-postrm> `upgrade' <new-version>
+#        * <new-postrm> `failed-upgrade' <old-version>
+#        * <new-postrm> `abort-install'
+#        * <new-postrm> `abort-install' <old-version>
+#        * <new-postrm> `abort-upgrade' <old-version>
+#        * <disappearer's-postrm> `disappear' <r>overwrit>r> <new-version>
+# for details, see /usr/share/doc/packaging-manual/
+
+case "$1" in
+       purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
+
+
+        ;;
+
+    *)
+        echo "postrm called with unknown argument \`$1'" >&2
+        exit 0
+
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+

debian/libvorbis-dev.preinst

+#! /bin/sh
+# preinst script for vorbis
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <new-preinst> `install'
+#        * <new-preinst> `install' <old-version>
+#        * <new-preinst> `upgrade' <old-version>
+#        * <old-preinst> `abort-upgrade' <new-version>
+#
+# For details see /usr/share/doc/packaging-manual/
+
+case "$1" in
+    install|upgrade)
+#        if [ "$1" = "upgrade" ]
+#        then
+#            start-stop-daemon --stop --quiet --oknodo  \
+#                --pidfile /var/run/vorbis.pid  \
+#                --exec /usr/sbin/vorbis 2>/dev/null || true
+#        fi
+    ;;
+
+    abort-upgrade)
+    ;;
+
+    *)
+        echo "preinst called with unknown argument \`$1'" >&2
+        exit 0
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
+
+

debian/libvorbis-dev.prerm

+#! /bin/sh
+# prerm script for vorbis
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <prerm> `remove'
+#        * <old-prerm> `upgrade' <new-version>
+#        * <new-prerm> `failed-upgrade' <old-version>
+#        * <conflictor's-prerm> `remove' `in-favour' <package> <new-version>
+#        * <deconfigured's-prerm> `deconfigure' `in-favour'
+#          <package-being-installed> <version> `removing'
+#          <conflicting-package> <version>
+# for details, see /usr/share/doc/packaging-manual/
+
+case "$1" in
+    remove|upgrade|deconfigure)
+#       install-info --quiet --remove /usr/info/vorbis.info.gz
+        ;;
+    failed-upgrade)
+        ;;
+    *)
+        echo "prerm called with unknown argument \`$1'" >&2
+        exit 0
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
+
+

debian/libvorbis.dirs

+usr/lib
+usr/include

debian/libvorbis.docs

+README
+todo.txt
+todo.txt

debian/libvorbis.files

+usr/lib/*.so.*

debian/libvorbis.postinst

+#! /bin/sh
+# postinst script for vorbis
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <postinst> `configure' <most-recently-configured-version>
+#        * <old-postinst> `abort-upgrade' <new version>
+#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
+#          <new-version>
+#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
+#          <failed-install-package> <version> `removing'
+#          <conflicting-package> <version>
+# for details, see /usr/share/doc/packaging-manual/
+#
+# quoting from the policy:
+#     Any necessary prompting should almost always be confined to the
+#     post-installation script, and should be protected with a conditional
+#     so that unnecessary prompting doesn't happen if a package's
+#     installation fails and the `postinst' is called with `abort-upgrade',
+#     `abort-remove' or `abort-deconfigure'.
+
+case "$1" in
+    configure)
+	ldconfig
+    ;;
+
+    abort-upgrade|abort-remove|abort-deconfigure)
+
+    ;;
+
+    *)
+        echo "postinst called with unknown argument \`$1'" >&2
+        exit 0
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
+
+

debian/libvorbis.postrm

+#! /bin/sh
+# postrm script for vorbis
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <postrm> `remove'
+#        * <postrm> `purge'
+#        * <old-postrm> `upgrade' <new-version>
+#        * <new-postrm> `failed-upgrade' <old-version>
+#        * <new-postrm> `abort-install'
+#        * <new-postrm> `abort-install' <old-version>
+#        * <new-postrm> `abort-upgrade' <old-version>
+#        * <disappearer's-postrm> `disappear' <r>overwrit>r> <new-version>
+# for details, see /usr/share/doc/packaging-manual/
+
+case "$1" in
+       purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
+
+
+        ;;
+
+    *)
+        echo "postrm called with unknown argument \`$1'" >&2
+        exit 0
+
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+

debian/libvorbis.preinst

+#! /bin/sh
+# preinst script for vorbis
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <new-preinst> `install'
+#        * <new-preinst> `install' <old-version>
+#        * <new-preinst> `upgrade' <old-version>
+#        * <old-preinst> `abort-upgrade' <new-version>
+#
+# For details see /usr/share/doc/packaging-manual/
+
+case "$1" in
+    install|upgrade)
+#        if [ "$1" = "upgrade" ]
+#        then
+#            start-stop-daemon --stop --quiet --oknodo  \
+#                --pidfile /var/run/vorbis.pid  \
+#                --exec /usr/sbin/vorbis 2>/dev/null || true
+#        fi
+    ;;
+
+    abort-upgrade)
+    ;;
+
+    *)
+        echo "preinst called with unknown argument \`$1'" >&2
+        exit 0
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
+
+

debian/libvorbis.prerm

+#! /bin/sh
+# prerm script for vorbis
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <prerm> `remove'
+#        * <old-prerm> `upgrade' <new-version>
+#        * <new-prerm> `failed-upgrade' <old-version>
+#        * <conflictor's-prerm> `remove' `in-favour' <package> <new-version>
+#        * <deconfigured's-prerm> `deconfigure' `in-favour'
+#          <package-being-installed> <version> `removing'
+#          <conflicting-package> <version>
+# for details, see /usr/share/doc/packaging-manual/
+
+case "$1" in
+    remove|upgrade|deconfigure)
+#       install-info --quiet --remove /usr/info/vorbis.info.gz
+        ;;
+    failed-upgrade)
+        ;;
+    *)
+        echo "prerm called with unknown argument \`$1'" >&2
+        exit 0
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
+
+

debian/rules

 #!/usr/bin/make -f
-# Sample debian/rules that uses debhelper. 
-# GNU copyright 1997 by Joey Hess.
-# Modified for Ogg Vorbis, 2000 by Michael Beattie
+# Sample debian/rules that uses debhelper.
+# GNU copyright 1997 to 1999 by Joey Hess.
 
-# Uncomment this to turn on verbose mode. 
+# Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
 # This is the debhelper compatability version to use.
-export DH_COMPAT=1
+export DH_COMPAT=2
 
-# This has to be exported to make some magic below work.
-export DH_OPTIONS
+configure: configure-stamp
+configure-stamp:
+	dh_testdir
+	# Add here commands to configure the package.
+	
+	./autogen.sh --prefix=/usr
+
+	touch configure-stamp
 
-build: build-stamp
+build: configure-stamp build-stamp
 build-stamp:
 	dh_testdir
 
-	./configure --disable-alsa --prefix=/usr \
-		--mandir=\$${prefix}/share/man \
-		--infodir=\$${prefix}/share/info
 	# Add here commands to compile the package.
 	$(MAKE)
-	cd vorbis-tools && $(MAKE) && $(MAKE) ogg123
-	cd xmms && $(MAKE)
 
 	touch build-stamp
 
 clean:
 	dh_testdir
 	dh_testroot
-	rm -f build-stamp 
+	rm -f build-stamp configure-stamp
 
 	# Add here commands to clean up after the build process.
-	-$(MAKE) distclean
+	-$(MAKE) clean
 
 	dh_clean
 
-
-# Build architecture-independent files here.
-binary-arch: libvorbis-dev ogg123 vorbis-tools xmms-vorbis
-
-libvorbis-dev: DH_OPTIONS=-plibvorbis-dev
-libvorbis-dev: build
-	# Need this version of debhelper for DH_OPTIONS to work.
-	dh_testversion 1.1.17
+install: build
 	dh_testdir
 	dh_testroot
 	dh_clean -k
 	dh_installdirs
 
-	-cp -a include/vorbis/*.h `pwd`/debian/tmp/usr/include/vorbis/
-	-cp -a include/vorbis/book/*.vqh `pwd`/debian/tmp/usr/include/vorbis/book/
-	-cp lib/*.a `pwd`/debian/tmp/usr/lib/
-
-	-cp docs/*.html docs/*.png `pwd`/debian/tmp/usr/share/doc/libvorbis-dev/html/
-
-	dh_installdocs
-	dh_installexamples
-#	dh_installmanpages
-#	dh_installinfo
-#	dh_undocumented
-	dh_installchangelogs 
-	dh_strip
-	dh_link
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-#	dh_makeshlibs
-#	dh_shlibdeps
-	dh_gencontrol -u -isp
-	dh_md5sums
-	dh_builddeb
-
-
-
-ogg123: DH_OPTIONS=-pogg123
-ogg123: build
-	# Need this version of debhelper for DH_OPTIONS to work.
-	dh_testversion 1.1.17
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	dh_installdirs
-
-	install -m 755 vorbis-tools/ogg123 `pwd`/debian/ogg123/usr/bin/
-
-	dh_installdocs vorbis-tools/README
-#	dh_installmenu
-	dh_installmanpages vorbize.1 oggenc.1
-#	dh_installinfo
-#	dh_undocumented
-	dh_installchangelogs vorbis-tools/Changelog
-	dh_strip
-	dh_link
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-#	dh_makeshlibs
-	dh_shlibdeps
-	dh_gencontrol -u -isp
-	dh_md5sums
-	dh_builddeb
+	# Add here commands to install the package into debian/tmp.
+	$(MAKE) install DESTDIR=`pwd`/debian/tmp
 
 
+# Build architecture-independent files here.
+binary-indep: build install
+# We have nothing to do by default.
 
-vorbis-tools: DH_OPTIONS=-pvorbis-tools
-vorbis-tools: build
-	# Need this version of debhelper for DH_OPTIONS to work.
-	dh_testversion 1.1.17
+# Build architecture-dependent files here.
+binary-arch: build install
+#	dh_testversion
 	dh_testdir
 	dh_testroot
-	dh_clean -k
-	dh_installdirs
+	#
+	# build libvorbis${major} package by moving files from vorbis-dev