[debian-edu-commits] r81302 - in branches/wheezy/debian-edu-config: . cf debian testsuite

[pere at alioth.debian.org]

Author: pere
Date: 2013-07-02 10:41:51 +0000 (Tue, 02 Jul 2013)
New Revision: 81302

Removed:
   branches/wheezy/debian-edu-config/cf/cf.mplayer
Modified:
   branches/wheezy/debian-edu-config/Makefile
   branches/wheezy/debian-edu-config/cf/cfengine.conf
   branches/wheezy/debian-edu-config/debian/changelog
   branches/wheezy/debian-edu-config/debian/debian-edu-config.postinst
   branches/wheezy/debian-edu-config/testsuite/workstation
Log:
Remove cfengine rule to modify the mplayer.conf file, as we now
use mplayer2 where this file no longer is included and the BTS
report #491403 to not seem relevant for us any more.  This get rid
of the mplayer test suite failure for some desktop types, as the
test is no longer relevant.

Modified: branches/wheezy/debian-edu-config/Makefile
===================================================================
--- branches/wheezy/debian-edu-config/Makefile	2013-07-02 10:32:29 UTC (rev 81301)
+++ branches/wheezy/debian-edu-config/Makefile	2013-07-02 10:41:51 UTC (rev 81302)
@@ -60,7 +60,6 @@
 	cf.pxeinstall \
 	cf.lwat \
 	cf.fstab \
-	cf.mplayer \
 	cf.nagios3 \
 	cf.ntp \
 	cf.samba \

Deleted: branches/wheezy/debian-edu-config/cf/cf.mplayer
===================================================================
--- branches/wheezy/debian-edu-config/cf/cf.mplayer	2013-07-02 10:32:29 UTC (rev 81301)
+++ branches/wheezy/debian-edu-config/cf/cf.mplayer	2013-07-02 10:41:51 UTC (rev 81302)
@@ -1,12 +0,0 @@
-#
-# Configure mplayer to work for more sites
-#
-editfiles:
-  debian.workstation|debian.standalone::
-    # Configure mplayer to use TCP for RTSP, instead of UDP.  It has a
-    # higher chance of working inside firewalls and NET routers, and
-    # seem to work with more RTSP sites.  It should get
-    # http://www.filmarkivet.no/open/ working (BTS #491403).
-    { /etc/mplayer/mplayer.conf
-      AppendIfNoSuchLine "rtsp-use-tcp=1"
-    }

Modified: branches/wheezy/debian-edu-config/cf/cfengine.conf
===================================================================
--- branches/wheezy/debian-edu-config/cf/cfengine.conf	2013-07-02 10:32:29 UTC (rev 81301)
+++ branches/wheezy/debian-edu-config/cf/cfengine.conf	2013-07-02 10:41:51 UTC (rev 81302)
@@ -110,7 +110,6 @@
 			cf.krb5client
 			cf.ldapclient
 			cf.ldapserver
-			cf.mplayer
 			cf.ntp
 			cf.squid
 			cf.pxeinstall

Modified: branches/wheezy/debian-edu-config/debian/changelog
===================================================================
--- branches/wheezy/debian-edu-config/debian/changelog	2013-07-02 10:32:29 UTC (rev 81301)
+++ branches/wheezy/debian-edu-config/debian/changelog	2013-07-02 10:41:51 UTC (rev 81302)
@@ -1,9 +1,17 @@
 debian-edu-config (1.708~svn81) UNRELEASED; urgency=low
 
+  [ Wolfgang Schweer ]
   * ldap-tools/sitesummary2ldapdhcp:
     - Fix configuration for 'netdevices'.
     - Modify help message to fit the code after last cleanup.
 
+  [ Petter Reinholdtsen ]
+  * Remove cfengine rule to modify the mplayer.conf file, as we now
+    use mplayer2 where this file no longer is included and the BTS
+    report #491403 to not seem relevant for us any more.  This get rid
+    of the mplayer test suite failure for some desktop types, as the
+    test is no longer relevant.
+
  -- Wolfgang Schweer <wschweer at arcor.de>  Tue, 02 Jul 2013 12:23:22 +0200
 
 debian-edu-config (1.708~svn81297) wheezy-test; urgency=low

Modified: branches/wheezy/debian-edu-config/debian/debian-edu-config.postinst
===================================================================
--- branches/wheezy/debian-edu-config/debian/debian-edu-config.postinst	2013-07-02 10:32:29 UTC (rev 81301)
+++ branches/wheezy/debian-edu-config/debian/debian-edu-config.postinst	2013-07-02 10:41:51 UTC (rev 81302)
@@ -251,6 +251,10 @@
         rm_conffile debian-edu-config /etc/ldap/dns_ranges.ldif
     fi
 
+    if dpkg --compare-versions "$2" le "1.708~svn81297"; then
+        rm_conffile debian-edu-config /etc/cfengine/debian-edu/cf.mplayer
+    fi
+
     # sssd refuses to read the file if it has any other mode
     chmod 600 /etc/sssd/sssd-debian-edu.conf
     chown root:root /etc/sssd/sssd-debian-edu.conf

Modified: branches/wheezy/debian-edu-config/testsuite/workstation
===================================================================
--- branches/wheezy/debian-edu-config/testsuite/workstation	2013-07-02 10:32:29 UTC (rev 81301)
+++ branches/wheezy/debian-edu-config/testsuite/workstation	2013-07-02 10:41:51 UTC (rev 81302)
@@ -12,9 +12,3 @@
 else
     exit 0
 fi
-
-if  grep -q '^rtsp-use-tcp=1$' /etc/mplayer/mplayer.conf ; then
-    echo "success: $0: MPlayer RTSP override in place."
-else
-    echo "error: $0: MPlayer RTSP override missing."
-fi