rev 3020 - trunk/packages/kdeadmin/debian/patches
Christopher Martin
chrsmrtn at costa.debian.org
Sun Jan 29 15:20:36 UTC 2006
Author: chrsmrtn
Date: 2006-01-29 15:20:33 +0000 (Sun, 29 Jan 2006)
New Revision: 3020
Modified:
trunk/packages/kdeadmin/debian/patches/98_buildprep.diff
Log:
kdeadmin buildprep update.
Modified: trunk/packages/kdeadmin/debian/patches/98_buildprep.diff
===================================================================
--- trunk/packages/kdeadmin/debian/patches/98_buildprep.diff 2006-01-29 15:19:56 UTC (rev 3019)
+++ trunk/packages/kdeadmin/debian/patches/98_buildprep.diff 2006-01-29 15:20:33 UTC (rev 3020)
@@ -10744,7 +10744,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33859,8 +34537,7 @@
+@@ -33860,8 +34538,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10754,7 +10754,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33917,8 +34594,7 @@
+@@ -33918,8 +34595,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10764,7 +10764,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34057,8 +34733,7 @@
+@@ -34058,8 +34734,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10774,7 +10774,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34298,8 +34973,7 @@
+@@ -34299,8 +34974,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10784,7 +10784,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34367,8 +35041,7 @@
+@@ -34368,8 +35042,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10794,7 +10794,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34463,8 +35136,7 @@
+@@ -34464,8 +35137,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10804,7 +10804,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34592,8 +35264,7 @@
+@@ -34593,8 +35265,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10814,7 +10814,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34665,8 +35336,7 @@
+@@ -34666,8 +35337,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10824,7 +10824,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34720,8 +35390,7 @@
+@@ -34721,8 +35391,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10834,7 +10834,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34792,8 +35461,7 @@
+@@ -34793,8 +35462,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10844,7 +10844,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34847,8 +35515,7 @@
+@@ -34848,8 +35516,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10854,7 +10854,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34915,8 +35582,7 @@
+@@ -34916,8 +35583,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10864,7 +10864,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35101,8 +35767,7 @@
+@@ -35102,8 +35768,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10874,7 +10874,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35362,9 +36027,6 @@
+@@ -35363,9 +36028,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -10884,7 +10884,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -35393,8 +36055,7 @@
+@@ -35394,8 +36056,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10894,7 +10894,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35493,8 +36154,7 @@
+@@ -35494,8 +36155,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10904,7 +10904,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35571,9 +36231,6 @@
+@@ -35572,9 +36232,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -10914,7 +10914,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -35602,8 +36259,7 @@
+@@ -35603,8 +36260,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10924,7 +10924,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35702,8 +36358,7 @@
+@@ -35703,8 +36359,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10934,7 +10934,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35780,9 +36435,6 @@
+@@ -35781,9 +36436,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -10944,7 +10944,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -35811,8 +36463,7 @@
+@@ -35812,8 +36464,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10954,7 +10954,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35911,8 +36562,7 @@
+@@ -35912,8 +36563,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10964,7 +10964,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -36006,8 +36656,7 @@
+@@ -36007,8 +36657,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10974,7 +10974,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -36049,8 +36698,7 @@
+@@ -36050,8 +36699,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10984,7 +10984,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -36107,8 +36755,7 @@
+@@ -36108,8 +36756,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10994,7 +10994,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -36618,6 +37265,13 @@
+@@ -36619,6 +37266,13 @@
LTLIBOBJS=$ac_ltlibobjs
@@ -11008,7 +11008,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
-@@ -37347,6 +38001,9 @@
+@@ -37348,6 +38002,9 @@
s, at AMTAR@,$AMTAR,;t t
s, at am__tar@,$am__tar,;t t
s, at am__untar@,$am__untar,;t t
@@ -11018,7 +11018,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
-@@ -37718,11 +38375,6 @@
+@@ -37719,11 +38376,6 @@
*) ac_INSTALL=$ac_top_builddir$INSTALL ;;
esac
@@ -11030,7 +11030,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. */
-@@ -37761,6 +38413,12 @@
+@@ -37762,6 +38414,12 @@
fi;;
esac
done` || { (exit 1); exit 1; }
@@ -11047,7 +11047,7 @@
+++ configure.in
@@ -42,6 +42,8 @@
dnl Automake doc recommends to do this only here. (Janos)
- AM_INIT_AUTOMAKE(kdeadmin, "3.5.0") dnl searches for some needed programs
+ AM_INIT_AUTOMAKE(kdeadmin, "3.5.1") dnl searches for some needed programs
+AM_MAINTAINER_MODE
+
@@ -11995,7 +11995,7 @@
.NOEXPORT:
#>+ 2
--KDE_DIST=file.pl.in debug.pl.in type1inst service-list.pl.in replace.pl.in report.pl.in guess_system.sh network-conf.in service.pl.in network.pl.in configure.in.in platform.pl.in process.pl.in Makefile.in util.pl.in parse.pl.in xml.pl.in Makefile.am general.pl.in
+-KDE_DIST=file.pl.in debug.pl.in type1inst service-list.pl.in README.NEW_PLATFORMS replace.pl.in report.pl.in guess_system.sh network-conf.in service.pl.in network.pl.in configure.in.in platform.pl.in process.pl.in Makefile.in util.pl.in parse.pl.in xml.pl.in Makefile.am general.pl.in
+KDE_DIST=file.pl.in debug.pl.in type1inst service-list.pl.in README.NEW_PLATFORMS replace.pl.in report.pl.in guess_system.sh network-conf.in service.pl.in configure.in.in network.pl.in platform.pl.in process.pl.in Makefile.in util.pl.in parse.pl.in xml.pl.in Makefile.am general.pl.in
#>+ 2
@@ -12078,19 +12078,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -331,7 +334,10 @@
- xdg_directorydir = @xdg_directorydir@
- xdg_menudir = @xdg_menudir@
- iconsdir = $(kde_datadir)/knetworkconf/pixmaps/
--icons_DATA = ark.png debian.png mandrake.png blackpanther.png pld.png redhat.png suse.png turbolinux.png conectiva.png fedora.png openna.png slackware.png freebsd.png gentoo.png vine.png specifix.png kubuntu.png yoper.png
-+icons_DATA = ark.png debian.png mandrake.png blackpanther.png pld.png \
-+ redhat.png suse.png turbolinux.png conectiva.png fedora.png openna.png \
-+ slackware.png freebsd.png gentoo.png vine.png kubuntu.png yoper.png rpath.png
-+
-
- # Install the icons into the global KDE directories
- KDE_ICON = network_connected_lan_knc network_disconnected_lan network_disconnected_wlan network_traffic_wlan
-@@ -340,7 +346,7 @@
+@@ -343,7 +346,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -12099,7 +12087,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -378,9 +384,9 @@
+@@ -381,9 +384,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12111,16 +12099,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -543,7 +549,7 @@
+@@ -546,7 +549,7 @@
.NOEXPORT:
#>+ 2
--KDE_DIST=suse.png openna.png kubuntu.png vine.png turbolinux.png ark.png blackpanther.png gentoo.png yoper.png debian.png hi22-action-network_connected_lan_knc.png hi22-action-network_disconnected_lan.png hi22-action-network_traffic_wlan.png mandrake.png freebsd.png slackware.png redhat.png fedora.png Makefile.in hi22-action-network_disconnected_wlan.png specifix.png conectiva.png Makefile.am pld.png
+-KDE_DIST=suse.png openna.png kubuntu.png vine.png turbolinux.png ark.png blackpanther.png gentoo.png yoper.png debian.png hi22-action-network_connected_lan_knc.png hi22-action-network_disconnected_lan.png hi22-action-network_traffic_wlan.png mandrake.png rpath.png freebsd.png slackware.png redhat.png fedora.png Makefile.in hi22-action-network_disconnected_wlan.png conectiva.png Makefile.am pld.png
+KDE_DIST=suse.png openna.png kubuntu.png vine.png turbolinux.png ark.png blackpanther.png gentoo.png yoper.png debian.png hi22-action-network_connected_lan_knc.png hi22-action-network_disconnected_lan.png hi22-action-network_traffic_wlan.png mandrake.png rpath.png freebsd.png slackware.png redhat.png fedora.png Makefile.in hi22-action-network_disconnected_wlan.png conectiva.png pld.png Makefile.am
#>+ 2
docs-am:
-@@ -551,16 +557,16 @@
+@@ -554,16 +557,16 @@
#>+ 13
install-kde-icons:
$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/actions
More information about the pkg-kde-commits
mailing list