[Pkg-kde-commits] rev 282 - in trunk/packages/arts/debian: . patches

Christopher Martin chrsmrtn-guest@haydn.debian.org
Tue, 07 Dec 2004 13:44:34 -0700 

Author: chrsmrtn-guest
Date: 2004-12-07 13:44:29 -0700 (Tue, 07 Dec 2004)
New Revision: 282

Added:
   trunk/packages/arts/debian/README.Debian
   trunk/packages/arts/debian/arts.docs
   trunk/packages/arts/debian/libarts1-dev.docs
   trunk/packages/arts/debian/libarts1.docs
   trunk/packages/arts/debian/patches/06_automake-1.9.diff
Modified:
   trunk/packages/arts/debian/changelog
   trunk/packages/arts/debian/control
   trunk/packages/arts/debian/patches/02_autotools_update.diff
   trunk/packages/arts/debian/patches/03_libtool_arm.diff
   trunk/packages/arts/debian/patches/04_am_maintainer_mode.diff
   trunk/packages/arts/debian/patches/05_pedantic-errors.diff
   trunk/packages/arts/debian/rules
Log:
Committing changes for arts 1.3.2-1.


Added: trunk/packages/arts/debian/README.Debian
===================================================================
--- trunk/packages/arts/debian/README.Debian	2004-12-06 02:42:33 UTC (rev 281)
+++ trunk/packages/arts/debian/README.Debian	2004-12-07 20:44:29 UTC (rev 282)
@@ -0,0 +1,27 @@
+aRts for Debian ships without the SUID bit set on artswrapper, thus
+preventing the aRts daemon from running with realtime scheduling
+priority, a feature which helps prevent audio skips and jumps.
+
+This restriction is in place due to aRts' unfortunate tendency to
+lock the system on exit, when run with realtime priority on systems
+with a 2.4 series kernel.
+
+NB: The akode aRts decoder plug-in, introduced with KDE 3.3,
+dramatically improves aRts' CPU usage and helps to maintain
+uninterrupted playback, often making realtime scheduling
+unnecessary (apt-get install akode).
+
+Users running other kernels, or simply willing to risk it, can set
+SUID on artswrapper, thus enabling the possibility of realtime
+scheduling, by running, as root:
+
+dpkg-statoverride --add --update root root 4755 /usr/bin/artswrapper
+
+If this causes problems, the default permissions can be restored by
+running, as root:
+
+dpkg-statoverride --remove /usr/bin/artswrapper
+chmod 0755 /usr/bin/artswrapper
+
+ -- Christopher Martin <chrsmrtn@freeshell.org>
+    Mon,  6 Dec 2004 12:26:16 -0500

Added: trunk/packages/arts/debian/arts.docs
===================================================================
--- trunk/packages/arts/debian/arts.docs	2004-12-06 02:42:33 UTC (rev 281)
+++ trunk/packages/arts/debian/arts.docs	2004-12-07 20:44:29 UTC (rev 282)
@@ -0,0 +1 @@
+debian/README.Debian

Modified: trunk/packages/arts/debian/changelog
===================================================================
--- trunk/packages/arts/debian/changelog	2004-12-06 02:42:33 UTC (rev 281)
+++ trunk/packages/arts/debian/changelog	2004-12-07 20:44:29 UTC (rev 282)
@@ -1,3 +1,14 @@
+arts (1.3.2-1) unstable; urgency=medium
+
+  * New upstream release.
+  * No longer set suid on artswrapper. Works around a 2.4 kernel lockup bug,
+    but disables realtime priority. Added a README.Debian, explaining the
+    change and how to cope with it, and reverse it.
+    (Closes: #266760)
+  * Add Suggests on akode, which often suffices in place of realtime priority.
+
+ -- Christopher Martin <chrsmrtn@freeshell.org>  Mon,  6 Dec 2004 12:26:16 -0500
+
 arts (1.3.1-1) unstable; urgency=low
 
   * New upstream release.

Modified: trunk/packages/arts/debian/control
===================================================================
--- trunk/packages/arts/debian/control	2004-12-06 02:42:33 UTC (rev 281)
+++ trunk/packages/arts/debian/control	2004-12-07 20:44:29 UTC (rev 282)
@@ -2,10 +2,10 @@
 Section: libs
 Priority: optional
 Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
-Uploaders: Christopher L Cheney <ccheney@debian.org>
+Uploaders: Christopher L Cheney <ccheney@debian.org>, Christopher Martin <chrsmrtn@freeshell.org>
 Build-Depends: automake1.9, debhelper (>> 4.2.0), docbook-to-man, gawk, gettext, libasound2-dev, libaudio-dev, libaudiofile-dev, libesd0-dev, libglib2.0-dev, libjack0.80.0-dev, libmad0-dev, libqt3-mt-dev, libvorbis-dev, sharutils, texinfo, xlibs-static-pic
 Build-Conflicts: libmas-dev
-Standards-Version: 3.6.1.0
+Standards-Version: 3.6.1
 
 Package: arts
 Architecture: all
@@ -26,6 +26,7 @@
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}
+Suggests: akode
 Conflicts: libarts (<< 4:3.0.0), libarts-alsa (<< 4:3.0.0)
 Replaces: libarts (<< 4:3.0.0), libarts-alsa (<< 4:3.0.0)
 Description: aRts Sound system

Added: trunk/packages/arts/debian/libarts1-dev.docs
===================================================================
--- trunk/packages/arts/debian/libarts1-dev.docs	2004-12-06 02:42:33 UTC (rev 281)
+++ trunk/packages/arts/debian/libarts1-dev.docs	2004-12-07 20:44:29 UTC (rev 282)
@@ -0,0 +1 @@
+debian/README.Debian

Added: trunk/packages/arts/debian/libarts1.docs
===================================================================
--- trunk/packages/arts/debian/libarts1.docs	2004-12-06 02:42:33 UTC (rev 281)
+++ trunk/packages/arts/debian/libarts1.docs	2004-12-07 20:44:29 UTC (rev 282)
@@ -0,0 +1 @@
+debian/README.Debian

Modified: trunk/packages/arts/debian/patches/02_autotools_update.diff
===================================================================
--- trunk/packages/arts/debian/patches/02_autotools_update.diff	2004-12-06 02:42:33 UTC (rev 281)
+++ trunk/packages/arts/debian/patches/02_autotools_update.diff	2004-12-07 20:44:29 UTC (rev 282)
@@ -1,5 +1,4 @@
-diff -Nrua arts-1.3.1/admin/compile arts-patched/admin/compile
---- arts-1.3.1/admin/compile	2002-09-30 07:18:17.000000000 -0500
+--- arts-1.3.2/admin/compile	2002-09-30 07:18:17.000000000 -0500
 +++ arts-patched/admin/compile	2004-09-19 17:51:50.000000000 -0500
 @@ -1,8 +1,9 @@
  #! /bin/sh
@@ -180,8 +179,7 @@
 +# time-stamp-format: "%:y-%02m-%02d.%02H"
 +# time-stamp-end: "$"
 +# End:
-diff -Nrua arts-1.3.1/admin/config.guess arts-patched/admin/config.guess
---- arts-1.3.1/admin/config.guess	2004-08-02 09:17:40.000000000 -0500
+--- arts-1.3.2/admin/config.guess	2004-08-02 09:17:40.000000000 -0500
 +++ arts-patched/admin/config.guess	2004-08-25 09:25:50.000000000 -0500
 @@ -3,7 +3,7 @@
  #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
@@ -244,8 +242,7 @@
  	esac
  	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
  	exit 0 ;;
-diff -Nrua arts-1.3.1/admin/depcomp arts-patched/admin/depcomp
---- arts-1.3.1/admin/depcomp	2003-04-16 16:53:18.000000000 -0500
+--- arts-1.3.2/admin/depcomp	2003-04-16 16:53:18.000000000 -0500
 +++ arts-patched/admin/depcomp	2004-09-19 17:51:50.000000000 -0500
 @@ -1,7 +1,9 @@
  #! /bin/sh
@@ -717,8 +714,7 @@
 +# time-stamp-format: "%:y-%02m-%02d.%02H"
 +# time-stamp-end: "$"
 +# End:
-diff -Nrua arts-1.3.1/admin/install-sh arts-patched/admin/install-sh
---- arts-1.3.1/admin/install-sh	2003-08-07 04:41:31.000000000 -0500
+--- arts-1.3.2/admin/install-sh	2003-08-07 04:41:31.000000000 -0500
 +++ arts-patched/admin/install-sh	2004-09-19 17:51:50.000000000 -0500
 @@ -1,19 +1,38 @@
  #!/bin/sh
@@ -1268,8 +1264,7 @@
 +# time-stamp-format: "%:y-%02m-%02d.%02H"
 +# time-stamp-end: "$"
 +# End:
-diff -Nrua arts-1.3.1/admin/missing arts-patched/admin/missing
---- arts-1.3.1/admin/missing	2002-10-26 11:44:28.000000000 -0500
+--- arts-1.3.2/admin/missing	2002-10-26 11:44:28.000000000 -0500
 +++ arts-patched/admin/missing	2004-09-19 17:51:50.000000000 -0500
 @@ -1,6 +1,10 @@
  #! /bin/sh
@@ -1527,8 +1522,7 @@
 +# time-stamp-format: "%:y-%02m-%02d.%02H"
 +# time-stamp-end: "$"
 +# End:
-diff -Nrua arts-1.3.1/admin/mkinstalldirs arts-patched/admin/mkinstalldirs
---- arts-1.3.1/admin/mkinstalldirs	2002-10-26 11:53:16.000000000 -0500
+--- arts-1.3.2/admin/mkinstalldirs	2002-10-26 11:53:16.000000000 -0500
 +++ arts-patched/admin/mkinstalldirs	2004-09-19 17:51:50.000000000 -0500
 @@ -1,20 +1,32 @@
  #! /bin/sh
@@ -1654,8 +1648,7 @@
 +# time-stamp-end: "$"
  # End:
 -# mkinstalldirs ends here
-diff -Nrua arts-1.3.1/admin/ylwrap arts-patched/admin/ylwrap
---- arts-1.3.1/admin/ylwrap	2001-10-04 19:46:36.000000000 -0500
+--- arts-1.3.2/admin/ylwrap	2001-10-04 19:46:36.000000000 -0500
 +++ arts-patched/admin/ylwrap	2004-09-19 17:51:50.000000000 -0500
 @@ -1,6 +1,11 @@
  #! /bin/sh

Modified: trunk/packages/arts/debian/patches/03_libtool_arm.diff
===================================================================
--- trunk/packages/arts/debian/patches/03_libtool_arm.diff	2004-12-06 02:42:33 UTC (rev 281)
+++ trunk/packages/arts/debian/patches/03_libtool_arm.diff	2004-12-07 20:44:29 UTC (rev 282)
@@ -1,5 +1,4 @@
-diff -Nrua arts-1.2.92/admin/libtool.m4.in arts-patched/admin/libtool.m4.in
---- arts-1.2.92/admin/libtool.m4.in	2004-04-02 09:39:50.000000000 -0600
+--- arts-1.3.2/admin/libtool.m4.in	2004-04-02 09:39:50.000000000 -0600
 +++ arts-patched/admin/libtool.m4.in	2004-07-26 14:50:02.000000000 -0500
 @@ -2180,17 +2180,7 @@
  

Modified: trunk/packages/arts/debian/patches/04_am_maintainer_mode.diff
===================================================================
--- trunk/packages/arts/debian/patches/04_am_maintainer_mode.diff	2004-12-06 02:42:33 UTC (rev 281)
+++ trunk/packages/arts/debian/patches/04_am_maintainer_mode.diff	2004-12-07 20:44:29 UTC (rev 282)
@@ -1,5 +1,4 @@
-diff -Nru arts-1.1.94/configure.in.in arts-patched/configure.in.in
---- arts-1.1.94/configure.in.in	2003-11-24 14:13:09.000000000 -0600
+--- arts-1.3.2/configure.in.in	2003-11-24 14:13:09.000000000 -0600
 +++ arts-patched/configure.in.in	2004-01-04 19:00:08.000000000 -0600
 @@ -23,6 +23,8 @@
  dnl Automake doc recommends to do this only here. (Janos)

Modified: trunk/packages/arts/debian/patches/05_pedantic-errors.diff
===================================================================
--- trunk/packages/arts/debian/patches/05_pedantic-errors.diff	2004-12-06 02:42:33 UTC (rev 281)
+++ trunk/packages/arts/debian/patches/05_pedantic-errors.diff	2004-12-07 20:44:29 UTC (rev 282)
@@ -1,5 +1,4 @@
-diff -Nrua arts-1.2.92/admin/acinclude.m4.in arts-patched/admin/acinclude.m4.in
---- arts-1.2.92/admin/acinclude.m4.in	2004-07-26 14:50:44.000000000 -0500
+--- arts-1.3.2/admin/acinclude.m4.in	2004-07-26 14:50:44.000000000 -0500
 +++ arts-patched/admin/acinclude.m4.in	2004-07-26 14:51:06.000000000 -0500
 @@ -2087,9 +2087,6 @@
  save_CXXFLAGS="$CXXFLAGS"

Added: trunk/packages/arts/debian/patches/06_automake-1.9.diff
===================================================================
--- trunk/packages/arts/debian/patches/06_automake-1.9.diff	2004-12-06 02:42:33 UTC (rev 281)
+++ trunk/packages/arts/debian/patches/06_automake-1.9.diff	2004-12-07 20:44:29 UTC (rev 282)
@@ -0,0 +1,11 @@
+--- arts-1.3.2/admin/detect-autoconf.sh
++++ arts-patched/admin/detect-autoconf.sh
+@@ -11,7 +11,7 @@
+ # needed to compile KDE. Do not forget to include the name/version #
+ # separator if one is present, e.g. -1.2 where - is the separator.
+ KDE_AUTOCONF_VERS="-2.58 -2.57 257 -2.54 -2.53a -2.53 -2.52 -2.5x"
+-KDE_AUTOMAKE_VERS="-1.7 17 -1.6"
++KDE_AUTOMAKE_VERS="-1.9 -1.7 17 -1.6"
+ 
+ # We don't use variable here for remembering the type ... strings. Local 
+ # variables are not that portable, but we fear namespace issues with our

Modified: trunk/packages/arts/debian/rules
===================================================================
--- trunk/packages/arts/debian/rules	2004-12-06 02:42:33 UTC (rev 281)
+++ trunk/packages/arts/debian/rules	2004-12-07 20:44:29 UTC (rev 282)
@@ -161,8 +161,6 @@
 	cd $(objdir) && \
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
 
-	chmod 4755 debian/tmp/usr/bin/artswrapper
-
 	dh_install -s --list-missing
 
 install-indep:
@@ -201,7 +199,7 @@
 	dh_link
 	dh_strip
 	dh_compress -X.bz2 -X.css -X.dcl -X.docbook -X-license -X.tag
-	dh_fixperms -Xartswrapper
+	dh_fixperms
 #	dh_perl
 #	dh_python
 	dh_makeshlibs -V