rev 9431 - in trunk/packages/arts/debian: . man patches

Fathi Boudra fabo at alioth.debian.org
Sun Feb 17 22:10:00 UTC 2008


Author: fabo
Date: 2008-02-17 22:10:00 +0000 (Sun, 17 Feb 2008)
New Revision: 9431

Added:
   trunk/packages/arts/debian/man/artsdsp.1
   trunk/packages/arts/debian/patches/12_cleanup_artsc-config.diff
   trunk/packages/arts/debian/patches/13_check_tmp_dir.diff
   trunk/packages/arts/debian/patches/14_remove_config.h_headers.diff
   trunk/packages/arts/debian/patches/15_no_warning.diff
Modified:
   trunk/packages/arts/debian/changelog
   trunk/packages/arts/debian/compat
   trunk/packages/arts/debian/control
   trunk/packages/arts/debian/control.in
   trunk/packages/arts/debian/libarts1c2a.manpages
   trunk/packages/arts/debian/patches/04_am_maintainer_mode_extra.diff
   trunk/packages/arts/debian/patches/11_path_max_hurd.diff
   trunk/packages/arts/debian/patches/98_buildprep.diff
   trunk/packages/arts/debian/rules
Log:
  * Add oss-compat dependency to libarts1c2a. (Closes: #386582)
  * Add artsdsp manpage. (Closes: #405159)
  * Add patches:
    - 12_cleanup_artsc-config. (Closes: #375803)
      Remove spurious dependencies in the output of artsc-config.
    - 13_check_tmp_dir. (Closes: #415154)
      Create tmp_dir if non existent.
    - 14_remove_config.h_headers. (Closes: #428987)
      Do not include config.h in shipped header files.
    - 15_no_warning. Merged from Ubuntu.
      Do not show null device warning.
      kmix makes it obvious if sound isn't working.


Modified: trunk/packages/arts/debian/changelog
===================================================================
--- trunk/packages/arts/debian/changelog	2008-02-17 21:50:27 UTC (rev 9430)
+++ trunk/packages/arts/debian/changelog	2008-02-17 22:10:00 UTC (rev 9431)
@@ -1,11 +1,32 @@
-arts (1.5.8-2) UNRELEASED; urgency=low
+arts (1.5.9-1) UNRELEASED; urgency=low
 
+  TODO: fix #463535 #386668
+
+  * New upstream release. (Closes: #454821)
+
+  +++ Changes by Ana Beatriz Guerrero Lopez:
+
   * Update to debhelper 6.
   * Update to Standards-Version 3.7.3:
     - Replace Source-Version for proper variables.
 
- -- Ana Beatriz Guerrero Lopez <ana at debian.org>  Fri, 18 Jan 2008 22:06:19 +0100
+  +++ Changes by Fathi Boudra:
 
+  * Add oss-compat dependency to libarts1c2a. (Closes: #386582)
+  * Add artsdsp manpage. (Closes: #405159)
+  * Add patches:
+    - 12_cleanup_artsc-config. (Closes: #375803)
+      Remove spurious dependencies in the output of artsc-config.
+    - 13_check_tmp_dir. (Closes: #415154)
+      Create tmp_dir if non existent.
+    - 14_remove_config.h_headers. (Closes: #428987)
+      Do not include config.h in shipped header files.
+    - 15_no_warning. Merged from Ubuntu.
+      Do not show null device warning.
+      kmix makes it obvious if sound isn't working.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 14 Feb 2008 11:15:10 +0100
+
 arts (1.5.8-1) unstable; urgency=low
 
   * New upstream release:

Modified: trunk/packages/arts/debian/compat
===================================================================
--- trunk/packages/arts/debian/compat	2008-02-17 21:50:27 UTC (rev 9430)
+++ trunk/packages/arts/debian/compat	2008-02-17 22:10:00 UTC (rev 9431)
@@ -1 +1 @@
-5
+6

Modified: trunk/packages/arts/debian/control
===================================================================
--- trunk/packages/arts/debian/control	2008-02-17 21:50:27 UTC (rev 9430)
+++ trunk/packages/arts/debian/control	2008-02-17 22:10:00 UTC (rev 9431)
@@ -3,7 +3,12 @@
 Priority: optional
 Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Adeodato Simó <dato at net.com.org.es>, Ana Beatriz Guerrero Lopez <ana at debian.org>, Christopher Martin <chrsmrtn at debian.org>, Fathi Boudra <fabo at debian.org>
-Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 6), autotools-dev, docbook-to-man, gawk, gettext, libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libaudio-dev, libaudiofile-dev, libesd0-dev, libglib2.0-dev, libjack0.100.0-dev, libmad0-dev, libogg-dev, libqt3-mt-dev (>= 3:3.3.5), libvorbis-dev, sharutils, texinfo
+Build-Depends: cdbs (>= 0.4.48), debhelper (>= 6), autotools-dev,
+ docbook-to-man, gawk, gettext, sharutils, texinfo,
+ libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
+ libaudio-dev, libaudiofile-dev, libesd0-dev, libglib2.0-dev,
+ libjack0.100.0-dev, libmad0-dev, libogg-dev, libqt3-mt-dev (>= 3:3.3.7),
+ libvorbis-dev
 Build-Conflicts: libmas-dev
 Standards-Version: 3.7.3
 Vcs-Svn: svn://svn.debian.org/svn/pkg-kde/trunk/packages/arts
@@ -25,7 +30,7 @@
 Package: libarts1c2a
 Architecture: any
 Section: libs
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, oss-compat
 Recommends: libarts1-akode
 Conflicts: libarts1, libarts1c2, libarts (<< 4:3.0.0), libarts-alsa (<< 4:3.0.0)
 Replaces: libarts1, libarts1c2, libarts (<< 4:3.0.0), libarts-alsa (<< 4:3.0.0)

Modified: trunk/packages/arts/debian/control.in
===================================================================
--- trunk/packages/arts/debian/control.in	2008-02-17 21:50:27 UTC (rev 9430)
+++ trunk/packages/arts/debian/control.in	2008-02-17 22:10:00 UTC (rev 9431)
@@ -3,7 +3,12 @@
 Priority: optional
 Maintainer: @@@MAINTAINER@@@
 Uploaders: @@@UPLOADERS@@@
-Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 6), autotools-dev, docbook-to-man, gawk, gettext, libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libaudio-dev, libaudiofile-dev, libesd0-dev, libglib2.0-dev, libjack0.100.0-dev, libmad0-dev, libogg-dev, libqt3-mt-dev (>= 3:3.3.5), libvorbis-dev, sharutils, texinfo
+Build-Depends: cdbs (>= 0.4.48), debhelper (>= 6), autotools-dev,
+ docbook-to-man, gawk, gettext, sharutils, texinfo,
+ libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
+ libaudio-dev, libaudiofile-dev, libesd0-dev, libglib2.0-dev,
+ libjack0.100.0-dev, libmad0-dev, libogg-dev, libqt3-mt-dev (>= 3:3.3.7),
+ libvorbis-dev
 Build-Conflicts: libmas-dev
 Standards-Version: 3.7.3
 Vcs-Svn: svn://svn.debian.org/svn/pkg-kde/trunk/packages/arts
@@ -25,7 +30,7 @@
 Package: libarts1c2a
 Architecture: any
 Section: libs
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, oss-compat
 Recommends: libarts1-akode
 Conflicts: libarts1, libarts1c2, libarts (<< 4:3.0.0), libarts-alsa (<< 4:3.0.0)
 Replaces: libarts1, libarts1c2, libarts (<< 4:3.0.0), libarts-alsa (<< 4:3.0.0)

Modified: trunk/packages/arts/debian/libarts1c2a.manpages
===================================================================
--- trunk/packages/arts/debian/libarts1c2a.manpages	2008-02-17 21:50:27 UTC (rev 9430)
+++ trunk/packages/arts/debian/libarts1c2a.manpages	2008-02-17 22:10:00 UTC (rev 9431)
@@ -1 +1,3 @@
 debian/man/out/artscat.1
+debian/man/artsdsp.1
+

Added: trunk/packages/arts/debian/man/artsdsp.1
===================================================================
--- trunk/packages/arts/debian/man/artsdsp.1	                        (rev 0)
+++ trunk/packages/arts/debian/man/artsdsp.1	2008-02-17 22:10:00 UTC (rev 9431)
@@ -0,0 +1,31 @@
+.TH ARTSDSP "1" "February 2008" "artsdsp" "User Commands"
+.SH NAME
+artsdsp \- manual page for artsdsp
+.SH DESCRIPTION
+artsdsp \- attempt to reroute audio device to artsd
+.PP
+artsdsp [options] binary
+.PP
+options:
+.TP
+.B \-h, \-\-help
+Show brief help.
+.TP
+.B \-n, \-\-name\fR=\fINAME\fR
+Use name to identify player to artsd.
+.TP
+.B \-m, \-\-mmap
+Emulate memory mapping (i.e. for quake).
+.TP
+.B \-s, \-\-single\-threaded
+Use the single\-threaded version.
+.TP
+.B \-v, \-\-verbose
+Show parameters.
+.TP
+.B \-V, \-\-version
+Show version.
+.PP
+This manual page was written by Fathi Boudra <fabo at debian.org>,
+for the Debian project (but may be used by others).
+

Modified: trunk/packages/arts/debian/patches/04_am_maintainer_mode_extra.diff
===================================================================
--- trunk/packages/arts/debian/patches/04_am_maintainer_mode_extra.diff	2008-02-17 21:50:27 UTC (rev 9430)
+++ trunk/packages/arts/debian/patches/04_am_maintainer_mode_extra.diff	2008-02-17 22:10:00 UTC (rev 9431)
@@ -1,5 +1,5 @@
---- kde.orig/configure.in.in
-+++ kde.patched/configure.in.in
+--- a/configure.in.in
++++ b/configure.in.in
 @@ -23,6 +23,8 @@
  dnl Automake doc recommends to do this only here. (Janos)
  AM_INIT_AUTOMAKE(arts, $ARTS_VERSION) dnl searches for some needed programs

Modified: trunk/packages/arts/debian/patches/11_path_max_hurd.diff
===================================================================
--- trunk/packages/arts/debian/patches/11_path_max_hurd.diff	2008-02-17 21:50:27 UTC (rev 9430)
+++ trunk/packages/arts/debian/patches/11_path_max_hurd.diff	2008-02-17 22:10:00 UTC (rev 9431)
@@ -1,6 +1,6 @@
---- arts-1.5.6.orig/soundserver/artsplay.cc
-+++ arts-1.5.6/soundserver/artsplay.cc
-@@ -41,13 +41,19 @@
+--- a/soundserver/artsplay.cc
++++ b/soundserver/artsplay.cc
+@@ -42,13 +42,19 @@
  {
  	if(path[0] == '/') return path;
  
@@ -26,9 +26,9 @@
  }
  
  int main(int argc, char **argv)
---- arts-1.5.6.orig/mcop/mcoputils.cc
-+++ arts-1.5.6/mcop/mcoputils.cc
-@@ -69,8 +69,8 @@
+--- a/mcop/mcoputils.cc
++++ b/mcop/mcoputils.cc
+@@ -71,8 +71,8 @@
  static char *locate_mcop_dir()
  {
    struct passwd *pw_ent;
@@ -39,7 +39,7 @@
    int uid = getuid();
    const char *home_dir = getenv("HOME");
    const char *kde_home = uid ? getenv("KDEHOME") : getenv("KDEROOTHOME");
-@@ -86,7 +86,7 @@
+@@ -88,7 +88,7 @@
    if (!tmp || !tmp[0])
       tmp = "/tmp";
            
@@ -48,7 +48,7 @@
  
    pw_ent = getpwuid(uid);
    if (!pw_ent)
-@@ -95,12 +95,7 @@
+@@ -97,12 +97,7 @@
       return 0;
    }
  
@@ -62,7 +62,7 @@
  
    if (!kde_home || !kde_home[0])
    {
-@@ -117,44 +112,37 @@
+@@ -119,44 +114,37 @@
       {
          arts_fatal("Aborting. $HOME not set!");
       }
@@ -122,7 +122,7 @@
       return tmp_buf;
    }
    
-@@ -165,26 +153,32 @@
+@@ -167,26 +155,32 @@
    }
    if ((result == -1) || (!S_ISLNK(stat_buf.st_mode)))
    {
@@ -168,7 +168,7 @@
       free(tmp_buf);
       return 0;
    }
-@@ -219,19 +213,19 @@
+@@ -221,19 +215,19 @@
  
  
  static
@@ -193,7 +193,7 @@
  
    pw_ent = getpwuid(uid);
    if (!pw_ent)
-@@ -240,9 +234,7 @@
+@@ -242,9 +236,7 @@
       return 1;
    }
  
@@ -204,7 +204,7 @@
  
    if (!kde_home || !kde_home[0])
    {
-@@ -260,89 +252,106 @@
+@@ -262,89 +254,106 @@
          fprintf(stderr, "Aborting. $HOME not set!");
          exit(255);
       }
@@ -357,7 +357,7 @@
  }
  
  string MCOPUtils::createFilePath(string name)
-@@ -362,11 +371,7 @@
+@@ -364,11 +373,7 @@
             if (!tmp || !tmp[0])
               tmp = "/tmp";
  

Added: trunk/packages/arts/debian/patches/12_cleanup_artsc-config.diff
===================================================================
--- trunk/packages/arts/debian/patches/12_cleanup_artsc-config.diff	                        (rev 0)
+++ trunk/packages/arts/debian/patches/12_cleanup_artsc-config.diff	2008-02-17 22:10:00 UTC (rev 9431)
@@ -0,0 +1,15 @@
+--- a/artsc/artsc-config.in
++++ b/artsc/artsc-config.in
+@@ -27,10 +27,10 @@
+ do
+   case $1 in
+     --libs)
+-	  flags="$flags -L$libdir $libdl -lartsc @USE_THREADS@ @LIBPTHREAD@ @GLIB_LDFLAGS@ @GLIB_LIBADD@"
++	  flags="$flags -L$libdir -lartsc"
+ 	  ;;
+     --cflags)
+-	  flags="$flags -I$includedir/artsc @GLIB_CFLAGS@"
++	  flags="$flags -I$includedir/artsc"
+ 	  ;;
+     --version)
+ 	  echo 0.9.5

Added: trunk/packages/arts/debian/patches/13_check_tmp_dir.diff
===================================================================
--- trunk/packages/arts/debian/patches/13_check_tmp_dir.diff	                        (rev 0)
+++ trunk/packages/arts/debian/patches/13_check_tmp_dir.diff	2008-02-17 22:10:00 UTC (rev 9431)
@@ -0,0 +1,17 @@
+--- a/mcop/mcoputils.cc
++++ b/mcop/mcoputils.cc
+@@ -49,7 +49,13 @@
+   result = lstat(tmp_dir, &stat_buf);
+   if ((result == -1) && (errno == ENOENT))
+   {
+-    return 1;
++    result = mkdir(tmp_dir, 0700);
++    if (result == -1)
++    {
++       arts_warning("Error: Can not create directory \"%s\".\n", tmp_dir);
++       return 1;
++    }
++    result = stat(tmp_dir, &stat_buf);
+   }
+   if ((result == -1) || (!S_ISDIR(stat_buf.st_mode)))
+   {

Added: trunk/packages/arts/debian/patches/14_remove_config.h_headers.diff
===================================================================
--- trunk/packages/arts/debian/patches/14_remove_config.h_headers.diff	                        (rev 0)
+++ trunk/packages/arts/debian/patches/14_remove_config.h_headers.diff	2008-02-17 22:10:00 UTC (rev 9431)
@@ -0,0 +1,23 @@
+--- a/flow/cachedwav.h
++++ b/flow/cachedwav.h
+@@ -23,8 +23,8 @@
+ #ifndef CACHEDWAV_H
+ #define CACHEDWAV_H
+ 
+-#include "config.h"
+ #include "arts_export.h"
++
+ #ifdef HAVE_LIBAUDIOFILE
+ #include "cache.h"
+ #include <sys/stat.h>
+--- a/flow/synthschedule.h
++++ b/flow/synthschedule.h
+@@ -23,8 +23,6 @@
+ #ifndef SYNTHSCHEDULE_H
+ #define SYNTHSCHEDULE_H
+ 
+-#include "config.h"
+-
+ #ifdef __GNUC__
+ #warning " *   <synthschedule.h> included!   *"
+ #warning " * include <gslschedule.h> instead *"

Added: trunk/packages/arts/debian/patches/15_no_warning.diff
===================================================================
--- trunk/packages/arts/debian/patches/15_no_warning.diff	                        (rev 0)
+++ trunk/packages/arts/debian/patches/15_no_warning.diff	2008-02-17 22:10:00 UTC (rev 9431)
@@ -0,0 +1,16 @@
+--- a/soundserver/artsd.cc
++++ b/soundserver/artsd.cc
+@@ -296,9 +296,10 @@
+ 
+ 	if(cfgForceStart && !AudioSubSystem::the()->check())
+ 	{
+-		warnNullDevice  = "Error while initializing the sound driver:\n";
+-		warnNullDevice += AudioSubSystem::the()->error();
+-		warnNullDevice += "\n\nThe sound server will continue, using the null output device.";
++		//Don't show an error, kmix makes it obvious if sound isn't working
++		//warnNullDevice  = "Error while initializing the sound driver:\n";
++		//warnNullDevice += AudioSubSystem::the()->error();
++		//warnNullDevice += "\n\nThe sound server will continue, using the null output device.";
+ 		
+ 		AudioSubSystem::the()->audioIO("null");
+ 	}

Modified: trunk/packages/arts/debian/patches/98_buildprep.diff
===================================================================

Modified: trunk/packages/arts/debian/rules
===================================================================
--- trunk/packages/arts/debian/rules	2008-02-17 21:50:27 UTC (rev 9430)
+++ trunk/packages/arts/debian/rules	2008-02-17 22:10:00 UTC (rev 9431)
@@ -5,10 +5,10 @@
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include /usr/share/cdbs/1/rules/utils.mk
 
-DEB_CONFIGURE_EXTRA_FLAGS := --enable-static
+DEB_CONFIGURE_EXTRA_FLAGS := --enable-static --with-alsa
+DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-Wl,--as-needed"
+DEB_DH_STRIP_ARGS := --dbg-package=arts-dbg
 
-DEB_DH_STRIP_ARGS  := --dbg-package=arts-dbg
-
 PACKAGES_WITH_LIBS := libarts1c2a libartsc0
 
 DEB_DH_MAKESHLIBS_ARGS_libarts1c2a	:= -V'libarts1c2a (>= 1.5.0-1)'
@@ -23,3 +23,4 @@
 ifeq (linux,$(DEB_HOST_ARCH_OS))
 	    echo "libasound2-dev=libasound2-dev" >> debian/libarts1-dev.substvars
 endif
+




More information about the pkg-kde-commits mailing list