rev 9902 - in trunk/packages/arts/debian: . patches
Modestas Vainius
modax-guest at alioth.debian.org
Sat Mar 29 11:46:07 UTC 2008
Author: modax-guest
Date: 2008-03-29 11:46:07 +0000 (Sat, 29 Mar 2008)
New Revision: 9902
Added:
trunk/packages/arts/debian/patches/01_admin_cleanup.diff.disabled
trunk/packages/arts/debian/patches/97_automake_cleanup.diff.disabled
Removed:
trunk/packages/arts/debian/patches/01_admin_cleanup.diff
trunk/packages/arts/debian/patches/97_automake_cleanup.diff
Modified:
trunk/packages/arts/debian/changelog
trunk/packages/arts/debian/control
trunk/packages/arts/debian/control.in
trunk/packages/arts/debian/patches/98_buildprep.diff
trunk/packages/arts/debian/rules
Log:
am-dirty arts to fix breakage in testing. test build in process
Modified: trunk/packages/arts/debian/changelog
===================================================================
--- trunk/packages/arts/debian/changelog 2008-03-29 09:01:46 UTC (rev 9901)
+++ trunk/packages/arts/debian/changelog 2008-03-29 11:46:07 UTC (rev 9902)
@@ -1,12 +1,12 @@
-arts (1.5.9-2) unstable; urgency=low
+arts (1.5.9-2) unstable; urgency=critical
- +++ Changes by Modestas Vainius:
+ * Disable 01_admin_cleanup.diff and 97_automake_cleanup.diff patches
+ * Rebuild 98_buildprep.diff
+ * Urgency=critical to fix breakage in testing as kdelibs is not going into
+ testing anytime soon.
- * Bump shlibs to 1.5.9.
- * Conflict with automake-dirty kdelibs4c2a.
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Sat, 29 Mar 2008 13:30:01 +0200
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Sat, 29 Mar 2008 10:57:54 +0200
-
arts (1.5.9-1) unstable; urgency=low
* New upstream release:
Modified: trunk/packages/arts/debian/control
===================================================================
--- trunk/packages/arts/debian/control 2008-03-29 09:01:46 UTC (rev 9901)
+++ trunk/packages/arts/debian/control 2008-03-29 11:46:07 UTC (rev 9902)
@@ -32,7 +32,7 @@
Section: libs
Depends: ${shlibs:Depends}, oss-compat
Recommends: libarts1-akode
-Conflicts: libarts1, libarts1c2, libarts (<< 4:3.0.0), libarts-alsa (<< 4:3.0.0), kdelibs4c2a (<< 4:3.5.9)
+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)
Description: aRts sound system core components
aRts is a short form for "analog realtime synthesizer". aRts is highly
Modified: trunk/packages/arts/debian/control.in
===================================================================
--- trunk/packages/arts/debian/control.in 2008-03-29 09:01:46 UTC (rev 9901)
+++ trunk/packages/arts/debian/control.in 2008-03-29 11:46:07 UTC (rev 9902)
@@ -32,7 +32,7 @@
Section: libs
Depends: ${shlibs:Depends}, oss-compat
Recommends: libarts1-akode
-Conflicts: libarts1, libarts1c2, libarts (<< 4:3.0.0), libarts-alsa (<< 4:3.0.0), kdelibs4c2a (<< 4:3.5.9)
+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)
Description: aRts sound system core components
aRts is a short form for "analog realtime synthesizer". aRts is highly
Deleted: trunk/packages/arts/debian/patches/01_admin_cleanup.diff
Copied: trunk/packages/arts/debian/patches/01_admin_cleanup.diff.disabled (from rev 9901, trunk/packages/arts/debian/patches/01_admin_cleanup.diff)
===================================================================
--- trunk/packages/arts/debian/patches/01_admin_cleanup.diff.disabled (rev 0)
+++ trunk/packages/arts/debian/patches/01_admin_cleanup.diff.disabled 2008-03-29 11:46:07 UTC (rev 9902)
@@ -0,0 +1,116 @@
+--- kde/admin/acinclude.m4.in 2008-02-24 17:49:46.000000000 +0200
++++ kde/admin/acinclude.m4.in 2008-02-24 17:19:06.000000000 +0200
+@@ -1615,6 +1615,11 @@
+ fi
+ done
+
++# Export just Qt libs in LIB_QT, "extended" version will be exported as LIB_QT_EXT
++LIB_QT_EXT="$LIB_QT"
++LIB_QT="$kde_int_qt"
++
++AC_SUBST(LIB_QT_EXT)
+ AC_SUBST(LIB_QT)
+ AC_SUBST(LIB_QPE)
+
+@@ -2698,7 +2703,7 @@
+ ],
+ [return (TIFFOpen( "", "r") == 0); ],
+ [
+- kde_cv_libtiff_$1="-l$1 $LIBJPEG $LIBZ"
++ kde_cv_libtiff_$1="-l$1"
+ ], [
+ kde_cv_libtiff_$1=no
+ ])
+@@ -2762,7 +2767,8 @@
+ EXRSTATUS=old
+ else
+ kde_save_LIBS="$LIBS"
+- LIBS="$LIBS $all_libraries $USER_LDFLAGS `pkg-config --libs OpenEXR` $LIBZ"
++ kde_libexr_libs="`pkg-config --libs OpenEXR | sed -e 's/-lImath//' -e 's/-lIex//' -e 's/-lz//'`"
++ LIBS="$LIBS $all_libraries $USER_LDFLAGS $kde_libexr_libs"
+ AC_LANG_SAVE
+ AC_LANG_CPLUSPLUS
+ kde_save_CXXFLAGS="$CXXFLAGS"
+@@ -2778,7 +2784,7 @@
+ RgbaInputFile file ("dummy");
+ return 0;
+ ],
+- eval "ac_cv_libexr='`pkg-config --libs OpenEXR`'",
++ eval "ac_cv_libexr='$kde_libexr_libs'",
+ eval "ac_cv_libexr=no"
+ )
+ LIBS="$kde_save_LIBS"
+@@ -2787,7 +2793,7 @@
+ ])dnl
+ if eval "test ! \"`echo $ac_cv_libexr`\" = no"; then
+ AC_DEFINE_UNQUOTED(HAVE_EXR, 1, [Define if you have OpenEXR])
+- LIB_EXR="$ac_cv_libexr"
++ LIB_EXR="$kde_libexr_libs"
+ AC_MSG_RESULT($ac_cv_libexr)
+ else
+ AC_MSG_RESULT(no)
+@@ -2854,7 +2860,7 @@
+ AC_CACHE_VAL(ac_cv_jasper,
+ [
+ kde_save_LIBS="$LIBS"
+-LIBS="$LIBS $all_libraries $USER_LDFLAGS -ljasper $LIBJPEG -lm"
++LIBS="$LIBS $all_libraries $USER_LDFLAGS -ljasper -lm"
+ kde_save_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS $all_includes $USER_INCLUDES"
+
+@@ -2865,7 +2871,7 @@
+ [
+ return( jas_init() );
+ ],
+- eval "ac_cv_jasper='-ljasper $LIBJPEG -lm'",
++ eval "ac_cv_jasper='-ljasper -lm'",
+ eval "ac_cv_jasper=no"
+ )
+ LIBS="$kde_save_LIBS"
+@@ -4488,7 +4494,7 @@
+ kde_save_cflags="$CFLAGS"
+ CFLAGS="$CFLAGS $PYTHONINC"
+ kde_save_libs="$LIBS"
+-LIBS="$LIBS $LIBPYTHON $2 $LIBDL $LIBSOCKET"
++LIBS="$LIBS $LIBPYTHON $2 $LIBSOCKET"
+ kde_save_ldflags="$LDFLAGS"
+ LDFLAGS="$LDFLAGS $PYTHONLIB"
+
+@@ -4626,7 +4632,7 @@
+ and contact the authors to let them know about this problem])
+ ])
+
+- LIBPYTHON="$LIBPYTHON $LIBDL $LIBSOCKET"
++ LIBPYTHON="$LIBPYTHON $LIBSOCKET"
+ AC_SUBST(PYTHONINC)
+ AC_SUBST(PYTHONLIB)
+ AC_SUBST(LIBPYTHON)
+--- kde/admin/ltmain.sh 2008-02-24 17:49:46.000000000 +0200
++++ kde/admin/ltmain.sh 2008-02-24 16:51:22.000000000 +0200
+@@ -2377,16 +2377,16 @@
+ # It is a libtool convenience library, so add in its objects.
+ convenience="$convenience $ladir/$objdir/$old_library"
+ old_convenience="$old_convenience $ladir/$objdir/$old_library"
+- tmp_libs=
+- for deplib in $dependency_libs; do
+- deplibs="$deplib $deplibs"
+- if test "X$duplicate_deps" = "Xyes" ; then
+- case "$tmp_libs " in
+- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+- esac
+- fi
+- tmp_libs="$tmp_libs $deplib"
+- done
++# tmp_libs=
++# for deplib in $dependency_libs; do
++# deplibs="$deplib $deplibs"
++# if test "X$duplicate_deps" = "Xyes" ; then
++# case "$tmp_libs " in
++# *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
++# esac
++# fi
++# tmp_libs="$tmp_libs $deplib"
++# done
+ elif test "$linkmode" != prog && test "$linkmode" != lib; then
+ $echo "$modename: \`$lib' is not a convenience library" 1>&2
+ exit $EXIT_FAILURE
Deleted: trunk/packages/arts/debian/patches/97_automake_cleanup.diff
Copied: trunk/packages/arts/debian/patches/97_automake_cleanup.diff.disabled (from rev 9901, trunk/packages/arts/debian/patches/97_automake_cleanup.diff)
===================================================================
--- trunk/packages/arts/debian/patches/97_automake_cleanup.diff.disabled (rev 0)
+++ trunk/packages/arts/debian/patches/97_automake_cleanup.diff.disabled 2008-03-29 11:46:07 UTC (rev 9902)
@@ -0,0 +1,154 @@
+--- arts-1.5.9/artsc/Makefile.am 2005-09-10 11:13:34.000000000 +0300
++++ arts-1.5.9/artsc/Makefile.am 2008-02-20 20:38:11.000000000 +0200
+@@ -11,20 +11,20 @@
+
+ libartsdsp_la_SOURCES = artsdsp.c
+ libartsdsp_la_LDFLAGS = -no-undefined -module $(all_libraries)
+-libartsdsp_la_LIBADD = libartsc.la
++libartsdsp_la_LIBADD = libartsc.la $(LIBDL)
+
+ libartsdsp_st_la_SOURCES = artsc.c artsdsp.c
+ libartsdsp_st_la_LDFLAGS = -no-undefined -module $(all_libraries)
+-libartsdsp_st_la_LIBADD = $(top_builddir)/libltdl/libltdlc.la
++libartsdsp_st_la_LIBADD = $(top_builddir)/libltdl/libltdlc.la $(LIBDL)
+
+ libartsc_la_SOURCES = artsc.c
+ libartsc_la_LDFLAGS = -no-undefined $(USE_THREADS) $(all_libraries)
+-libartsc_la_LIBADD = $(top_builddir)/libltdl/libltdlc.la $(LIBPTHREAD)
++libartsc_la_LIBADD = $(top_builddir)/libltdl/libltdlc.la $(LIBDL)
+
+ libartscbackend_la_SOURCES = artscbackend.cc
+ libartscbackend_la_LDFLAGS = -no-undefined -module $(KDE_RPATH) $(all_libraries)
+ libartscbackend_la_LIBADD = $(FLOWLIBS) \
+- $(top_builddir)/soundserver/libsoundserver_idl.la
++ $(top_builddir)/soundserver/libsoundserver_idl.la $(top_builddir)/mcop/libmcop.la $(top_builddir)/flow/libartsflow_idl.la
+
+ artscincludedir = $(includedir)/artsc
+ artscinclude_HEADERS = artsc.h artsc_export.h
+--- arts-1.5.9/flow/Makefile.am 2005-09-10 11:13:33.000000000 +0300
++++ arts-1.5.9/flow/Makefile.am 2008-02-20 20:58:43.000000000 +0200
+@@ -11,8 +11,9 @@
+ libartsflow_idl_la_LDFLAGS = -no-undefined -version-info 1:0 $(all_libraries)
+ libartsflow_idl_la_LIBADD = $(top_builddir)/mcop/libmcop.la $(LIBPOSIX4)
+
+-libartsflow_la_LIBADD = $(top_builddir)/mcop/libmcop.la libartsflow_idl.la $(top_builddir)/flow/gslpp/libgslpp.la $(LIBAUDIOFILE) $(LIBASOUND) $(LIBAUDIOIO) $(LIBOSSAUDIO) $(LIBAUDIONAS) $(LIBCSL) $(SGILIBAUDIO) $(LIBESD) $(LIBMAS) $(JACK_LIBADD) -lm \
+- $(top_builddir)/flow/gsl/libgsl.la
++libartsflow_la_LIBADD = $(top_builddir)/mcop/libmcop.la libartsflow_idl.la $(top_builddir)/flow/gslpp/libgslpp.la $(LIBAUDIOFILE) \
++ $(LIBASOUND) $(LIBAUDIOIO) $(LIBOSSAUDIO) $(LIBAUDIONAS) $(LIBCSL) $(LIBESD) $(SGILIBAUDIO) $(LIBMAS) $(JACK_LIBADD) -lm \
++ $(top_builddir)/flow/gsl/libgsl.la $(GSL_LIBS) -lgthread-2.0 -lglib-2.0
+ libartsflow_la_LDFLAGS = $(MAS_LDFLAGS) $(JACK_LDFLAGS) $(LIBAUDIOFILE_LDFLAGS) $(LIBAUDIONAS_LDFLAGS) $(LIBESD_LDFLAGS) -no-undefined -version-info 1:0
+ libartsflow_la_COMPILE_FIRST = artsflow.h
+ libartsflow_la_SOURCES = synth_play_impl.cc \
+--- arts-1.5.9/mcop/Makefile.am 2005-09-10 11:13:32.000000000 +0300
++++ arts-1.5.9/mcop/Makefile.am 2008-02-20 20:47:32.000000000 +0200
+@@ -16,7 +16,7 @@
+ trader_impl.cc dynamicrequest.cc anyref.cc loopback.cc \
+ delayedreturn.cc thread.cc dynamicskeleton.cc
+
+-libmcop_la_LIBADD = $(LIBSOCKET) $(GLIB_LIBADD) $(top_builddir)/libltdl/libltdlc.la
++libmcop_la_LIBADD = $(LIBSOCKET) $(top_builddir)/libltdl/libltdlc.la $(LIBDL)
+ libmcop_la_LDFLAGS = -no-undefined -version-info 1:0 $(GLIB_LDFLAGS) $(all_libraries)
+
+ artsincludedir = $(includedir)/arts
+--- arts-1.5.9/mcop_mt/Makefile.am 2005-09-10 11:13:32.000000000 +0300
++++ arts-1.5.9/mcop_mt/Makefile.am 2008-02-20 20:34:22.000000000 +0200
+@@ -3,7 +3,5 @@
+ lib_LTLIBRARIES = libmcop_mt.la
+
+ libmcop_mt_la_SOURCES = threads_posix.cc
+-libmcop_mt_la_LIBADD = $(top_builddir)/mcop/libmcop.la \
+- $(top_builddir)/flow/libartsflow.la $(LIBPTHREAD) \
+- $(LIBPOSIX4) $(LIBSEM)
++libmcop_mt_la_LIBADD = $(top_builddir)/mcop/libmcop.la $(LIBPTHREAD) $(LIBPOSIX4)
+ libmcop_mt_la_LDFLAGS = -no-undefined -version-info 1:0 $(USE_THREADS) $(all_libraries)
+--- arts-1.5.9/soundserver/Makefile.am 2005-09-10 11:13:31.000000000 +0300
++++ arts-1.5.9/soundserver/Makefile.am 2008-02-20 20:49:06.000000000 +0200
+@@ -22,30 +22,30 @@
+ AM_LDFLAGS = $(LDFLAGS_AS_NEEDED)
+
+ libsoundserver_idl_la_LIBADD = libkmedia2_idl.la \
+- $(top_builddir)/flow/libartsflow_idl.la
++ $(top_builddir)/flow/libartsflow_idl.la $(top_builddir)/mcop/libmcop.la
+ libsoundserver_idl_la_LDFLAGS = -no-undefined -version-info 1:0 $(all_libraries)
+ libsoundserver_idl_la_SOURCES = soundserver.cc
+ libsoundserver_idl_la_COMPILE_FIRST = soundserver.h
+
+ libkmedia2_idl_la_SOURCES = kmedia2.cc
+ libkmedia2_idl_la_COMPILE_FIRST = kmedia2.h
+-libkmedia2_idl_la_LIBADD = $(top_builddir)/flow/libartsflow.la
++libkmedia2_idl_la_LIBADD = $(top_builddir)/flow/libartsflow_idl.la $(top_builddir)/mcop/libmcop.la
+ libkmedia2_idl_la_LDFLAGS = -no-undefined -version-info 1:0 $(all_libraries)
+
+ libkmedia2_la_SOURCES = fileinputstream_impl.cc stdoutwriter_impl.cc
+-libkmedia2_la_LIBADD = libkmedia2_idl.la $(FLOWLIBS)
++libkmedia2_la_LIBADD = libkmedia2_idl.la $(FLOWLIBS) $(top_builddir)/flow/libartsflow_idl.la $(top_builddir)/mcop/libmcop.la
+ libkmedia2_la_LDFLAGS = -no-undefined -version-info 1:0 $(all_libraries)
+ libkmedia2_la_COMPILE_FIRST = kmedia2.h ../flow/artsflow.h
+
+ libartswavplayobject_la_SOURCES = wavplayobject_impl.cc
+-libartswavplayobject_la_LIBADD = $(top_builddir)/mcop/libmcop.la \
+- libsoundserver_idl.la $(FLOWLIBS)
++libartswavplayobject_la_LIBADD = $(top_builddir)/mcop/libmcop.la libkmedia2_idl.la \
++ libsoundserver_idl.la $(FLOWLIBS) $(top_builddir)/flow/libartsflow_idl.la
+ libartswavplayobject_la_LDFLAGS = -no-undefined -module $(all_libraries)
+ libartswavplayobject_la_COMPILE_FIRST = soundserver.h ../flow/artsflow.h
+
+ libartsgslplayobject_la_SOURCES = gslplayobject_impl.cc
+-libartsgslplayobject_la_LIBADD = $(top_builddir)/mcop/libmcop.la \
+- libsoundserver_idl.la $(FLOWLIBS)
++libartsgslplayobject_la_LIBADD = $(top_builddir)/mcop/libmcop.la libkmedia2_idl.la \
++ libsoundserver_idl.la $(FLOWLIBS) $(top_builddir)/flow/libartsflow_idl.la
+ libartsgslplayobject_la_LDFLAGS = -no-undefined -module $(all_libraries)
+ libartsgslplayobject_la_COMPILE_FIRST = soundserver.h ../flow/artsflow.h
+
+@@ -53,8 +53,7 @@
+
+ bin_PROGRAMS = artsd artsplay artscat artswrapper artsshell artsrec
+
+-artsd_LDADD = libsoundserver_idl.la $(FLOWLIBS) \
+- $(top_builddir)/mcop_mt/libmcop_mt.la
++artsd_LDADD = libsoundserver_idl.la $(FLOWLIBS)
+ artsd_LDFLAGS = $(USE_THREADS)
+ artsd_SOURCES = soundserverv2_impl.cc soundserver_impl.cc simplesoundserver_impl.cc artsd.cc cpuusage.cc samplestorage_impl.cc crashhandler.cc soundserverstartup_impl.cc
+ artsd_COMPILE_FIRST = soundserver.h artsversion.h
+--- arts-1.5.9/configure.in.in 2008-02-20 20:59:12.000000000 +0200
++++ arts-1.5.9/configure.in.in 2008-02-20 21:55:18.000000000 +0200
+@@ -172,7 +172,7 @@
+ if test "x$arts_libaudionas_include" = "xyes"; then
+ AC_CHECK_LIB(audio,AuOpenServer,[
+ dnl LDFLAGS in case it's in KDEDIR/lib
+- LIBAUDIONAS="-laudio -lXt"
++ LIBAUDIONAS="-laudio"
+ LIBAUDIONAS_LDFLAGS="$LDFLAGS"
+ AC_DEFINE(HAVE_LIBAUDIONAS, 1,
+ [Define if you have libaudio (required if you want to have NAS support)])
+@@ -789,6 +789,7 @@
+ JACK_CFLAGS="`$PKG_CONFIG --cflags jack`"
+ JACK_LIBADD="`$PKG_CONFIG --libs-only-l jack`"
+ JACK_LDFLAGS="`$PKG_CONFIG --libs-only-L jack`"
++ JACK_LIBADD="-ljack"
+ AC_MSG_RESULT(yes)
+ AC_DEFINE(HAVE_LIBJACK, 1,
+ [Define if you have libjack (required if you want Jack support)])
+--- arts-1.5.9/flow/gsl/configure.in.in 2008-02-13 11:35:23.000000000 +0200
++++ arts-1.5.9/flow/gsl/configure.in.in 2008-02-20 20:44:23.000000000 +0200
+@@ -54,7 +54,7 @@
+ ,
+ ov_headers=0, -lvorbisenc -lvorbis -logg)
+ if test $ov_headers = 3 ; then
+- GSL_LIBS="$GSL_LIBS -lvorbisfile -lvorbisenc -lvorbis -logg"
++ GSL_LIBS="$GSL_LIBS -lvorbisfile -lvorbis"
+ GSL_HAVE_OGGVORBIS=1
+ else
+ GSL_HAVE_OGGVORBIS=0
+--- arts-1.5.9/gmcop/Makefile.am 2008-02-20 22:01:18.000000000 +0200
++++ arts-1.5.9/gmcop/Makefile.am 2008-02-20 22:02:16.000000000 +0200
+@@ -3,7 +3,7 @@
+ INCLUDES = -I$(top_srcdir)/mcop -I$(top_builddir)/mcop $(GLIB_CFLAGS) $(all_includes)
+
+ libgmcop_la_SOURCES = giomanager.cc
+-libgmcop_la_LIBADD = $(top_builddir)/mcop/libmcop.la $(GLIB_LIBADD)
++libgmcop_la_LIBADD = $(top_builddir)/mcop/libmcop.la -lglib-2.0
+ libgmcop_la_LDFLAGS = -no-undefined -version-info 1:0 $(GLIB_LDFLAGS) $(all_libraries)
+
+ artsincludedir = $(includedir)/arts
Modified: trunk/packages/arts/debian/patches/98_buildprep.diff
===================================================================
Modified: trunk/packages/arts/debian/rules
===================================================================
--- trunk/packages/arts/debian/rules 2008-03-29 09:01:46 UTC (rev 9901)
+++ trunk/packages/arts/debian/rules 2008-03-29 11:46:07 UTC (rev 9902)
@@ -11,8 +11,8 @@
PACKAGES_WITH_LIBS := libarts1c2a libartsc0
-DEB_DH_MAKESHLIBS_ARGS_libarts1c2a := -V'libarts1c2a (>= 1.5.9)'
-DEB_DH_MAKESHLIBS_ARGS_libartsc0 := -V'libartsc0 (>= 1.5.9)'
+DEB_DH_MAKESHLIBS_ARGS_libarts1c2a := -V'libarts1c2a (>= 1.5.0-1)'
+DEB_DH_MAKESHLIBS_ARGS_libartsc0 := -V'libartsc0 (>= 1.5.0-1)'
#shlibs_ver = 1.5.0-1
#$(foreach p,$(PACKAGES_WITH_LIBS),$(eval DEB_DH_MAKESHLIBS_ARGS_$(p) := -V'$(p) (>= $(shlibs_ver))'))
More information about the pkg-kde-commits
mailing list