TDE
/
knutclient
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/knutclient
0
0
Fork 0
Code Issues Releases Wiki Activity

Convert remaining references to kde3 (e.g. in paths) to trinity

Browse Source 
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/knutclient@1248408 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
v3.5.13-sru
tpearson 13 years ago
parent 4fc248b5ba
commit ddca41272d
4 changed files with 57 additions and 57 deletions
Show Stats Download Patch File Download Diff File

40
acinclude.m4
Unescape View File

@ -479,14 +479,14 @@ if test "$1" = "default"; then
if test "$kde_qtver" = "2"; then
kde_moduledir='\${libdir}/kde2'
else
kde_moduledir='\${libdir}/kde3'
kde_moduledir='\${libdir}/trinity'
fi
fi
if test -z "$kde_styledir"; then
kde_styledir='\${libdir}/kde3/plugins/styles'
kde_styledir='\${libdir}/trinity/plugins/styles'
fi
if test -z "$kde_widgetdir"; then
kde_widgetdir='\${libdir}/kde3/plugins/designer'
kde_widgetdir='\${libdir}/trinity/plugins/designer'
fi
if test -z "$xdg_appsdir"; then
xdg_appsdir='\${datadir}/applications/kde'
@ -546,7 +546,7 @@ Please check whether you installed aRts correctly or use
AC_DEFUN([KDE_SET_DEFAULT_BINDIRS],
[
kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/kde/bin /opt/kde3/bin /usr/kde/bin /usr/local/kde/bin"
kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/kde/bin /opt/trinity/bin /usr/kde/bin /usr/local/kde/bin"
test -n "$KDEDIR" && kde_default_bindirs="$KDEDIR/bin $kde_default_bindirs"
if test -n "$KDEDIRS"; then
kde_save_IFS=$IFS
@ -580,39 +580,39 @@ AC_DEFUN([KDE_SUBST_PROGRAMS],
fi
KDE_FIND_PATH(meinproc, MEINPROC, [$kde_default_bindirs])
kde32ornewer=1
kde33ornewer=1
trinity2ornewer=1
trinity3ornewer=1
if test -n "$kde_qtver" && test "$kde_qtver" -lt 3; then
kde32ornewer=
kde33ornewer=
trinity2ornewer=
trinity3ornewer=
else
if test "$kde_qtver" = "3"; then
if test "$kde_qtsubver" -le 1; then
kde32ornewer=
trinity2ornewer=
fi
if test "$kde_qtsubver" -le 2; then
kde33ornewer=
trinity3ornewer=
fi
if test "$KDECONFIG" != "compiled"; then
if test `$KDECONFIG --version | grep KDE | sed 's/KDE: \(...\).*/\1/'` = 3.2; then
kde33ornewer=
trinity3ornewer=
fi
fi
fi
fi
if test -n "$kde32ornewer"; then
if test -n "$trinity2ornewer"; then
KDE_FIND_PATH(kconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kconfig_compiler)])
KDE_FIND_PATH(dcopidlng, DCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)])
fi
if test -n "$kde33ornewer"; then
if test -n "$trinity3ornewer"; then
KDE_FIND_PATH(makekdewidgets, MAKEKDEWIDGETS, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(makekdewidgets)])
AC_SUBST(MAKEKDEWIDGETS)
fi
KDE_FIND_PATH(xmllint, XMLLINT, [${prefix}/bin ${exec_prefix}/bin], [XMLLINT=""])
if test -n "$MEINPROC" -a "$MEINPROC" != "compiled"; then
kde_sharedirs="/usr/share/kde /usr/local/share /usr/share /opt/kde3/share /opt/kde/share $prefix/share"
kde_sharedirs="/usr/share/kde /usr/local/share /usr/share /opt/trinity/share /opt/kde/share $prefix/share"
test -n "$KDEDIR" && kde_sharedirs="$KDEDIR/share $kde_sharedirs"
AC_FIND_FILE(apps/ksgmltools2/customization/kde-chunk.xsl, $kde_sharedirs, KDE_XSL_STYLESHEET)
if test "$KDE_XSL_STYLESHEET" = "NO"; then
@ -623,7 +623,7 @@ AC_DEFUN([KDE_SUBST_PROGRAMS],
fi
DCOP_DEPENDENCIES='$(DCOPIDL)'
if test -n "$kde32ornewer"; then
if test -n "$trinity2ornewer"; then
KCFG_DEPENDENCIES='$(KCONFIG_COMPILER)'
DCOP_DEPENDENCIES='$(DCOPIDL) $(DCOPIDLNG)'
AC_SUBST(KCONFIG_COMPILER)
@ -1793,7 +1793,7 @@ fi
if test -z "$1"; then
kde_incdirs="$kde_libs_prefix/include /opt/kde3/include/kde /usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/kde /usr/include /opt/kde3/include /opt/kde/include $x_includes $qt_includes"
kde_incdirs="$kde_libs_prefix/include /opt/trinity/include/kde /usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/kde /usr/include /opt/trinity/include /opt/kde/include $x_includes $qt_includes"
test -n "$KDEDIR" && kde_incdirs="$KDEDIR/include $KDEDIR/include/kde $KDEDIR $kde_incdirs"
kde_incdirs="$ac_kde_includes $kde_incdirs"
AC_FIND_FILE($kde_check_header, $kde_incdirs, kde_incdir)
@ -1805,7 +1805,7 @@ in the prefix, you've chosen, are no KDE headers installed. This will fail.
So, check this please and use another prefix!])
fi
kde_libdirs="$kde_libs_prefix/lib${kdelibsuff} /usr/lib/kde/lib${kdelibsuff} /usr/local/kde/lib${kdelibsuff} /usr/kde/lib${kdelibsuff} /usr/lib${kdelibsuff}/kde /usr/lib${kdelibsuff}/kde3 /usr/lib${kdelibsuff} /usr/X11R6/lib${kdelibsuff} /usr/local/lib${kdelibsuff} /opt/kde3/lib${kdelibsuff} /opt/kde/lib${kdelibsuff} /usr/X11R6/kde/lib${kdelibsuff}"
kde_libdirs="$kde_libs_prefix/lib${kdelibsuff} /usr/lib/kde/lib${kdelibsuff} /usr/local/kde/lib${kdelibsuff} /usr/kde/lib${kdelibsuff} /usr/lib${kdelibsuff}/kde /usr/lib${kdelibsuff}/trinity /usr/lib${kdelibsuff} /usr/X11R6/lib${kdelibsuff} /usr/local/lib${kdelibsuff} /opt/trinity/lib${kdelibsuff} /opt/kde/lib${kdelibsuff} /usr/X11R6/kde/lib${kdelibsuff}"
test -n "$KDEDIR" && kde_libdirs="$KDEDIR/lib${kdelibsuff} $KDEDIR $kde_libdirs"
kde_libdirs="$ac_kde_libraries $libdir $kde_libdirs"
AC_FIND_FILE($kde_check_lib, $kde_libdirs, kde_libdir)
@ -1813,7 +1813,7 @@ ac_kde_libraries="$kde_libdir"
kde_widgetdir=NO
dnl this might be somewhere else
AC_FIND_FILE("kde3/plugins/designer/kdewidgets.la", $kde_libdirs, kde_widgetdir)
AC_FIND_FILE("trinity/plugins/designer/kdewidgets.la", $kde_libdirs, kde_widgetdir)
if test -n "$ac_kde_libraries" && test ! -r "$ac_kde_libraries/$kde_check_lib"; then
AC_MSG_ERROR([
@ -1821,14 +1821,14 @@ in the prefix, you've chosen, are no KDE libraries installed. This will fail.
So, check this please and use another prefix!])
fi
if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/kde3/plugins/designer/kdewidgets.la"; then
if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/trinity/plugins/designer/kdewidgets.la"; then
AC_MSG_ERROR([
I can't find the designer plugins. These are required and should have been installed
by kdelibs])
fi
if test -n "$kde_widgetdir"; then
kde_widgetdir="$kde_widgetdir/kde3/plugins/designer"
kde_widgetdir="$kde_widgetdir/trinity/plugins/designer"
fi

10
config.log
Unescape View File

@ -4,7 +4,7 @@ running configure, to aid debugging if configure makes a mistake.
It was created by configure, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ ./configure --host=x86_64-linux-gnu --build=x86_64-linux-gnu --prefix=/opt/kde3 --mandir=${prefix}/share/man --infodir=${prefix}/share/info --with-qt-includes=/usr/include/qt3/ --with-qt-libraries=/usr/lib/qt3/ --enable-mt --disable-rpath
$ ./configure --host=x86_64-linux-gnu --build=x86_64-linux-gnu --prefix=/opt/trinity --mandir=${prefix}/share/man --infodir=${prefix}/share/info --with-qt-includes=/usr/include/qt3/ --with-qt-libraries=/usr/lib/qt3/ --enable-mt --disable-rpath
## --------- ##
## Platform. ##
@ -27,9 +27,9 @@ uname -v = #53-Ubuntu SMP Tue Dec 8 04:02:15 UTC 2009
/usr/bin/oslevel = unknown
/bin/universe = unknown
PATH: /opt/kde3/bin
PATH: /opt/kde3/games
PATH: /opt/kde3/bin
PATH: /opt/trinity/bin
PATH: /opt/trinity/games
PATH: /opt/trinity/bin
PATH: /home/eldarion/bin
PATH: /usr/local/sbin
PATH: /usr/local/bin
@ -326,7 +326,7 @@ mandir='${prefix}/share/man'
mkdir_p=''
oldincludedir='/usr/include'
pdfdir='${docdir}'
prefix='/opt/kde3'
prefix='/opt/trinity'
program_transform_name='s,x,x,'
psdir='${docdir}'
qt_includes=''

8
installMandriva4.sh
Unescape View File

@ -2,12 +2,12 @@
make -f Makefile.cvs
[ ! -f Makefile ] || make clean
export kde_htmldir=/opt/kde3/usr/share/doc/HTML
export KDEDIRS=/usr:/opt/kde3
sh ./configure --prefix=/opt/kde3
export kde_htmldir=/opt/trinity/usr/share/doc/HTML
export KDEDIRS=/usr:/opt/trinity
sh ./configure --prefix=/opt/trinity
make
make install
mv /opt/kde3/share/applnk/Utilities/knutclient.desktop /opt/kde3/share/applications/kde/
mv /opt/trinity/share/applnk/Utilities/knutclient.desktop /opt/trinity/share/applications/kde/

56
specs/knutclient.spec.mandriva.2009
Unescape View File

@ -18,9 +18,9 @@ sh admin/cvs.sh cvs
%build
CFLAGS="$RPM_OPT_FLAGS" \
CXXFLAGS="$RPM_OPT_FLAGS" \
export kde_htmldir=/opt/kde3/share/doc/HTML \
export KDEDIRS=/usr:/opt/kde3
./configure --prefix=/opt/kde3 \
export kde_htmldir=/opt/trinity/share/doc/HTML \
export KDEDIRS=/usr:/opt/trinity
./configure --prefix=/opt/trinity \
--libdir=%{_libdir} \
--enable-mt \
--disable-rpath
@ -33,7 +33,7 @@ make install-strip DESTDIR=%buildroot
install -d %buildroot/%_menudir
cat > %buildroot/%_menudir/%{name} <<EOF
?package(%{name}):\
command="/opt/kde3/bin/knutclient"\
command="/opt/trinity/bin/knutclient"\
title="KNutClient"\
icon="knutclient.png"\
longtitle="A GUI interface for UPS system NUT"\
@ -42,11 +42,11 @@ section="Applications/Monitoring"
EOF
mkdir -p %buildroot/opt/kde3/share/applications/kde/
mv %buildroot/opt/kde3/share/applnk/Utilities/knutclient.desktop %buildroot/opt/kde3/share/applications/kde/
rmdir %buildroot/opt/kde3/share/applnk/Utilities
rm %buildroot/opt/kde3/share/applications/kde/Utilities/knutclient.desktop
rmdir %buildroot/opt/kde3/share/applications/kde/Utilities
mkdir -p %buildroot/opt/trinity/share/applications/kde/
mv %buildroot/opt/trinity/share/applnk/Utilities/knutclient.desktop %buildroot/opt/trinity/share/applications/kde/
rmdir %buildroot/opt/trinity/share/applnk/Utilities
rm %buildroot/opt/trinity/share/applications/kde/Utilities/knutclient.desktop
rmdir %buildroot/opt/trinity/share/applications/kde/Utilities
%find_lang %{name}
@ -62,26 +62,26 @@ rm -rf %{buildroot}
%files -f %name.lang
%defattr(-,root,root)
%doc README AUTHORS ChangeLog INSTALL TODO COPYING
/opt/kde3/bin/knutclient
/opt/trinity/bin/knutclient
%{_menudir}/%{name}
/opt/kde3/share/applications/kde/knutclient.desktop
%dir /opt/kde3/share/apps/knutclient
/opt/kde3/share/apps/knutclient/knutclientui.rc
/opt/kde3/share/doc/HTML/*/knutclient
/opt/kde3/share/icons/??color/??x??/apps/knutclient.png
/opt/kde3/share/icons/??color/??x??/apps/knutclienterr.png
/opt/kde3/share/icons/??color/??x??/apps/knutclientconn.png
/opt/kde3/share/apps/knutclient/pics/knc_conn.png
/opt/kde3/share/apps/knutclient/pics/knc_error.png
/opt/kde3/share/apps/knutclient/pics/knc_main.png
/opt/kde3/share/apps/knutclient/pics/knc_analog.png
/opt/kde3/share/apps/knutclient/pics/knc_batt.png
/opt/kde3/share/apps/knutclient/pics/knc_dock.png
/opt/kde3/share/apps/knutclient/pics/knc_mpref.png
/opt/kde3/share/apps/knutclient/pics/knc_mset.png
/opt/kde3/share/apps/knutclient/pics/knc_panel.png
/opt/kde3/share/apps/knutclient/pics/knc_ups.png
/opt/kde3/share/apps/knutclient/pics/knc_upses.png
/opt/trinity/share/applications/kde/knutclient.desktop
%dir /opt/trinity/share/apps/knutclient
/opt/trinity/share/apps/knutclient/knutclientui.rc
/opt/trinity/share/doc/HTML/*/knutclient
/opt/trinity/share/icons/??color/??x??/apps/knutclient.png
/opt/trinity/share/icons/??color/??x??/apps/knutclienterr.png
/opt/trinity/share/icons/??color/??x??/apps/knutclientconn.png
/opt/trinity/share/apps/knutclient/pics/knc_conn.png
/opt/trinity/share/apps/knutclient/pics/knc_error.png
/opt/trinity/share/apps/knutclient/pics/knc_main.png
/opt/trinity/share/apps/knutclient/pics/knc_analog.png
/opt/trinity/share/apps/knutclient/pics/knc_batt.png
/opt/trinity/share/apps/knutclient/pics/knc_dock.png
/opt/trinity/share/apps/knutclient/pics/knc_mpref.png
/opt/trinity/share/apps/knutclient/pics/knc_mset.png
/opt/trinity/share/apps/knutclient/pics/knc_panel.png
/opt/trinity/share/apps/knutclient/pics/knc_ups.png
/opt/trinity/share/apps/knutclient/pics/knc_upses.png
%changelog

Write Preview
Loading…
Cancel
Save