[Mplayer-dev-eng] [patch] Debian cleanup

[André Dahlqvist]

Since Dariush is now on the list again I'm sending this Debian patch here.
The below patch updates the debian/rules file to what is currently shipped
with debhelper v3. It also makes us install manpages into
/usr/share/man/man1 which is according to the Debian policy. The rest of
the changes should be obvious.

Warning: untested. I need to jump on the bike to the university now so I
don't have time to test this until later today (yes, that means I shouldn't
post here yet but...:-)

Index: debian/control
===================================================================
RCS file: /cvsroot/mplayer/main/debian/control,v
retrieving revision 1.6
diff -u -r1.6 control
--- debian/control	22 Aug 2001 21:25:24 -0000	1.6
+++ debian/control	23 Aug 2001 12:17:19 -0000
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Dariush Pietrzak <eyck at ghost.anime.pl>
 Standards-Version: 3.2.1
-Build-Depends: xlibs-dev, libpng2-dev, libz-dev, debhelper (>= 2)
+Build-Depends: xlibs-dev, libpng2-dev, libz-dev, debhelper (>= 3.0.0)
 
 Package: mplayer
 Architecture: any
Index: debian/dirs
===================================================================
RCS file: /cvsroot/mplayer/main/debian/dirs,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 dirs
--- debian/dirs	27 Feb 2001 02:04:09 -0000	1.1.1.1
+++ debian/dirs	23 Aug 2001 12:17:19 -0000
@@ -1,3 +1,3 @@
 usr/bin
 usr/sbin
-usr/man/man1/
+usr/share/man/man1
Index: debian/rules
===================================================================
RCS file: /cvsroot/mplayer/main/debian/rules,v
retrieving revision 1.9
diff -u -r1.9 rules
--- debian/rules	23 Aug 2001 11:20:22 -0000	1.9
+++ debian/rules	23 Aug 2001 12:17:19 -0000
@@ -1,47 +1,29 @@
 #!/usr/bin/make -f
-# Made with the aid of debmake, by Christoph Lameter,
-# based on the sample debian/rules file for GNU hello by Ian Jackson.
-#export DH_VERBOSE=1
-# This is the debhelper compatability version to use.
-export DH_COMPAT=1
-
-package=mplayer
+# Sample debian/rules that uses debhelper.
+# This file is public domain software, originally written by Joey Hess. 
 
-configure: configure-stamp
-configure-stamp:
-	dh_testdir
-	# Add here commands to configure the package.
-	$(checkdir)
-	./configure --prefix=/usr
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
 
-	touch configure-stamp
+# This is the debhelper compatibility version to use.
+export DH_COMPAT=3
 
-build: configure-stamp build-stamp
+build: build-stamp
 build-stamp:
 	dh_testdir
 
-	# Add here commands to compile the package.
-	#$(MAKE)
-	#/usr/bin/docbook-to-man debian/etherconf.sgml > etherconf.1
-	${MAKE} mplayer
+	$(MAKE)
 
 	touch build-stamp
 
 clean:
 	dh_testdir
 	dh_testroot
-	rm -f build-stamp configure-stamp
-
-	# Add here commands to clean up after the build process.
-	#-$(MAKE) clean
-#	$(checkdir)
-#	-rm -f build
-#	-$(MAKE) distclean
-#	-rm -f `find . -name "*~"`
-#	-rm -rf debian/tmp debian/files* core debian/substvars
-	dh_clean
+	rm -f build-stamp
 
+	-$(MAKE) distclean
 
+	dh_clean
 
 install: build
 	dh_testdir
@@ -49,38 +31,27 @@
 	dh_clean -k
 	dh_installdirs
 
-	# Add here commands to install the package into debian/<packagename>
-#	$(MAKE) prefix=`pwd`/debian/`dh_listpackages`/usr install
-	$(MAKE) install prefix=$(CURDIR)/debian/tmp/usr
+	$(MAKE) prefix=`pwd`/debian/`dh_listpackages`/usr install
 
 # Build architecture-independent files here.
 binary-indep: build install
 # We have nothing to do by default.
 
-
 # Build architecture-dependent files here.
 binary-arch: build install
 	dh_testdir
 	dh_testroot
 	dh_installdebconf	
 	dh_installdocs DOCS/*
-	dh_installexamples
+	dh_installexamples /etc/example.conf
 	dh_installmenu
-#	dh_installlogrotate
-#	dh_installemacsen
-#	dh_installpam
-#	dh_installmime
-#	dh_installinit
-#	dh_installcron
 	dh_installman
-	dh_installinfo
 #	dh_undocumented
 	dh_installchangelogs
 	dh_link
 	dh_strip
 	dh_compress
 	dh_fixperms
-#	dh_makeshlibs
 	dh_installdeb
 	dh_perl
 	dh_shlibdeps
@@ -88,23 +59,5 @@
 	dh_md5sums
 	dh_builddeb
 
-
-
-#binary-arch: checkroot build
-#	$(checkdir)
-#	-rm -rf debian/tmp
-#	install -d debian/tmp
-#	cd debian/tmp && install -d `cat ../dirs`
-
-
-# Must have debmake installed for this to work. Otherwise please copy
-# /usr/bin/debstd into the debian directory and change debstd to debian/debstd
-#	debstd 
-#	dpkg-gencontrol -isp
-#	chown -R root.root debian/tmp
-#	chmod -R go=rX debian/tmp
-#	dpkg --build debian/tmp ..
-
 binary: binary-indep binary-arch
-
-.PHONY: binary binary-arch binary-indep clean checkroot
+.PHONY: build clean binary-indep binary-arch binary install
-- 

André Dahlqvist <andre.dahlqvist at telia.com>

_______________________________________________
Mplayer-dev-eng mailing list
Mplayer-dev-eng at lists.sourceforge.net
http://lists.sourceforge.net/lists/listinfo/mplayer-dev-eng