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

Christopher Martin chrsmrtn-guest@haydn.debian.org
Sun, 19 Dec 2004 12:12:35 -0700 

Author: chrsmrtn-guest
Date: 2004-12-19 12:10:52 -0700 (Sun, 19 Dec 2004)
New Revision: 346

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/patches/06_automake-1.9.diff
   trunk/packages/arts/debian/rules
Log:
Make changes for next arts upload, including general
packaging touch-ups.


Modified: trunk/packages/arts/debian/changelog
===================================================================
--- trunk/packages/arts/debian/changelog	2004-12-19 18:50:07 UTC (rev 345)
+++ trunk/packages/arts/debian/changelog	2004-12-19 19:10:52 UTC (rev 346)
@@ -1,3 +1,11 @@
+arts (next upload) unstable; urgency=medium
+
+  * No code changes, so urgency medium to get this into Sarge.
+  * Strengthen Suggests on akode to Recommends.
+  * Removed build-dep on automake1.9.
+
+ -- Christopher Martin <chrsmrtn@freeshell.org>  Date
+
 arts (1.3.2-1) unstable; urgency=medium
 
   * New upstream release.

Modified: trunk/packages/arts/debian/control
===================================================================
--- trunk/packages/arts/debian/control	2004-12-19 18:50:07 UTC (rev 345)
+++ trunk/packages/arts/debian/control	2004-12-19 19:10:52 UTC (rev 346)
@@ -2,8 +2,8 @@
 Section: libs
 Priority: optional
 Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.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
+Uploaders: Christopher L Cheney <ccheney@debian.org>, Christopher Martin <chrsmrtn@freeshell.org>, Adeodato Simó <asp16@alu.ua.es>
+Build-Depends: 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
 
@@ -26,7 +26,7 @@
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}
-Suggests: akode
+Recommends: 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

Modified: trunk/packages/arts/debian/patches/02_autotools_update.diff
===================================================================
--- trunk/packages/arts/debian/patches/02_autotools_update.diff	2004-12-19 18:50:07 UTC (rev 345)
+++ trunk/packages/arts/debian/patches/02_autotools_update.diff	2004-12-19 19:10:52 UTC (rev 346)
@@ -1,18 +1,18 @@
---- 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
+--- arts-orig/admin/compile
++++ arts-patched/admin/compile
 @@ -1,8 +1,9 @@
  #! /bin/sh
 -
  # Wrapper for compilers which do not understand `-c -o'.
  
 -# Copyright 1999, 2000 Free Software Foundation, Inc.
-+scriptversion=2004-09-10.20
++scriptversion=2004-10-12.08
 +
 +# Copyright (C) 1999, 2000, 2003, 2004 Free Software Foundation, Inc.
  # Written by Tom Tromey <tromey@cygnus.com>.
  #
  # This program is free software; you can redistribute it and/or modify
-@@ -24,76 +25,116 @@
+@@ -24,76 +25,118 @@
  # configuration script generated by Autoconf, you may include it under
  # the same distribution terms that you use for the rest of that program.
  
@@ -164,6 +164,8 @@
  if test -f "$cofile"; then
 -   mv "$cofile" "$ofile"
 +  mv "$cofile" "$ofile"
++elif test -f "${cofile}bj"; then
++  mv "${cofile}bj" "$ofile"
  fi
  
 -rmdir $lockdir
@@ -179,8 +181,8 @@
 +# time-stamp-format: "%:y-%02m-%02d.%02H"
 +# time-stamp-end: "$"
 +# End:
---- 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
+--- arts-orig/admin/config.guess
++++ arts-patched/admin/config.guess
 @@ -3,7 +3,7 @@
  #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
  #   2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
@@ -242,8 +244,8 @@
  	esac
  	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
  	exit 0 ;;
---- 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
+--- arts-orig/admin/depcomp
++++ arts-patched/admin/depcomp
 @@ -1,7 +1,9 @@
  #! /bin/sh
 -
@@ -714,15 +716,15 @@
 +# time-stamp-format: "%:y-%02m-%02d.%02H"
 +# time-stamp-end: "$"
 +# End:
---- 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
+--- arts-orig/admin/install-sh
++++ arts-patched/admin/install-sh
 @@ -1,19 +1,38 @@
  #!/bin/sh
 -#
  # install - install a program, script, or datafile
 -# This comes from X11R5 (mit/util/scripts/install.sh).
 +
-+scriptversion=2004-09-10.20
++scriptversion=2004-10-22.00
 +
 +# This originates from X11R5 (mit/util/scripts/install.sh), which was
 +# later released in X11R6 (xc/config/util/install.sh) with the
@@ -781,7 +783,7 @@
  # put in absolute paths if you don't have them in your path; or use env. vars.
  
  mvprog="${MVPROG-mv}"
-@@ -41,236 +58,265 @@
+@@ -41,236 +58,266 @@
  rmprog="${RMPROG-rm}"
  mkdirprog="${MKDIRPROG-mkdir}"
  
@@ -1155,7 +1157,7 @@
 +  fi
 +
 +  # This sed command emulates the dirname command.
-+  dstdir=`echo "$dst" | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
++  dstdir=`echo "$dst" | sed -e 's,/*$,,;s,[^/]*$,,;s,/*$,,;s,^$,.,'`
 +
 +  # Make sure that the destination directory exists.
 +
@@ -1168,7 +1170,8 @@
 +    oIFS=$IFS
 +    # Some sh's can't handle IFS=/ for some reason.
 +    IFS='%'
-+    set - `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
++    set x `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
++    shift
 +    IFS=$oIFS
 +
 +    pathcomp=
@@ -1264,8 +1267,8 @@
 +# time-stamp-format: "%:y-%02m-%02d.%02H"
 +# time-stamp-end: "$"
 +# End:
---- 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
+--- arts-orig/admin/missing
++++ arts-patched/admin/missing
 @@ -1,6 +1,10 @@
  #! /bin/sh
  # Common stub for a few missing GNU programs while installing.
@@ -1522,8 +1525,8 @@
 +# time-stamp-format: "%:y-%02m-%02d.%02H"
 +# time-stamp-end: "$"
 +# End:
---- 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
+--- arts-orig/admin/mkinstalldirs
++++ arts-patched/admin/mkinstalldirs
 @@ -1,20 +1,32 @@
  #! /bin/sh
  # mkinstalldirs --- make directory hierarchy
@@ -1648,8 +1651,8 @@
 +# time-stamp-end: "$"
  # End:
 -# mkinstalldirs ends here
---- 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
+--- arts-orig/admin/ylwrap
++++ arts-patched/admin/ylwrap
 @@ -1,6 +1,11 @@
  #! /bin/sh
  # ylwrap - wrapper for lex/yacc invocations.

Modified: trunk/packages/arts/debian/patches/03_libtool_arm.diff
===================================================================
--- trunk/packages/arts/debian/patches/03_libtool_arm.diff	2004-12-19 18:50:07 UTC (rev 345)
+++ trunk/packages/arts/debian/patches/03_libtool_arm.diff	2004-12-19 19:10:52 UTC (rev 346)
@@ -1,5 +1,5 @@
---- 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
+--- arts-orig/admin/libtool.m4.in
++++ arts-patched/admin/libtool.m4.in
 @@ -2180,17 +2180,7 @@
  
  # This must be Linux ELF.

Modified: trunk/packages/arts/debian/patches/04_am_maintainer_mode.diff
===================================================================
--- trunk/packages/arts/debian/patches/04_am_maintainer_mode.diff	2004-12-19 18:50:07 UTC (rev 345)
+++ trunk/packages/arts/debian/patches/04_am_maintainer_mode.diff	2004-12-19 19:10:52 UTC (rev 346)
@@ -1,5 +1,5 @@
---- 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
+--- arts-orig/configure.in.in
++++ arts-patched/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/05_pedantic-errors.diff
===================================================================
--- trunk/packages/arts/debian/patches/05_pedantic-errors.diff	2004-12-19 18:50:07 UTC (rev 345)
+++ trunk/packages/arts/debian/patches/05_pedantic-errors.diff	2004-12-19 19:10:52 UTC (rev 346)
@@ -1,5 +1,5 @@
---- 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
+--- arts-orig/admin/acinclude.m4.in
++++ arts-patched/admin/acinclude.m4.in
 @@ -2087,9 +2087,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"

Modified: trunk/packages/arts/debian/patches/06_automake-1.9.diff
===================================================================
--- trunk/packages/arts/debian/patches/06_automake-1.9.diff	2004-12-19 18:50:07 UTC (rev 345)
+++ trunk/packages/arts/debian/patches/06_automake-1.9.diff	2004-12-19 19:10:52 UTC (rev 346)
@@ -1,4 +1,4 @@
---- arts-1.3.2/admin/detect-autoconf.sh
+--- arts-orig/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 #

Modified: trunk/packages/arts/debian/rules
===================================================================
--- trunk/packages/arts/debian/rules	2004-12-19 18:50:07 UTC (rev 345)
+++ trunk/packages/arts/debian/rules	2004-12-19 19:10:52 UTC (rev 346)
@@ -73,6 +73,7 @@
 	# run configure with build tree $(objdir)
 	cd $(objdir) && \
 	../configure $(configkde) --enable-final \
+	--host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
 	--with-alsa
 
 	touch configure-stamp