[pkg-kde-commits] rev 2783 - trunk/packages/kdeutils/debian/patches
Christopher Martin
chrsmrtn at costa.debian.org
Sat Jan 7 23:42:55 UTC 2006
Author: chrsmrtn
Date: 2006-01-07 23:42:53 +0000 (Sat, 07 Jan 2006)
New Revision: 2783
Modified:
trunk/packages/kdeutils/debian/patches/98_buildprep.diff
Log:
kdeutils buildprep update.
Modified: trunk/packages/kdeutils/debian/patches/98_buildprep.diff
===================================================================
--- trunk/packages/kdeutils/debian/patches/98_buildprep.diff 2006-01-07 23:42:02 UTC (rev 2782)
+++ trunk/packages/kdeutils/debian/patches/98_buildprep.diff 2006-01-07 23:42:53 UTC (rev 2783)
@@ -3148,6 +3148,18 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
+--- config.h.in
++++ config.h.in
+@@ -49,6 +49,9 @@
+ /* Define to 1 if you have the <inttypes.h> header file. */
+ #undef HAVE_INTTYPES_H
+
++/* Define if you have knewstuff */
++#undef HAVE_KNEWSTUFF
++
+ /* Define if you have libjpeg */
+ #undef HAVE_LIBJPEG
+
--- configure
+++ configure
@@ -278,15 +278,15 @@
@@ -12476,7 +12488,15 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -46716,8 +47276,7 @@
+@@ -46675,6 +47235,7 @@
+
+
+
++kde_have_knewstuff=yes
+
+ kde_save_LDFLAGS="$LDFLAGS"
+ kde_save_LIBS="$LIBS"
+@@ -46716,8 +47277,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12486,7 +12506,30 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -46783,8 +47342,7 @@
+@@ -46744,13 +47304,22 @@
+ echo "${ECHO_T}$ac_cv_lib_knewstuff_main" >&6
+ if test $ac_cv_lib_knewstuff_main = yes; then
+ MY_LIBKNEWSTUFF="-lknewstuff"
++else
++ kde_have_knewstuff=no
+ fi
+
+ LDFLAGS="$kde_save_LDFLAGS"
+ LIBS="$kde_save_LIBS"
+
++if test "$kde_have_knewstuff" = "yes"; then
++
++cat >>confdefs.h <<\_ACEOF
++#define HAVE_KNEWSTUFF 1
++_ACEOF
+
+
++fi
++
+ echo "$as_me:$LINENO: checking for main in -lkvm" >&5
+ echo $ECHO_N "checking for main in -lkvm... $ECHO_C" >&6
+ if test "${ac_cv_lib_kvm_main+set}" = set; then
+@@ -46783,8 +47352,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12496,7 +12539,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -47370,6 +47928,13 @@
+@@ -47370,6 +47938,13 @@
LTLIBOBJS=$ac_ltlibobjs
@@ -12510,7 +12553,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
-@@ -48274,6 +48839,9 @@
+@@ -48274,6 +48849,9 @@
s, at AMTAR@,$AMTAR,;t t
s, at am__tar@,$am__tar,;t t
s, at am__untar@,$am__untar,;t t
@@ -12520,7 +12563,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
-@@ -48688,11 +49256,6 @@
+@@ -48688,11 +49266,6 @@
*) ac_INSTALL=$ac_top_builddir$INSTALL ;;
esac
@@ -12532,7 +12575,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. */
-@@ -48731,6 +49294,12 @@
+@@ -48731,6 +49304,12 @@
fi;;
esac
done` || { (exit 1); exit 1; }
@@ -12556,6 +12599,21 @@
KDE_SET_PREFIX
dnl generate the config header
+@@ -508,8 +510,12 @@
+ AC_SUBST(XMMS_LDFLAGS)
+ AC_SUBST(XMMS_INCLUDES)
+
+-KDE_CHECK_LIB(knewstuff, main, [MY_LIBKNEWSTUFF="-lknewstuff"])
+-AC_SUBST(MY_LIBKNEWSTUFF)
++kde_have_knewstuff=yes
++KDE_CHECK_LIB(knewstuff, main, [MY_LIBKNEWSTUFF="-lknewstuff"], kde_have_knewstuff=no)
++if test "$kde_have_knewstuff" = "yes"; then
++ AC_DEFINE(HAVE_KNEWSTUFF, 1, [Define if you have knewstuff])
++ AC_SUBST(MY_LIBKNEWSTUFF)
++fi
+
+ AC_CHECK_LIB(kvm, main, [LIBKVM="-lkvm"])
+ AC_SUBST(LIBKVM)
--- doc/ark/Makefile.in
+++ doc/ark/Makefile.in
@@ -175,6 +175,9 @@
@@ -13638,6 +13696,17 @@
@$(NORMAL_INSTALL)
--- kcalc/knumber/tests/Makefile.in
+++ kcalc/knumber/tests/Makefile.in
+@@ -31,8 +31,8 @@
+
+ # You should have received a copy of the GNU Library General Public License
+ # along with this library; see the file COPYING.LIB. If not, write to
+-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+-# Boston, MA 02111-1307, USA.
++# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++# Boston, MA 02110-1301, USA.
+
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
@@ -228,6 +228,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -15612,6 +15681,17 @@
force-reedit:
--- kmilo/asus/Makefile.in
+++ kmilo/asus/Makefile.in
+@@ -31,8 +31,8 @@
+
+ # You should have received a copy of the GNU Library General Public License
+ # along with this library; see the file COPYING.LIB. If not, write to
+-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+-# Boston, MA 02111-1307, USA.
++# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++# Boston, MA 02110-1301, USA.
+
+ #SUBDIRS = . kcmthinkpad
+
@@ -243,6 +243,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -15645,6 +15725,17 @@
@$(NORMAL_INSTALL)
--- kmilo/delli8k/Makefile.in
+++ kmilo/delli8k/Makefile.in
+@@ -31,8 +31,8 @@
+
+ # You should have received a copy of the GNU Library General Public License
+ # along with this library; see the file COPYING.LIB. If not, write to
+-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+-# Boston, MA 02111-1307, USA.
++# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++# Boston, MA 02110-1301, USA.
+
+
+
@@ -241,6 +241,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -15678,6 +15769,17 @@
@$(NORMAL_INSTALL)
--- kmilo/demo/Makefile.in
+++ kmilo/demo/Makefile.in
+@@ -30,8 +30,8 @@
+
+ # You should have received a copy of the GNU Library General Public License
+ # along with this library; see the file COPYING.LIB. If not, write to
+-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+-# Boston, MA 02111-1307, USA.
++# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++# Boston, MA 02110-1301, USA.
+
+
+
@@ -240,6 +240,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -15711,6 +15813,17 @@
@$(NORMAL_INSTALL)
--- kmilo/generic/Makefile.in
+++ kmilo/generic/Makefile.in
+@@ -30,8 +30,8 @@
+
+ # You should have received a copy of the GNU Library General Public License
+ # along with this library; see the file COPYING.LIB. If not, write to
+-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+-# Boston, MA 02111-1307, USA.
++# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++# Boston, MA 02110-1301, USA.
+
+
+
@@ -240,6 +240,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -15744,6 +15857,17 @@
@$(NORMAL_INSTALL)
--- kmilo/kmilod/Makefile.in
+++ kmilo/kmilod/Makefile.in
+@@ -30,8 +30,8 @@
+
+ # You should have received a copy of the GNU Library General Public License
+ # along with this library; see the file COPYING.LIB. If not, write to
+-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+-# Boston, MA 02111-1307, USA.
++# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++# Boston, MA 02110-1301, USA.
+
+
+
@@ -252,6 +252,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -15810,6 +15934,17 @@
@$(NORMAL_INSTALL)
--- kmilo/kmilo_kvaio/Makefile.in
+++ kmilo/kmilo_kvaio/Makefile.in
+@@ -30,8 +30,8 @@
+
+ # You should have received a copy of the GNU Library General Public License
+ # along with this library; see the file COPYING.LIB. If not, write to
+-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+-# Boston, MA 02111-1307, USA.
++# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++# Boston, MA 02110-1301, USA.
+
+
+
@@ -257,6 +257,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -15910,6 +16045,17 @@
mostlyclean-libtool:
--- kmilo/powerbook/Makefile.in
+++ kmilo/powerbook/Makefile.in
+@@ -30,8 +30,8 @@
+
+ # You should have received a copy of the GNU Library General Public License
+ # along with this library; see the file COPYING.LIB. If not, write to
+-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+-# Boston, MA 02111-1307, USA.
++# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++# Boston, MA 02110-1301, USA.
+
+
+
@@ -240,6 +240,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -15943,6 +16089,17 @@
@$(NORMAL_INSTALL)
--- kmilo/powerbook2/Makefile.in
+++ kmilo/powerbook2/Makefile.in
+@@ -30,8 +30,8 @@
+
+ # You should have received a copy of the GNU Library General Public License
+ # along with this library; see the file COPYING.LIB. If not, write to
+-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+-# Boston, MA 02111-1307, USA.
++# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++# Boston, MA 02110-1301, USA.
+
+
+
@@ -240,6 +240,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -16009,6 +16166,17 @@
@$(NORMAL_INSTALL)
--- kmilo/thinkpad/Makefile.in
+++ kmilo/thinkpad/Makefile.in
+@@ -30,8 +30,8 @@
+
+ # You should have received a copy of the GNU Library General Public License
+ # along with this library; see the file COPYING.LIB. If not, write to
+-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+-# Boston, MA 02111-1307, USA.
++# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++# Boston, MA 02110-1301, USA.
+
+
+
@@ -254,6 +254,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
More information about the pkg-kde-commits
mailing list