[Mplayer-cvslog] CVS: main/debian TODO.Debian,1.3,1.4 changelog,1.4,1.5 control,1.3,1.4 rules,1.6,1.7

[Dariush Pietrzak]

Update of /cvsroot/mplayer/main/debian
In directory mplayer:/var/tmp.root/cvs-serv16057

Modified Files:
	TODO.Debian changelog control rules 
Log Message:
using debhelper instead of hardcoded stuff


Index: TODO.Debian
===================================================================
RCS file: /cvsroot/mplayer/main/debian/TODO.Debian,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TODO.Debian	26 Jun 2001 08:50:39 -0000	1.3
+++ TODO.Debian	28 Jul 2001 07:53:11 -0000	1.4
@@ -1,3 +1,4 @@
+- create packages of mp_font3 and win32codecs, depend/recommend them.  
 - fibmap_mplayer - figure out what to do with suid.
 - global configuration 
  ( /etc/mplayer/mplayer.conf
@@ -7,5 +8,3 @@
 or figure out some other way of satisfying other dependencies
 like *.dlls and fonts.
 In other words - automate win32dll.zip installation.
-- check debhelper quirks and abilities for config files.
-

Index: changelog
===================================================================
RCS file: /cvsroot/mplayer/main/debian/changelog,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- changelog	25 Jun 2001 14:07:52 -0000	1.4
+++ changelog	28 Jul 2001 07:53:11 -0000	1.5
@@ -1,3 +1,9 @@
+mplayer (0.18-2) unstable; urgency=low
+
+  * modified debian scripts 
+
+ -- Dariush Pietrzak <eyck at ghost.tinet.pl>  Fri, 27 Jul 2001 09:25:52 +0200
+
 mplayer (0.18-1) unstable; urgency=low
 
   * lots of changes in mplayer 

Index: control
===================================================================
RCS file: /cvsroot/mplayer/main/debian/control,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- control	26 Jun 2001 08:50:39 -0000	1.3
+++ control	28 Jul 2001 07:53:11 -0000	1.4
@@ -6,7 +6,7 @@
 
 Package: mplayer
 Architecture: any
-Depends: ${shlibs:Depends},debconf
+Depends: ${shlibs:Depends},debconf,libconfhelper-perl
 Description: The Ultimate Movie Player For Linux
   MPlayer is a movie player for LINUX. It plays most MPEG, AVI and ASF files,
   supported by many native and Win32 DLL codecs. You can watch VCD, DVD and even

Index: rules
===================================================================
RCS file: /cvsroot/mplayer/main/debian/rules,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- rules	26 Jun 2001 11:12:27 -0000	1.6
+++ rules	28 Jul 2001 07:53:11 -0000	1.7
@@ -1,55 +1,112 @@
 #!/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
 
-build:
+configure: configure-stamp
+configure-stamp:
+	dh_testdir
+	# Add here commands to configure the package.
 	$(checkdir)
 	./configure --prefix=/usr
+
+	touch configure-stamp
+
+build: configure-stamp 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 dep
 	make mplayer
-	touch build
+
+
+	touch build-stamp
 
 clean:
-	$(checkdir)
-	-rm -f build
-	-$(MAKE) distclean
-	-rm -f `find . -name "*~"`
-	-rm -rf debian/tmp debian/files* core debian/substvars
+	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
 
-binary-indep: checkroot build
-	$(checkdir)
-# There are no architecture-independent files to be uploaded
-# generated by this package.  If there were any they would be
-# made here.
 
 
+install: build
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_installdirs
 
-binary-arch: checkroot build
-	$(checkdir)
-	-rm -rf debian/tmp
-	install -d debian/tmp
-	cd debian/tmp && install -d `cat ../dirs`
+	# Add here commands to install the package into debian/<packagename>
+#	$(MAKE) prefix=`pwd`/debian/`dh_listpackages`/usr install
 	$(MAKE) install prefix=`pwd`/debian/tmp/usr
 
+# 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
+	dh_installexamples
+	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
+	dh_gencontrol
+	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 ..
-
-define checkdir
-	test -f debian/rules
-endef
+#	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
-
-checkroot:
-	$(checkdir)
-	test root = "`whoami`"
 
 .PHONY: binary binary-arch binary-indep clean checkroot