Split vorbize package into vorbize and mp3tovorbis.

Allows declaring dependency on mpg123 logically.

Michael

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

diff --git a/debian/control b/debian/control
index b989faa..463d9ff 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -21,7 +21,6 @@ Description: The OGG Vorbis lossy audio compression codec.
 Package: xmms-vorbis
 Architecture: i386
 Depends: ${shlibs:Depends}, xmms
-Suggests: vorbize
 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.
@@ -36,7 +35,6 @@ Description: An xmms plugin to play Ogg Vorbis files.
 Package: ogg123
 Architecture: any
 Depends: ${shlibs:Depends}
-Suggests: vorbize
 Description: A player for Ogg Vorbis files.
  This Package contains a commandline player for files encoded using the
  Ogg Vorbis lossy audio compression codec.
@@ -51,11 +49,26 @@ Description: A player for Ogg Vorbis files.
 Package: vorbize
 Architecture: any
 Depends: ${shlibs:Depends}
-Suggests: ogg123 | xmms-vorbis, mpg123
-Provides: mp3tovorbis
+Suggests: ogg123 | xmms-vorbis
 Description: An encoder for the Ogg Vorbis lossy audio compression codec.
- This Package contains the vorbis encoder, and an mp3tovorbis script,
- which you can use to convert your .mp3 files to .ogg
+ This Package contains an Ogg Vorbis encoder.
+ NOTE: Currently vorbis only works with 44kHz, 16bit stereo raw PCM or
+ wav files. Use sox to coax any other formats into line.
+ .
+ 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: 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,

diff --git a/debian/mp3tovorbis.dirs b/debian/mp3tovorbis.dirs
new file mode 100644 (file)
index 0000000..e772481
--- /dev/null
+++ b/debian/mp3tovorbis.dirs
@@ -0,0 +1 @@
+usr/bin

diff --git a/debian/mp3tovorbis.docs b/debian/mp3tovorbis.docs
new file mode 100644 (file)
index 0000000..843d905
--- /dev/null
+++ b/debian/mp3tovorbis.docs
@@ -0,0 +1 @@
+vorbis-tools/README
\ No newline at end of file

diff --git a/debian/rules b/debian/rules
index 0b32a9f..36db899 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -38,7 +38,7 @@ clean:
 
 
 # Build architecture-independent files here.
-binary-arch: libvorbis-dev ogg123 vorbize xmms-vorbis
+binary-arch: libvorbis-dev ogg123 vorbize xmms-vorbis mp3tovorbis
 
 libvorbis-dev: DH_OPTIONS=-plibvorbis-dev
 libvorbis-dev: build
@@ -114,13 +114,12 @@ vorbize: build
        dh_installdirs
 
        install -m 755 vorbis-tools/vorbize `pwd`/debian/vorbize/usr/bin/
-       install -m 755 vorbis-tools/mp3tovorbis `pwd`/debian/vorbize/usr/bin/
 
        dh_installdocs
 #      dh_installmenu
        dh_installmanpages
 #      dh_installinfo
-       dh_undocumented vorbise.1 mp3tovorbis.1
+       dh_undocumented vorbise.1
        dh_installchangelogs vorbis-tools/Changelog
        dh_strip
        dh_link
@@ -135,6 +134,36 @@ vorbize: build
 
 
 
+mp3tovorbis: DH_OPTIONS=-pmp3tovorbis
+mp3tovorbis: 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/mp3tovorbis `pwd`/debian/mp3tovorbis/usr/bin/
+
+       dh_installdocs
+#      dh_installmenu
+       dh_installmanpages
+#      dh_installinfo
+       dh_undocumented mp3tovorbis.1
+       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
+
+
+
 xmms-vorbis: DH_OPTIONS=-pxmms-vorbis
 xmms-vorbis: build install
        # Need this version of debhelper for DH_OPTIONS to work.