Remove debian-extras package as requested by ftpmasters (debian)

darcs-hash:20060603125644-2189f-ff0bdd23bd3b203df37019edae368e4cc97fcb6d.gz

5 files changed, 15 insertions, 49 deletions

diff --git a/debian/control b/debian/control
index 67189ce..e76492b 100644
--- a/debian/control
+++ b/debian/control
@@ -6,26 +6,12 @@ Build-Depends: debhelper (>= 4.0.0), emacs21, texinfo, libtagc0-dev
 Standards-Version: 3.6.2.1
 
 Package: emms
-Architecture: all
-Depends: emacsen-common, emacs21 | emacsen
-Recommends: mpg321, vorbis-tools
-Suggests: mp3info
-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.
-
-Package: emms-extras
 Architecture: any
-Depends: emms, libtagc0
+Depends: emacsen-common, emacs21 | emacsen, ${shlibs:Depends}
 Recommends: mpg321, vorbis-tools
+Suggests: mp3info
 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
deleted file mode 100644
index e772481..0000000
--- a/debian/emms-extras.dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/bin
diff --git a/debian/emms-extras.manpages b/debian/emms-extras.manpages
deleted file mode 100644
index c807de7..0000000
--- a/debian/emms-extras.manpages
+++ /dev/null
@@ -1 +0,0 @@
-emms-print-metadata.1
diff --git a/debian/emms.dirs b/debian/emms.dirs
index ddac531..18a3aaa 100644
--- a/debian/emms.dirs
+++ b/debian/emms.dirs
@@ -1,2 +1,3 @@
 usr/share/emacs/site-lisp/emms
 usr/share/info
+usr/bin
diff --git a/debian/rules b/debian/rules
index 3f923dd..dd96ddb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -25,43 +25,23 @@ configure-stamp:
 	touch configure-stamp
 
 
-build: 
-build-indep: build-indep-stamp
+build: build-arch
 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-indep-stamp
 
 clean:
 	dh_testdir
 	dh_testroot
-	rm -f build-arch-stamp build-indep-stamp configure-stamp
+	rm -f build-arch-stamp configure-stamp
 
 	# Add here commands to clean up after the build process.
 	-$(MAKE) clean
 
 	dh_clean 
 
-install: install-indep install-arch
-install-indep:
-	dh_testdir
-	dh_testroot
-	dh_clean -k -i 
-	dh_installdirs -i
-
-	# Add here commands to install the indep part of the package into
-	# debian/emms.
-	$(MAKE) deb-install DESTDIR=$(CURDIR)/debian/emms PREFIX=$(CURDIR)/debian/emms/usr
-	dh_installinfo -i emms.info
-
-	dh_install -i
-
+install: install-arch
 install-arch:
 	dh_testdir
 	dh_testroot
@@ -69,8 +49,12 @@ install-arch:
 	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/
+	# debian/emms
+	make emms.info
+	make emms-auto.el
+	$(MAKE) deb-install DESTDIR=$(CURDIR)/debian/emms PREFIX=$(CURDIR)/debian/emms/usr
+	dh_installinfo -i emms.info
+	install emms-print-metadata debian/emms/usr/bin/
 
 	dh_install -s
 
@@ -91,7 +75,7 @@ binary-common:
 #	dh_installmime
 #	dh_installinit
 #	dh_installcron
-	dh_installman
+	dh_installman emms-print-metadata.1
 	dh_link
 	dh_strip
 	dh_compress
@@ -104,13 +88,10 @@ binary-common:
 	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 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
+binary: binary-arch
+.PHONY: build clean binary-arch binary install configure