Implement an emms-info function using the libtag package.

darcs-hash:20051119181528-8f417-cccb6d14779011d1e58eac89474282257768e631.gz

5 files changed, 56 insertions, 18 deletions

diff --git a/debian/control b/debian/control
index b62482e..67189ce 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: emms
 Section: sound
 Priority: optional
 Maintainer: Jorgen Schaefer <forcer@debian.org>
-Build-Depends: debhelper (>= 4.0.0), emacs21, texinfo
+Build-Depends: debhelper (>= 4.0.0), emacs21, texinfo, libtagc0-dev
 Standards-Version: 3.6.2.1
 
 Package: emms
@@ -16,3 +16,16 @@ Description: The Emacs MultiMedia System
  application to play multimedia files from Emacs using external
  players.
 
+Package: emms-extras
+Architecture: any
+Depends: emms, libtagc0
+Recommends: mpg321, vorbis-tools
+Conflicts: emacs20
+Description: The Emacs MultiMedia System
+ EMMS is the Emacs Multi-Media System. It tries to be a clean and small
+ application to play multimedia files from Emacs using external
+ players.
+ .
+ This package provides emms-print-metadata, a small binary program that emms
+ can use to extract track metadata from music files.
+
diff --git a/debian/emms-extras.dirs b/debian/emms-extras.dirs
new file mode 100644
index 0000000..e772481
--- /dev/null
+++ b/debian/emms-extras.dirs
@@ -0,0 +1 @@
+usr/bin
diff --git a/debian/dirs b/debian/emms.dirs
index ddac531..ddac531 100644
--- a/debian/dirs
+++ b/debian/emms.dirs
diff --git a/debian/docs b/debian/emms.docs
index e845566..e845566 100644
--- a/debian/docs
+++ b/debian/emms.docs
diff --git a/debian/rules b/debian/rules
index 16aece6..65c8978 100755
--- a/debian/rules
+++ b/debian/rules
@@ -25,42 +25,64 @@ configure-stamp:
 	touch configure-stamp
 
 
-build: build-stamp
-
-build-stamp: configure-stamp 
+build: 
+build-indep: build-indep-stamp
+build-arch: build-arch-stamp
+build-arch-stamp:
+	make emms-print-metadata
+	touch build-arch-stamp
+build-indep-stamp: configure-stamp 
 	dh_testdir
 	make emms.info
 	make emms-auto.el
 	make ChangeLog
-	touch build-stamp
+	touch build-indep-stamp
 
 clean:
 	dh_testdir
 	dh_testroot
-	rm -f build-stamp configure-stamp
+	rm -f build-arch-stamp build-indep-stamp configure-stamp
 
 	# Add here commands to clean up after the build process.
 	-$(MAKE) clean
 
 	dh_clean 
 
-install: build
+install: install-indep install-arch
+install-indep:
 	dh_testdir
 	dh_testroot
-	dh_clean -k 
-	dh_installdirs
+	dh_clean -k -i 
+	dh_installdirs -i
 
-	# Add here commands to install the package into debian/emms.
+	# Add here commands to install the indep part of the package into
+	# debian/emms.
 	$(MAKE) deb-install DESTDIR=$(CURDIR)/debian/emms
+	dh_installinfo -i emms.info
+
+	dh_install -i
+
+install-arch:
+	dh_testdir
+	dh_testroot
+	dh_clean -k -s 
+	dh_installdirs -s
+
+	# Add here commands to install the arch part of the package into 
+	# debian/emms-extras.
+	install emms-print-metadata debian/emms-extras/usr/bin/
+
+	dh_install -s
 
-# Build architecture-independent files here.
-binary-indep: build install
+# Must not depend on anything. This is to be called by
+# binary-arch/binary-indep
+# in another 'make' thread.
+binary-common:
 	dh_testdir
 	dh_testroot
 	dh_installchangelogs ChangeLog
 	dh_installdocs
 #	dh_installexamples
-	dh_install
 #	dh_installmenu
 #	dh_installdebconf	
 #	dh_installlogrotate
@@ -69,10 +91,9 @@ binary-indep: build install
 #	dh_installmime
 #	dh_installinit
 #	dh_installcron
-	dh_installinfo emms.info
 #	dh_installman
 	dh_link
-#	dh_strip
+	dh_strip
 	dh_compress
 	dh_fixperms
 #	dh_perl
@@ -83,10 +104,13 @@ binary-indep: build install
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb
+# Build architecture independent packages using the common target.
+binary-indep: build-indep install-indep
+	$(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
 
-# Build architecture-dependent files here.
-binary-arch: build install
-# We have nothing to do by default.
+# Build architecture dependant packages using the common target.
+binary-arch: build-arch install-arch
+	$(MAKE) -f debian/rules DH_OPTIONS=-a binary-common
 
 binary: binary-indep binary-arch
 .PHONY: build clean binary-indep binary-arch binary install configure