[SCM] mplayer packaging branch, ubuntu, updated. debian/1.0.rc3+svn20090426-1ubuntu12-21-gda351de

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Thu Mar 11 16:10:15 UTC 2010


The following commit has been merged in the ubuntu branch:
commit e8fb572c41a8956f153af975ccec6990dd7ce941
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed Mar 10 23:13:49 2010 +0100

    install manpages in the 'mplayer' package. and only there

diff --git a/debian/control b/debian/control
index c023c0d..f1d7028 100644
--- a/debian/control
+++ b/debian/control
@@ -113,8 +113,8 @@ Section: video
 Suggests: mplayer-doc,
           ttf-freefont,
           bzip2,
-         fontconfig
-Depends: mplayer-nogui,
+          fontconfig
+Depends: mplayer,
          ${shlibs:Depends},
          ${misc:Depends}
 Description: MPlayer's Movie Encoder
diff --git a/debian/rules b/debian/rules
index 8db42bf..d325dbf 100755
--- a/debian/rules
+++ b/debian/rules
@@ -103,21 +103,20 @@ install-arch: $(QUILT_STAMPFN)
 	$(MAKE)
 	# build non-gui version
 	$(MAKE) install-mplayer DESTDIR=$(CURDIR)/debian/mplayer
-	$(MAKE) install-mplayer-man-en DESTDIR=$(CURDIR)/debian/mplayer
+	$(MAKE) install-mplayer-man DESTDIR=$(CURDIR)/debian/mplayer
+	$(MAKE) install-mencoder-man DESTDIR=$(CURDIR)/debian/mplayer
 	install -D -m 644 debian/mplayer.conf \
 	                  $(CURDIR)/debian/mplayer-nogui/etc/mplayer/mplayer.conf
 	install -D -m 644 debian/apport-hook.py \
 	                  $(CURDIR)/debian/mplayer-nogui/usr/share/apport/package-hooks/source_mplayer.py
 	#install mencoder
 	$(MAKE) install-mencoder DESTDIR=$(CURDIR)/debian/mencoder
-	$(MAKE) install-mencoder-man DESTDIR=$(CURDIR)/debian/mencoder
 	# build gui version
 	[ ! -f config.mak ] || $(MAKE) distclean
 	$(CLEAN_ENV) \
 	./configure $(COMMON_CONFIGURE_FLAGS) $(DEB_BUILD_CONFIGURE) --enable-gui
 	$(CLEAN_ENV) \
 	$(MAKE)
-	$(MAKE) install-mplayer-gui-man DESTDIR=$(CURDIR)/debian/mplayer-gui
 	install -D -m 755 mplayer $(CURDIR)/debian/mplayer-gui/usr/bin/gmplayer
 	install -D -m 644 etc/mplayer.desktop \
 	                  $(CURDIR)/debian/mplayer-gui/usr/share/applications/mplayer.desktop
@@ -135,6 +134,8 @@ install-indep-stamp:
 	$(MAKE) -C DOCS/xml html-chunked
 	dh_installchangelogs -i
 	dh_installdocs -i
+	dh_compress -i
+	dh_fixperms -i
 	touch $@
 
 ################ clean
@@ -161,11 +162,11 @@ binary-arch: install-arch
 	dh_installmenu -a
 	dh_installmime -a
 	dh_installman -a
-	dh_strip --dbg-package=mplayer-dbg
+	dh_strip -a --dbg-package=mplayer-dbg
 	dh_link
-	dh_compress
-	dh_fixperms
-	dh_makeshlibs
+	dh_compress -a
+	dh_fixperms -a
+	dh_makeshlibs -a
 	dh_installdeb
 	dh_shlibdeps
 	dh_gencontrol

-- 
mplayer packaging



More information about the pkg-multimedia-commits mailing list