Okay...

1) changed my email address.
2) mp3tovorbis is an example for vorbize, not a package. it is too small to
   warrant a package, and its dependency on mpg123 makes it non-dfsg free.

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

4 files changed, 32 insertions, 19 deletions

diff --git a/debian/changelog b/debian/changelog
index 767c008b..fc7b8d15 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+vorbis (1.0beta1-2) unstable; urgency=low
+
+  * Changed xmms-vorbis to Architechture: any.  Closes: #67395
+  * Added Build-deps. Closes: #66628
+  * 
+
+ -- Michael Beattie <mjb@debian.org>  Wed,  9 Aug 2000 00:30:15 +1200
+
 vorbis (1.0beta1-1) unstable; urgency=low
 
   * First Beta, Ready for debian release.
diff --git a/debian/control b/debian/control
index 463d9ff6..6e8c5191 100644
--- a/debian/control
+++ b/debian/control
@@ -1,14 +1,15 @@
 Source: vorbis
 Section: sound
 Priority: optional
-Maintainer: Michael Beattie <mickyb@es.co.nz>
+Maintainer: Michael Beattie <mjb@debian.org>
 Standards-Version: 3.0.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 library's and header files for
+ This Package contains the development libraries and header files for
  Ogg Vorbis.
  .
  Ogg Vorbis is a fully Open, non-proprietary, patent-and-royalty-free,
@@ -19,7 +20,7 @@ Description: The OGG Vorbis lossy audio compression codec.
  audio (AAC and TwinVQ), and PAC.
 
 Package: xmms-vorbis
-Architecture: i386
+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
@@ -51,7 +52,8 @@ Architecture: any
 Depends: ${shlibs:Depends}
 Suggests: ogg123 | xmms-vorbis
 Description: An encoder for the Ogg Vorbis lossy audio compression codec.
- This Package contains an Ogg Vorbis encoder.
+ This Package contains an Ogg Vorbis encoder, and an example script for
+ converting .mp3 to .ogg. (/usr/share/doc/vorbize/examples/)
  NOTE: Currently vorbis only works with 44kHz, 16bit stereo raw PCM or
  wav files. Use sox to coax any other formats into line.
  .
@@ -62,17 +64,3 @@ Description: An encoder for the Ogg Vorbis lossy audio compression codec.
  audio representations including MPEG-1 audio layer 3, MPEG-4
  audio (AAC and TwinVQ), and PAC.
 
-Package: mp3tovorbis
-Architecture: any
-Depends: vorbize, mpg123
-Description: An encoder for the Ogg Vorbis lossy audio compression codec.
- This Package contains an mp3tovorbis script which you can use to
- convert your .mp3 files to .ogg
- NOTE: this will only work on 44kHz 16bit stereo mp3's
- .
- 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.
diff --git a/debian/mp3tovorbis.control b/debian/mp3tovorbis.control
new file mode 100644
index 00000000..92dc1002
--- /dev/null
+++ b/debian/mp3tovorbis.control
@@ -0,0 +1,14 @@
+Package: mp3tovorbis
+Architecture: any
+Depends: vorbize, mpg123
+Description: An encoder for the Ogg Vorbis lossy audio compression codec.
+ This Package contains an mp3tovorbis script which you can use to   
+ convert your .mp3 files to .ogg
+ NOTE: this will only work on 44kHz 16bit stereo mp3's
+ .
+ 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.
diff --git a/debian/rules b/debian/rules
index 6c4105cc..6670eabf 100755
--- a/debian/rules
+++ b/debian/rules
@@ -38,7 +38,9 @@ clean:
 
 
 # Build architecture-independent files here.
-binary-arch: libvorbis-dev ogg123 vorbize xmms-vorbis mp3tovorbis
+binary-arch: libvorbis-dev ogg123 vorbize xmms-vorbis # mp3tovorbis
+               # mp3tovorbis is small, and depends on mpg123 in non-free
+               # moved it as an "example" for vorbize
 
 libvorbis-dev: DH_OPTIONS=-plibvorbis-dev
 libvorbis-dev: build
@@ -116,6 +118,7 @@ vorbize: build
 	install -m 755 vorbis-tools/vorbize `pwd`/debian/vorbize/usr/bin/
 
 	dh_installdocs
+	dh_installexamples vorbis-tools/mp3tovorbis
 #	dh_installmenu
 	dh_installmanpages
 #	dh_installinfo