Major clean for good debian beta2 build.

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

10 files changed, 25 insertions, 68 deletions

diff --git a/debian/README.debian b/debian/README.debian
index aa3db803..da252efd 100644
--- a/debian/README.debian
+++ b/debian/README.debian
@@ -11,4 +11,4 @@ follows:
 
 Of course, only include the .a's that are required for your program.
 
- -- Michael Beattie <mickyb@es.co.nz>, Mon, 26 Jun 2000 18:59:56 +1200
+ -- Michael Beattie <mjb@debian.org>, Mon, 26 Jun 2000 18:59:56 +1200
diff --git a/debian/README.examples b/debian/README.examples
index a7598865..01d11fd2 100644
--- a/debian/README.examples
+++ b/debian/README.examples
@@ -8,4 +8,4 @@ tree, so it will *not* work without being edited first.
 The misc.h included in chaining_example and seeking_test just allows the
 use of a debugging malloc. (defined in misc.c) It is safe to comment out.
 
- -- Michael Beattie <mickyb@es.co.nz>, Mon, 26 Jun 2000 18:59:56 +1200
+ -- Michael Beattie <mjb@debian.org>, Mon, 26 Jun 2000 18:59:56 +1200
diff --git a/debian/changelog b/debian/changelog
index fc7b8d15..27bf0873 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
-vorbis (1.0beta1-2) unstable; urgency=low
+vorbis (1.0beta2-1) unstable; urgency=low
 
+  * New upstream version. Closes: #67326, #68416
   * Changed xmms-vorbis to Architechture: any.  Closes: #67395
   * Added Build-deps. Closes: #66628
-  * 
+  * Moved vorbize to vorbis-tools along with oggenc and vorbiscomment
 
  -- Michael Beattie <mjb@debian.org>  Wed,  9 Aug 2000 00:30:15 +1200
 
diff --git a/debian/control b/debian/control
index 6e8c5191..c3dd56f5 100644
--- a/debian/control
+++ b/debian/control
@@ -2,6 +2,7 @@ Source: vorbis
 Section: sound
 Priority: optional
 Maintainer: Michael Beattie <mjb@debian.org>
+Build-Depends: debhelper (>= 2.1.5), xmms-dev
 Standards-Version: 3.0.1
 
 Package: libvorbis-dev
@@ -47,13 +48,14 @@ Description: A player for Ogg Vorbis files.
  audio representations including MPEG-1 audio layer 3, MPEG-4
  audio (AAC and TwinVQ), and PAC.
 
-Package: vorbize
+Package: vorbis-tools
 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, and an example script for
- converting .mp3 to .ogg. (/usr/share/doc/vorbize/examples/)
+ 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.
  .
diff --git a/debian/mp3tovorbis.control b/debian/mp3tovorbis.control
deleted file mode 100644
index 92dc1002..00000000
--- a/debian/mp3tovorbis.control
+++ /dev/null
@@ -1,14 +0,0 @@
-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 6670eabf..2a7c7fb2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,7 +16,9 @@ build: build-stamp
 build-stamp:
 	dh_testdir
 
-	./configure --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info
+	./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
@@ -24,7 +26,6 @@ build-stamp:
 
 	touch build-stamp
 
-EXTRA_CLEAN= vorbis-tools cmdline xmms vq huff kmpg
 clean:
 	dh_testdir
 	dh_testroot
@@ -32,15 +33,12 @@ clean:
 
 	# Add here commands to clean up after the build process.
 	-$(MAKE) distclean
-	-@for dir in $(EXTRA_CLEAN); do (cd $$dir && $(MAKE) $(MFLAGS) distclean) || exit 1; done
 
 	dh_clean
 
 
 # Build architecture-independent files here.
-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
+binary-arch: libvorbis-dev ogg123 vorbis-tools xmms-vorbis
 
 libvorbis-dev: DH_OPTIONS=-plibvorbis-dev
 libvorbis-dev: build
@@ -87,11 +85,11 @@ ogg123: build
 
 	install -m 755 vorbis-tools/ogg123 `pwd`/debian/ogg123/usr/bin/
 
-	dh_installdocs
+	dh_installdocs vorbis-tools/README
 #	dh_installmenu
-	dh_installmanpages
+	dh_installmanpages vorbize.1 oggenc.1
 #	dh_installinfo
-	dh_undocumented ogg123.1
+#	dh_undocumented
 	dh_installchangelogs vorbis-tools/Changelog
 	dh_strip
 	dh_link
@@ -106,8 +104,8 @@ ogg123: build
 
 
 
-vorbize: DH_OPTIONS=-pvorbize
-vorbize: build
+vorbis-tools: DH_OPTIONS=-pvorbis-tools
+vorbis-tools: build
 	# Need this version of debhelper for DH_OPTIONS to work.
 	dh_testversion 1.1.17
 	dh_testdir
@@ -115,14 +113,16 @@ vorbize: build
 	dh_clean -k
 	dh_installdirs
 
-	install -m 755 vorbis-tools/vorbize `pwd`/debian/vorbize/usr/bin/
+	install -m 755 vorbis-tools/vorbize `pwd`/debian/vorbis-tools/usr/bin/
+	install -m 755 vorbis-tools/oggenc `pwd`/debian/vorbis-tools/usr/bin/
+	install -m 755 vorbis-tools/vorbiscomment `pwd`/debian/vorbis-tools/usr/bin/
 
-	dh_installdocs
+	dh_installdocs vorbis-tools/README
 	dh_installexamples vorbis-tools/mp3tovorbis
 #	dh_installmenu
-	dh_installmanpages
+	dh_installmanpages ogg123.1
 #	dh_installinfo
-	dh_undocumented vorbize.1
+#	dh_undocumented
 	dh_installchangelogs vorbis-tools/Changelog
 	dh_strip
 	dh_link
@@ -137,36 +137,6 @@ 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.
diff --git a/debian/mp3tovorbis.dirs b/debian/vorbis-tools.dirs
index e7724817..e7724817 100644
--- a/debian/mp3tovorbis.dirs
+++ b/debian/vorbis-tools.dirs
diff --git a/debian/mp3tovorbis.docs b/debian/vorbis-tools.docs
index 843d9055..843d9055 100644
--- a/debian/mp3tovorbis.docs
+++ b/debian/vorbis-tools.docs
diff --git a/debian/vorbize.dirs b/debian/vorbize.dirs
deleted file mode 100644
index e7724817..00000000
--- a/debian/vorbize.dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/bin
diff --git a/debian/vorbize.docs b/debian/vorbize.docs
deleted file mode 100644
index 843d9055..00000000
--- a/debian/vorbize.docs
+++ /dev/null
@@ -1 +0,0 @@
-vorbis-tools/README
\ No newline at end of file