rev 3007 - trunk/packages/kdemultimedia/debian/patches
Christopher Martin
chrsmrtn at costa.debian.org
Fri Jan 27 19:29:13 UTC 2006
Author: chrsmrtn
Date: 2006-01-27 19:29:10 +0000 (Fri, 27 Jan 2006)
New Revision: 3007
Modified:
trunk/packages/kdemultimedia/debian/patches/98_buildprep.diff
Log:
Updated buildprep.
Modified: trunk/packages/kdemultimedia/debian/patches/98_buildprep.diff
===================================================================
--- trunk/packages/kdemultimedia/debian/patches/98_buildprep.diff 2006-01-27 19:28:42 UTC (rev 3006)
+++ trunk/packages/kdemultimedia/debian/patches/98_buildprep.diff 2006-01-27 19:29:10 UTC (rev 3007)
@@ -11958,7 +11958,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35278,8 +35948,7 @@
+@@ -35273,8 +35943,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11968,16 +11968,26 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35322,7 +35991,7 @@
+@@ -35356,8 +36025,7 @@
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -35400,7 +36068,7 @@
do
for j in libcdda_paranoia.$ext;
do
-- echo "configure: 35325: $i/$j" >&5
-+ echo "configure: 35994: $i/$j" >&5
+- echo "configure: 35403: $i/$j" >&5
++ echo "configure: 36071: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
para_libdir=$i
-@@ -35461,8 +36130,7 @@
+@@ -35539,8 +36207,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11987,7 +11997,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35631,8 +36299,7 @@
+@@ -35709,8 +36376,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11997,7 +12007,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35808,8 +36475,7 @@
+@@ -35886,8 +36552,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12007,7 +12017,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -36061,8 +36727,7 @@
+@@ -36139,8 +36804,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12017,7 +12027,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -36143,8 +36808,7 @@
+@@ -36221,8 +36885,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12027,7 +12037,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -36225,8 +36889,7 @@
+@@ -36303,8 +36966,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12037,7 +12047,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -36307,8 +36970,7 @@
+@@ -36385,8 +37047,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12047,7 +12057,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -36677,8 +37339,7 @@
+@@ -36755,8 +37416,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12057,7 +12067,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -36839,8 +37500,7 @@
+@@ -36917,8 +37577,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12067,7 +12077,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -37025,8 +37685,7 @@
+@@ -37103,8 +37762,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12077,17 +12087,27 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -37465,8 +38124,7 @@
+@@ -37270,8 +37928,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -37616,8 +38273,7 @@
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
- { ac_try='test -z "$ac_cxx_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -37636,8 +38294,7 @@
+@@ -37787,8 +38443,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12097,7 +12117,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -37764,8 +38421,7 @@
+@@ -37915,8 +38570,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12107,7 +12127,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -37920,8 +38576,7 @@
+@@ -38071,8 +38725,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12117,7 +12137,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -38036,8 +38691,7 @@
+@@ -38187,8 +38840,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12127,7 +12147,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -38192,8 +38846,7 @@
+@@ -38343,8 +38995,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12137,7 +12157,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -38300,8 +38953,7 @@
+@@ -38451,8 +39102,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12147,7 +12167,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -38464,8 +39116,7 @@
+@@ -38615,8 +39265,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12157,7 +12177,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -38526,8 +39177,7 @@
+@@ -38677,8 +39326,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12167,7 +12187,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -38587,8 +39237,7 @@
+@@ -38738,8 +39386,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12177,7 +12197,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -38650,8 +39299,7 @@
+@@ -38801,8 +39448,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12187,7 +12207,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -38712,8 +39360,7 @@
+@@ -38863,8 +39509,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12197,7 +12217,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -38774,8 +39421,7 @@
+@@ -38925,8 +39570,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12207,7 +12227,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -38907,8 +39553,7 @@
+@@ -39058,8 +39702,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12217,7 +12237,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -39057,8 +39702,7 @@
+@@ -39208,8 +39851,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12227,7 +12247,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -39114,8 +39758,7 @@
+@@ -39265,8 +39907,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12237,7 +12257,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -39263,8 +39906,7 @@
+@@ -39414,8 +40055,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12247,7 +12267,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -39365,8 +40007,7 @@
+@@ -39516,8 +40156,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12257,7 +12277,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -39516,8 +40157,7 @@
+@@ -39667,8 +40306,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12267,7 +12287,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -39669,8 +40309,7 @@
+@@ -39820,8 +40458,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12277,7 +12297,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -39712,8 +40351,7 @@
+@@ -39863,8 +40500,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12287,7 +12307,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -39770,8 +40408,7 @@
+@@ -39921,8 +40557,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12297,7 +12317,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -39901,8 +40538,7 @@
+@@ -40052,8 +40687,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12307,7 +12327,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -39980,8 +40616,7 @@
+@@ -40131,8 +40765,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12317,7 +12337,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -40044,8 +40679,7 @@
+@@ -40195,8 +40828,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12327,7 +12347,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -40108,8 +40742,7 @@
+@@ -40259,8 +40891,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12337,7 +12357,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -40172,8 +40805,7 @@
+@@ -40323,8 +40954,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12347,7 +12367,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -40227,14 +40859,6 @@
+@@ -40378,14 +41008,6 @@
echo "${ECHO_T}$OS_TYPE" >&6
INTELCPPFLAG=
@@ -12362,7 +12382,7 @@
-@@ -40325,8 +40949,7 @@
+@@ -40476,8 +41098,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12372,7 +12392,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -40401,8 +41024,7 @@
+@@ -40552,8 +41173,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12382,7 +12402,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -40462,8 +41084,7 @@
+@@ -40613,8 +41233,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12392,7 +12412,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -40760,8 +41381,7 @@
+@@ -40911,8 +41530,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12402,7 +12422,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -40833,8 +41453,7 @@
+@@ -40984,8 +41602,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12412,7 +12432,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -40888,8 +41507,7 @@
+@@ -41039,8 +41656,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12422,7 +12442,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -40960,8 +41578,7 @@
+@@ -41111,8 +41727,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12432,7 +12452,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -41015,8 +41632,7 @@
+@@ -41166,8 +41781,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12442,7 +12462,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -41083,8 +41699,7 @@
+@@ -41234,8 +41848,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12452,7 +12472,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -41249,8 +41864,7 @@
+@@ -41400,8 +42013,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12462,7 +12482,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -41319,8 +41933,7 @@
+@@ -41470,8 +42082,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12472,7 +12492,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -41504,8 +42117,7 @@
+@@ -41655,8 +42266,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12482,7 +12502,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -41599,8 +42211,7 @@
+@@ -41750,8 +42360,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12492,7 +12512,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -41686,8 +42297,7 @@
+@@ -41837,8 +42446,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12502,7 +12522,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -41791,8 +42401,7 @@
+@@ -41942,8 +42550,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12512,7 +12532,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -42089,8 +42698,7 @@
+@@ -42240,8 +42847,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12522,7 +12542,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -42212,8 +42820,7 @@
+@@ -42363,8 +42969,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12532,7 +12552,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -42928,6 +43535,13 @@
+@@ -43079,6 +43684,13 @@
LTLIBOBJS=$ac_ltlibobjs
@@ -12546,7 +12566,7 @@
if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
{ { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
-@@ -43958,6 +44572,9 @@
+@@ -44109,6 +44721,9 @@
s, at AMTAR@,$AMTAR,;t t
s, at am__tar@,$am__tar,;t t
s, at am__untar@,$am__untar,;t t
@@ -12556,7 +12576,7 @@
s, at KDECONFIG@,$KDECONFIG,;t t
s, at kde_libs_prefix@,$kde_libs_prefix,;t t
s, at kde_libs_htmldir@,$kde_libs_htmldir,;t t
-@@ -44431,11 +45048,6 @@
+@@ -44582,11 +45197,6 @@
*) ac_INSTALL=$ac_top_builddir$INSTALL ;;
esac
@@ -12568,7 +12588,7 @@
# Let's still pretend it is `configure' which instantiates (i.e., don't
# use $as_me), people would be surprised to read:
# /* config.h. Generated by config.status. */
-@@ -44474,6 +45086,12 @@
+@@ -44625,6 +45235,12 @@
fi;;
esac
done` || { (exit 1); exit 1; }
@@ -12585,14 +12605,14 @@
+++ configure.in
@@ -42,6 +42,8 @@
dnl Automake doc recommends to do this only here. (Janos)
- AM_INIT_AUTOMAKE(kdemultimedia, "3.5.0") dnl searches for some needed programs
+ AM_INIT_AUTOMAKE(kdemultimedia, "3.5.1") dnl searches for some needed programs
+AM_MAINTAINER_MODE
+
KDE_SET_PREFIX
dnl generate the config header
-@@ -1241,12 +1243,6 @@
+@@ -1265,12 +1267,6 @@
AC_MSG_RESULT($OS_TYPE)
INTELCPPFLAG=
@@ -13106,11 +13126,11 @@
.NOEXPORT:
#>+ 2
--KDE_DIST=kscd18.png index.docbook kscd6.png kscd13.png kscd2.png kscd14.png index.cache.bz2 kscd5.png kscd12.png kscd16.png kscd11.png kscd19.png kscd9.png kscd3.png kscd.png Makefile.in Makefile.am
+-KDE_DIST=kscd18.png index.docbook kscd6.png kscd13.png kscd2.png kscd14.png kscdannounc.png index.cache.bz2 kscd5.png kscd12.png kscd16.png kscd11.png kscd19.png kscd9.png kscd3.png kscd.png Makefile.in Makefile.am
+KDE_DIST=kscd18.png kscd5.png kscd12.png index.docbook kscd16.png kscd11.png kscd9.png kscd19.png kscd6.png kscd3.png kscd.png kscd13.png Makefile.in kscd2.png kscd14.png Makefile.am kscdannounc.png index.cache.bz2
#>+ 24
--index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook kscd18.png kscd9.png kscd19.png kscd.png kscd11.png kscd2.png kscd12.png kscd3.png kscd13.png kscd14.png kscd5.png kscd6.png kscd16.png
+-index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook kscd18.png kscd9.png kscd19.png kscd.png kscdannounc.png kscd11.png kscd2.png kscd12.png kscd3.png kscd13.png kscd14.png kscd5.png kscd6.png kscd16.png
+index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) kscd11.png kscd12.png kscd13.png kscd14.png kscd16.png kscd18.png kscd19.png kscd2.png kscd3.png kscd5.png kscd6.png kscd9.png kscd.png kscdannounc.png index.docbook
@if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
@@ -13119,14 +13139,14 @@
#>+ 13
install-nls:
$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kscd
-- @for base in index.docbook kscd18.png kscd9.png kscd19.png kscd.png kscd11.png kscd2.png kscd12.png kscd3.png kscd13.png kscd14.png kscd5.png kscd6.png kscd16.png ; do \
+- @for base in index.docbook kscd18.png kscd9.png kscd19.png kscd.png kscdannounc.png kscd11.png kscd2.png kscd12.png kscd3.png kscd13.png kscd14.png kscd5.png kscd6.png kscd16.png ; do \
+ @for base in kscd11.png kscd12.png kscd13.png kscd14.png kscd16.png kscd18.png kscd19.png kscd2.png kscd3.png kscd5.png kscd6.png kscd9.png kscd.png kscdannounc.png index.docbook ; do \
echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kscd/$$base ;\
$(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kscd/$$base ;\
done
uninstall-nls:
-- for base in index.docbook kscd18.png kscd9.png kscd19.png kscd.png kscd11.png kscd2.png kscd12.png kscd3.png kscd13.png kscd14.png kscd5.png kscd6.png kscd16.png ; do \
+- for base in index.docbook kscd18.png kscd9.png kscd19.png kscd.png kscdannounc.png kscd11.png kscd2.png kscd12.png kscd3.png kscd13.png kscd14.png kscd5.png kscd6.png kscd16.png ; do \
+ for base in kscd11.png kscd12.png kscd13.png kscd14.png kscd16.png kscd18.png kscd19.png kscd2.png kscd3.png kscd5.png kscd6.png kscd9.png kscd.png kscdannounc.png index.docbook ; do \
rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kscd/$$base ;\
done
@@ -13134,7 +13154,7 @@
#>+ 5
distdir-nls:
-- for file in index.docbook kscd18.png kscd9.png kscd19.png kscd.png kscd11.png kscd2.png kscd12.png kscd3.png kscd13.png kscd14.png kscd5.png kscd6.png kscd16.png ; do \
+- for file in index.docbook kscd18.png kscd9.png kscd19.png kscd.png kscdannounc.png kscd11.png kscd2.png kscd12.png kscd3.png kscd13.png kscd14.png kscd5.png kscd6.png kscd16.png ; do \
+ for file in kscd11.png kscd12.png kscd13.png kscd14.png kscd16.png kscd18.png kscd19.png kscd2.png kscd3.png kscd5.png kscd6.png kscd9.png kscd.png kscdannounc.png index.docbook ; do \
cp $(srcdir)/$$file $(distdir); \
done
@@ -14375,25 +14395,7 @@
@$(NORMAL_INSTALL)
--- kioslave/audiocd/plugins/lame/Makefile.in
+++ kioslave/audiocd/plugins/lame/Makefile.in
-@@ -62,12 +62,14 @@
- am__DEPENDENCIES_1 =
- libaudiocd_encoder_lame_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- ../libaudiocdplugins.la
--am_libaudiocd_encoder_lame_la_OBJECTS = encoderlame.lo
-+am_libaudiocd_encoder_lame_la_OBJECTS = encoderlame.lo \
-+ collectingprocess.lo
- #>- libaudiocd_encoder_lame_la_OBJECTS = \
- #>- $(am_libaudiocd_encoder_lame_la_OBJECTS)
--#>+ 4
-+#>+ 5
- libaudiocd_encoder_lame_la_final_OBJECTS = libaudiocd_encoder_lame_la.all_cpp.lo
--libaudiocd_encoder_lame_la_nofinal_OBJECTS = encoderlame.lo encoderlameconfig.lo audiocd_lame_encoder.lo
-+libaudiocd_encoder_lame_la_nofinal_OBJECTS = encoderlame.lo \
-+ collectingprocess.lo encoderlameconfig.lo audiocd_lame_encoder.lo
- @KDE_USE_FINAL_FALSE at libaudiocd_encoder_lame_la_OBJECTS = $(libaudiocd_encoder_lame_la_nofinal_OBJECTS)
- @KDE_USE_FINAL_TRUE at libaudiocd_encoder_lame_la_OBJECTS = $(libaudiocd_encoder_lame_la_final_OBJECTS)
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-@@ -242,6 +244,9 @@
+@@ -244,6 +244,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14403,19 +14405,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -473,9 +478,9 @@
- INCLUDES = -I$(top_srcdir)/libkcddb -I$(srcdir)/.. $(taglib_includes) $(all_includes)
- kde_kcfg_DATA = audiocd_lame_encoder.kcfg
- kde_module_LTLIBRARIES = libaudiocd_encoder_lame.la
--#>- libaudiocd_encoder_lame_la_SOURCES = audiocd_lame_encoder.kcfgc encoderlame.cpp encoderlameconfig.ui
-+#>- libaudiocd_encoder_lame_la_SOURCES = audiocd_lame_encoder.kcfgc encoderlame.cpp encoderlameconfig.ui collectingprocess.cpp
- #>+ 1
--libaudiocd_encoder_lame_la_SOURCES= encoderlame.cpp encoderlameconfig.cpp audiocd_lame_encoder.cpp
-+libaudiocd_encoder_lame_la_SOURCES= encoderlame.cpp collectingprocess.cpp encoderlameconfig.cpp audiocd_lame_encoder.cpp
- libaudiocd_encoder_lame_la_LIBADD = $(LIB_KIO) ../libaudiocdplugins.la
- #>- libaudiocd_encoder_lame_la_LDFLAGS = -avoid-version -module -no-undefined $(taglib_libs) $(all_libraries)
- #>+ 1
-@@ -488,7 +493,7 @@
+@@ -490,7 +493,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -14424,7 +14414,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -526,9 +531,9 @@
+@@ -528,9 +531,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14436,69 +14426,6 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -569,6 +574,7 @@
- distclean-compile:
- -rm -f *.tab.c
-
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/collectingprocess.Plo at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/encoderlame.Plo at am__quote@
-
- .cpp.o:
-@@ -817,6 +823,13 @@
-
-
- #>+ 3
-+collectingprocess.moc: $(srcdir)/collectingprocess.h
-+ $(MOC) $(srcdir)/collectingprocess.h -o collectingprocess.moc
-+
-+#>+ 2
-+mocs: collectingprocess.moc
-+
-+#>+ 3
- encoderlame.moc: $(srcdir)/encoderlame.h
- $(MOC) $(srcdir)/encoderlame.h -o encoderlame.moc
-
-@@ -825,10 +838,10 @@
-
- #>+ 3
- clean-metasources:
-- -rm -f encoderlame.moc
-+ -rm -f collectingprocess.moc encoderlame.moc
-
- #>+ 2
--KDE_DIST=audiocd_lame_encoder.kcfgc encoderlameconfig.ui Makefile.in encoderlame.h audiocd_lame_encoder.kcfg Makefile.am
-+KDE_DIST=audiocd_lame_encoder.kcfgc encoderlameconfig.ui Makefile.in encoderlame.h audiocd_lame_encoder.kcfg collectingprocess.h Makefile.am
-
- #>+ 4
- clean-ui:
-@@ -886,11 +899,11 @@
-
-
- #>+ 11
--libaudiocd_encoder_lame_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/encoderlame.cpp encoderlameconfig.cpp audiocd_lame_encoder.cpp encoderlameconfig.moc encoderlame.moc
-+libaudiocd_encoder_lame_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/encoderlame.cpp $(srcdir)/collectingprocess.cpp encoderlameconfig.cpp audiocd_lame_encoder.cpp encoderlameconfig.moc collectingprocess.moc encoderlame.moc
- @echo 'creating libaudiocd_encoder_lame_la.all_cpp.cpp ...'; \
- rm -f libaudiocd_encoder_lame_la.all_cpp.files libaudiocd_encoder_lame_la.all_cpp.final; \
- echo "#define KDE_USE_FINAL 1" >> libaudiocd_encoder_lame_la.all_cpp.final; \
-- for file in encoderlame.cpp encoderlameconfig.cpp audiocd_lame_encoder.cpp ; do \
-+ for file in encoderlame.cpp collectingprocess.cpp encoderlameconfig.cpp audiocd_lame_encoder.cpp ; do \
- echo "#include \"$$file\"" >> libaudiocd_encoder_lame_la.all_cpp.files; \
- test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libaudiocd_encoder_lame_la.all_cpp.final; \
- done; \
-@@ -921,9 +934,12 @@
- kde-rpo-clean:
- -rm -f *.rpo
-
--#>+ 6
-+#>+ 9
- nmcheck:
-+collectingprocess.o: collectingprocess.moc
- nmcheck-am: nmcheck
-+$(srcdir)/collectingprocess.cpp: encoderlameconfig.h audiocd_lame_encoder.h
-+collectingprocess.lo: collectingprocess.moc
- encoderlame.o: encoderlame.moc
- $(srcdir)/encoderlame.cpp: encoderlameconfig.h audiocd_lame_encoder.h
- encoderlame.lo: encoderlame.moc
--- kioslave/audiocd/plugins/Makefile.in
+++ kioslave/audiocd/plugins/Makefile.in
@@ -256,6 +256,9 @@
More information about the pkg-kde-commits
mailing list