[SCM] mplayer packaging branch, master, updated. debian/1.0.rc3+svn20090426-1ubuntu14-16-gda51fea

[siretart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit a6d43ef845410c957ac7eec03ddabdee3761b9c1
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat Mar 27 22:28:41 2010 +0100

    move config file and apport hook 'mplayer-nogui'->'mplayer' LP: #540491, #549613

diff --git a/debian/control b/debian/control
index 1592314..27fc801 100644
--- a/debian/control
+++ b/debian/control
@@ -141,7 +141,7 @@ Suggests: mplayer-doc,
 Depends: ${shlibs:Depends},
          ${misc:Depends}
 Replaces: mplayer-doc (<< 2:1.0~rc3+svn20090426-1ubuntu14),
-          mplayer-nogui (<< 2:1.0~rc3+svn20090426-1ubuntu14),
+          mplayer-nogui (<< 2:1.0~rc3+svn20090426-1ubuntu16),
           mencoder (<< 2:1.0~rc3+svn20090426-1ubuntu14)
 Description: movie player for Unix-like systems
  MPlayer plays most MPEG, VOB, AVI, Ogg/OGM, VIVO,
diff --git a/debian/rules b/debian/rules
index d325dbf..ecc5ab2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -106,9 +106,9 @@ install-arch: $(QUILT_STAMPFN)
 	$(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
+	                  $(CURDIR)/debian/mplayer/etc/mplayer/mplayer.conf
 	install -D -m 644 debian/apport-hook.py \
-	                  $(CURDIR)/debian/mplayer-nogui/usr/share/apport/package-hooks/source_mplayer.py
+	                  $(CURDIR)/debian/mplayer/usr/share/apport/package-hooks/source_mplayer.py
 	#install mencoder
 	$(MAKE) install-mencoder DESTDIR=$(CURDIR)/debian/mencoder
 	# build gui version

-- 
mplayer packaging