From 667a6e09dce27767a017ee373c7f47b388e627ca Mon Sep 17 00:00:00 2001 From: tpearson Date: Sun, 21 Aug 2011 01:43:11 +0000 Subject: [PATCH] Convert remaining references to kde3 (e.g. in paths) to trinity git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kpowersave@1248408 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- README | 6 +++--- doc/online/Makefile | 2 +- kpowersave.kdevelop | 4 ++-- packaging/FC4.kpowersave.spec | 2 +- packaging/FC5.kpowersave.spec | 2 +- packaging/FC6.kpowersave.spec | 2 +- packaging/SUSE10.0.kpowersave.spec | 26 +++++++++++------------ packaging/SUSE10.1.kpowersave.spec | 24 ++++++++++----------- packaging/SUSE9.2.kpowersave.spec | 22 +++++++++---------- packaging/SUSE9.3.kpowersave.spec | 26 +++++++++++------------ packaging/mandriva.2006.1.kpowersave.spec | 2 +- packaging/mandriva.2007.1.kpowersave.spec | 2 +- packaging/openSUSE10.2.kpowersave.spec | 24 ++++++++++----------- packaging/openSUSE10.3.kpowersave.spec | 22 +++++++++---------- 14 files changed, 83 insertions(+), 83 deletions(-) diff --git a/README b/README index eb7c857..1025439 100644 --- a/README +++ b/README @@ -13,7 +13,7 @@ distribution) to compile KPowersave: and maybe also these packages: - doxygen (for code documentation) - - docbook, kde3sdk (handbook) + - docbook, trinitysdk (handbook) other (may) needed packages for run all KPowersave features: - PolicyKit, recommended >= 0.2 @@ -26,7 +26,7 @@ distribution) to compile KPowersave: * For SUSE users how to generate configure: - . /etc/opt/kde3/common_options + . /etc/opt/trinity/common_options update_admin * For other distributions try this to generate configure: @@ -36,7 +36,7 @@ distribution) to compile KPowersave: * Execute the following commands to compile, make and install kpowersave: - ./configure --prefix=/opt/kde3 [--enable-debug=full] + ./configure --prefix=/opt/trinity [--enable-debug=full] make make install diff --git a/doc/online/Makefile b/doc/online/Makefile index b9755bd..47298b3 100644 --- a/doc/online/Makefile +++ b/doc/online/Makefile @@ -1,5 +1,5 @@ all: - meinproc --stylesheet /opt/kde3/share/apps/ksgmltools2/customization/kde-web.xsl ../en/index.docbook + meinproc --stylesheet /opt/trinity/share/apps/ksgmltools2/customization/kde-web.xsl ../en/index.docbook ./replace rm *.bak cp ../en/*.png . diff --git a/kpowersave.kdevelop b/kpowersave.kdevelop index bd41311..d248441 100644 --- a/kpowersave.kdevelop +++ b/kpowersave.kdevelop @@ -55,7 +55,7 @@ -O2 -g0 - --enable-debug=full --prefix=/opt/kde3 + --enable-debug=full --prefix=/opt/trinity debug kdevgccoptions kdevgppoptions @@ -71,7 +71,7 @@ - --prefix=/opt/kde3 + --prefix=/opt/trinity diff --git a/packaging/FC4.kpowersave.spec b/packaging/FC4.kpowersave.spec index c0d377d..031a49a 100644 --- a/packaging/FC4.kpowersave.spec +++ b/packaging/FC4.kpowersave.spec @@ -65,7 +65,7 @@ rm -rf $RPM_BUILD_ROOT /usr/share/icons/??color /usr/share/applications/kde/kpowersave.desktop /usr/share/doc/HTML/*/kpowersave -/usr/lib*/kde3/kpowersave.* +/usr/lib*/trinity/kpowersave.* /usr/lib*/libkdeinit_kpowersave.* /usr/share/locale/* diff --git a/packaging/FC5.kpowersave.spec b/packaging/FC5.kpowersave.spec index d7e38df..c97ff55 100644 --- a/packaging/FC5.kpowersave.spec +++ b/packaging/FC5.kpowersave.spec @@ -67,7 +67,7 @@ rm -rf $RPM_BUILD_ROOT /usr/share/icons/??color /usr/share/applications/kde/kpowersave.desktop /usr/share/doc/HTML/*/kpowersave -/usr/lib*/kde3/kpowersave.* +/usr/lib*/trinity/kpowersave.* /usr/lib*/libkdeinit_kpowersave.* /usr/share/locale/* diff --git a/packaging/FC6.kpowersave.spec b/packaging/FC6.kpowersave.spec index 1136d6b..a7c03da 100644 --- a/packaging/FC6.kpowersave.spec +++ b/packaging/FC6.kpowersave.spec @@ -89,7 +89,7 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root,-) %doc README AUTHORS ChangeLog COPYING INSTALL %{_bindir}/kpowersave -%{_libdir}/kde3/kpowersave.* +%{_libdir}/trinity/kpowersave.* %{_libdir}/libkdeinit_kpowersave.* %{_datadir}/applications/kde/*kpowersave.desktop %{_datadir}/apps/kpowersave/ diff --git a/packaging/SUSE10.0.kpowersave.spec b/packaging/SUSE10.0.kpowersave.spec index e171f9e..2003dcc 100644 --- a/packaging/SUSE10.0.kpowersave.spec +++ b/packaging/SUSE10.0.kpowersave.spec @@ -9,7 +9,7 @@ # # norootforbuild -# neededforbuild dbus-1 dbus-1-devel dbus-1-qt3 hal hal-devel kde3-devel-packages kdelibs3 lsb pkgconfig powersave powersave-devel powersave-libs suse-release +# neededforbuild dbus-1 dbus-1-devel dbus-1-qt3 hal hal-devel trinity-devel-packages kdelibs3 lsb pkgconfig powersave powersave-devel powersave-libs suse-release Name: kpowersave BuildRequires: dbus-1-qt3-devel hal-devel kdelibs3-devel powersave-devel lsb suse-release @@ -41,17 +41,17 @@ Authors: %prep %setup -n %{name}-%{version} -q -. /etc/opt/kde3/common_options +. /etc/opt/trinity/common_options update_admin %build -. /etc/opt/kde3/common_options +. /etc/opt/trinity/common_options ./configure --enable-yast-entry make %install -. /etc/opt/kde3/common_options +. /etc/opt/trinity/common_options make DESTDIR=$RPM_BUILD_ROOT $INSTALL_TARGET %suse_update_desktop_file %name Utility TrayIcon %find_lang %name @@ -68,15 +68,15 @@ rm -rf $RPM_BUILD_ROOT %files -f %name.lang %defattr(-,root,root) %doc README AUTHORS ChangeLog COPYING INSTALL NEWS -/opt/kde3/share/doc/* -/opt/kde3/bin/* -/opt/kde3/share/config/kpowersaverc -/opt/kde3/share/autostart/kpowersave-autostart.desktop -/opt/kde3/share/apps/kpowersave -/opt/kde3/share/icons/??color -/opt/kde3/share/applications/kde/kpowersave.desktop -/opt/kde3/lib*/kde3/kpowersave.* -/opt/kde3/lib*/libkdeinit_kpowersave.* +/opt/trinity/share/doc/* +/opt/trinity/bin/* +/opt/trinity/share/config/kpowersaverc +/opt/trinity/share/autostart/kpowersave-autostart.desktop +/opt/trinity/share/apps/kpowersave +/opt/trinity/share/icons/??color +/opt/trinity/share/applications/kde/kpowersave.desktop +/opt/trinity/lib*/trinity/kpowersave.* +/opt/trinity/lib*/libkdeinit_kpowersave.* %changelog -n kpowersave diff --git a/packaging/SUSE10.1.kpowersave.spec b/packaging/SUSE10.1.kpowersave.spec index 29014dd..d4746f7 100644 --- a/packaging/SUSE10.1.kpowersave.spec +++ b/packaging/SUSE10.1.kpowersave.spec @@ -40,17 +40,17 @@ Authors: %prep %setup -n %{name}-%{version} -q -. /etc/opt/kde3/common_options +. /etc/opt/trinity/common_options update_admin %build -. /etc/opt/kde3/common_options +. /etc/opt/trinity/common_options ./configure --enable-yast-entry make %install -. /etc/opt/kde3/common_options +. /etc/opt/trinity/common_options make DESTDIR=$RPM_BUILD_ROOT $INSTALL_TARGET %suse_update_desktop_file %name Utility TrayIcon %find_lang %name @@ -67,15 +67,15 @@ rm -rf $RPM_BUILD_ROOT %files -f %name.lang %defattr(-,root,root) %doc README AUTHORS ChangeLog COPYING INSTALL NEWS -/opt/kde3/share/doc/* -/opt/kde3/bin/* -/opt/kde3/share/config/kpowersaverc -/opt/kde3/share/autostart/kpowersave-autostart.desktop -/opt/kde3/share/apps/kpowersave -/opt/kde3/share/icons/??color -/opt/kde3/share/applications/kde/kpowersave.desktop -/opt/kde3/lib*/kde3/kpowersave.* -/opt/kde3/lib*/libkdeinit_kpowersave.* +/opt/trinity/share/doc/* +/opt/trinity/bin/* +/opt/trinity/share/config/kpowersaverc +/opt/trinity/share/autostart/kpowersave-autostart.desktop +/opt/trinity/share/apps/kpowersave +/opt/trinity/share/icons/??color +/opt/trinity/share/applications/kde/kpowersave.desktop +/opt/trinity/lib*/trinity/kpowersave.* +/opt/trinity/lib*/libkdeinit_kpowersave.* %changelog -n kpowersave diff --git a/packaging/SUSE9.2.kpowersave.spec b/packaging/SUSE9.2.kpowersave.spec index d252d12..f57a552 100644 --- a/packaging/SUSE9.2.kpowersave.spec +++ b/packaging/SUSE9.2.kpowersave.spec @@ -9,7 +9,7 @@ # # norootforbuild -# neededforbuild kde3-devel-packages kdelibs3 powersave +# neededforbuild trinity-devel-packages kdelibs3 powersave BuildRequires: aaa_base acl attr bash bind-utils bison bzip2 coreutils cpio cpp cracklib cvs cyrus-sasl db devs diffutils e2fsprogs file filesystem fillup findutils flex gawk gdbm-devel glibc glibc-devel glibc-locale gpm grep groff gzip info insserv less libacl libattr libgcc libnscd libselinux libstdc++ libxcrypt libzio m4 make man mktemp module-init-tools ncurses ncurses-devel net-tools netcfg openldap2-client openssl pam pam-modules patch permissions popt procinfo procps psmisc pwdutils rcs readline sed strace syslogd sysvinit tar tcpd texinfo timezone unzip util-linux vim zlib zlib-devel arts arts-devel autoconf automake binutils expat fam fam-devel fontconfig fontconfig-devel freeglut freeglut-devel freetype2 freetype2-devel gcc gcc-c++ gdbm gettext glib2 glib2-devel gnome-filesystem jack jack-devel kdelibs3 kdelibs3-devel kdelibs3-doc libart_lgpl libart_lgpl-devel libidn libidn-devel libjpeg libjpeg-devel liblcms liblcms-devel libmng libmng-devel libpng libpng-devel libstdc++-devel libtiff libtiff-devel libtool libxml2 libxml2-devel libxslt libxslt-devel openssl-devel pcre pcre-devel perl powersave qt3 qt3-devel rpm update-desktop-files xorg-x11-Mesa xorg-x11-Mesa-devel xorg-x11-devel xorg-x11-libs @@ -41,17 +41,17 @@ Authors: %prep %setup -n %{name}-%{version} -q -. /etc/opt/kde3/common_options +. /etc/opt/trinity/common_options update_admin %build -. /etc/opt/kde3/common_options +. /etc/opt/trinity/common_options ./configure $configkde make %install -. /etc/opt/kde3/common_options +. /etc/opt/trinity/common_options make DESTDIR=$RPM_BUILD_ROOT $INSTALL_TARGET %suse_update_desktop_file %name Utility TrayIcon %find_lang %name @@ -67,12 +67,12 @@ rm -rf $RPM_BUILD_ROOT %files -f %name.lang %defattr(-,root,root) -/opt/kde3/bin/* -/opt/kde3/share/autostart/kpowersave.desktop -/opt/kde3/share/apps/kpowersave -/opt/kde3/share/icons/??color -/opt/kde3/share/applications/kde/kpowersave.desktop -/opt/kde3/lib*/kde3/kpowersave.* -/opt/kde3/lib*/libkdeinit_kpowersave.* +/opt/trinity/bin/* +/opt/trinity/share/autostart/kpowersave.desktop +/opt/trinity/share/apps/kpowersave +/opt/trinity/share/icons/??color +/opt/trinity/share/applications/kde/kpowersave.desktop +/opt/trinity/lib*/trinity/kpowersave.* +/opt/trinity/lib*/libkdeinit_kpowersave.* %changelog -n kpowersave diff --git a/packaging/SUSE9.3.kpowersave.spec b/packaging/SUSE9.3.kpowersave.spec index ee0727b..409a868 100644 --- a/packaging/SUSE9.3.kpowersave.spec +++ b/packaging/SUSE9.3.kpowersave.spec @@ -9,7 +9,7 @@ # # norootforbuild -# neededforbuild kde3-devel-packages kdelibs3 powersave resmgr suse-release +# neededforbuild trinity-devel-packages kdelibs3 powersave resmgr suse-release BuildRequires: aaa_base acl attr bash bind-utils bison bzip2 coreutils cpio cpp cracklib cvs cyrus-sasl db devs diffutils e2fsprogs file filesystem fillup findutils flex gawk gdbm-devel gettext-devel glibc glibc-devel glibc-locale gpm grep groff gzip info insserv klogd less libacl libattr libcom_err libgcc libnscd libselinux libstdc++ libxcrypt libzio m4 make man mktemp module-init-tools ncurses ncurses-devel net-tools netcfg openldap2-client openssl pam pam-modules patch permissions popt procinfo procps psmisc pwdutils rcs readline sed strace sysvinit tar tcpd texinfo timezone unzip util-linux vim zlib zlib-devel arts arts-devel autoconf automake binutils expat fam fam-devel fontconfig fontconfig-devel freeglut freeglut-devel freetype2 freetype2-devel gcc gcc-c++ gdbm gettext glib2 glib2-devel gnome-filesystem jack jack-devel kdelibs3 kdelibs3-devel kdelibs3-doc libart_lgpl libart_lgpl-devel libgcrypt libgcrypt-devel libgpg-error libgpg-error-devel libidn libidn-devel libjpeg libjpeg-devel liblcms liblcms-devel libmng libmng-devel libpng libpng-devel libstdc++-devel libtiff libtiff-devel libtool libxml2 libxml2-devel libxslt libxslt-devel openssl-devel pcre pcre-devel perl powersave python qt3 qt3-devel resmgr rpm suse-release unsermake update-desktop-files xorg-x11-Mesa xorg-x11-Mesa-devel xorg-x11-devel xorg-x11-libs @@ -42,19 +42,19 @@ Authors: %prep %setup -n %{name}-%{version} -q -. /etc/opt/kde3/common_options +. /etc/opt/trinity/common_options update_admin %build -. /etc/opt/kde3/common_options +. /etc/opt/trinity/common_options ./configure make %install -. /etc/opt/kde3/common_options +. /etc/opt/trinity/common_options make DESTDIR=$RPM_BUILD_ROOT $INSTALL_TARGET -rm $RPM_BUILD_ROOT/opt/kde3/share/doc/ -r +rm $RPM_BUILD_ROOT/opt/trinity/share/doc/ -r %suse_update_desktop_file %name Utility TrayIcon %find_lang %name @@ -70,13 +70,13 @@ rm -rf $RPM_BUILD_ROOT %files -f %name.lang %defattr(-,root,root) %doc README AUTHORS ChangeLog COPYING INSTALL -/opt/kde3/bin/* -/opt/kde3/share/config/kpowersaverc -/opt/kde3/share/autostart/kpowersave.desktop -/opt/kde3/share/apps/kpowersave -/opt/kde3/share/icons/??color -/opt/kde3/share/applications/kde/kpowersave.desktop -/opt/kde3/lib*/kde3/kpowersave.* -/opt/kde3/lib*/libkdeinit_kpowersave.* +/opt/trinity/bin/* +/opt/trinity/share/config/kpowersaverc +/opt/trinity/share/autostart/kpowersave.desktop +/opt/trinity/share/apps/kpowersave +/opt/trinity/share/icons/??color +/opt/trinity/share/applications/kde/kpowersave.desktop +/opt/trinity/lib*/trinity/kpowersave.* +/opt/trinity/lib*/libkdeinit_kpowersave.* %changelog -n kpowersave diff --git a/packaging/mandriva.2006.1.kpowersave.spec b/packaging/mandriva.2006.1.kpowersave.spec index 673c20d..692bb3b 100644 --- a/packaging/mandriva.2006.1.kpowersave.spec +++ b/packaging/mandriva.2006.1.kpowersave.spec @@ -67,7 +67,7 @@ rm -rf $RPM_BUILD_ROOT /usr/share/icons/??color /usr/share/applications/kde/kpowersave.desktop /usr/share/doc/HTML/*/kpowersave -/usr/lib*/kde3/kpowersave.* +/usr/lib*/trinity/kpowersave.* /usr/lib*/libkdeinit_kpowersave.* /usr/share/locale/* diff --git a/packaging/mandriva.2007.1.kpowersave.spec b/packaging/mandriva.2007.1.kpowersave.spec index a8930d0..5651704 100644 --- a/packaging/mandriva.2007.1.kpowersave.spec +++ b/packaging/mandriva.2007.1.kpowersave.spec @@ -87,7 +87,7 @@ rm -rf %{buildroot} %{_datadir}/icons/*.png %{_datadir}/applications/kde/kpowersave.desktop %doc %{_docdir}/HTML/*/kpowersave -%{_libdir}/kde3/* +%{_libdir}/trinity/* %{_libdir}/*.so %{_libdir}/*.la %{_miconsdir}/%{name}.png diff --git a/packaging/openSUSE10.2.kpowersave.spec b/packaging/openSUSE10.2.kpowersave.spec index d757695..27d779e 100644 --- a/packaging/openSUSE10.2.kpowersave.spec +++ b/packaging/openSUSE10.2.kpowersave.spec @@ -45,11 +45,11 @@ Authors: %prep %setup -n %{name}-%{version} -q -. /etc/opt/kde3/common_options +. /etc/opt/trinity/common_options update_admin %build -. /etc/opt/kde3/common_options +. /etc/opt/trinity/common_options %if 0%{?sles_version} > 0 ./configure --enable-yast-entry --enable-suse-sles %else @@ -58,7 +58,7 @@ update_admin make %{?jobs:-j %jobs} %install -. /etc/opt/kde3/common_options +. /etc/opt/trinity/common_options make DESTDIR=$RPM_BUILD_ROOT $INSTALL_TARGET %suse_update_desktop_file %name Utility TrayIcon %find_lang %name @@ -75,14 +75,14 @@ rm -rf $RPM_BUILD_ROOT %files -f %name.lang %defattr(-,root,root) %doc README AUTHORS ChangeLog COPYING INSTALL NEWS -/opt/kde3/share/doc/* -/opt/kde3/bin/* -/opt/kde3/share/config/kpowersaverc -/opt/kde3/share/autostart/kpowersave-autostart.desktop -/opt/kde3/share/apps/kpowersave -/opt/kde3/share/icons/??color -/opt/kde3/share/applications/kde/kpowersave.desktop -/opt/kde3/lib*/kde3/kpowersave.* -/opt/kde3/lib*/libkdeinit_kpowersave.* +/opt/trinity/share/doc/* +/opt/trinity/bin/* +/opt/trinity/share/config/kpowersaverc +/opt/trinity/share/autostart/kpowersave-autostart.desktop +/opt/trinity/share/apps/kpowersave +/opt/trinity/share/icons/??color +/opt/trinity/share/applications/kde/kpowersave.desktop +/opt/trinity/lib*/trinity/kpowersave.* +/opt/trinity/lib*/libkdeinit_kpowersave.* %changelog -n kpowersave diff --git a/packaging/openSUSE10.3.kpowersave.spec b/packaging/openSUSE10.3.kpowersave.spec index 3cd3891..c55fd32 100644 --- a/packaging/openSUSE10.3.kpowersave.spec +++ b/packaging/openSUSE10.3.kpowersave.spec @@ -52,11 +52,11 @@ Authors: %endif %prep %setup -n %{name}-%{version} -q -. /etc/opt/kde3/common_options +. /etc/opt/trinity/common_options update_admin %build -. /etc/opt/kde3/common_options +. /etc/opt/trinity/common_options %if 0%{?sles_version} > 0 ./configure --enable-yast-entry --enable-suse-sles %else @@ -65,7 +65,7 @@ update_admin make %{?jobs:-j %jobs} %install -. /etc/opt/kde3/common_options +. /etc/opt/trinity/common_options make DESTDIR=$RPM_BUILD_ROOT $INSTALL_TARGET %suse_update_desktop_file %name Utility TrayIcon %find_lang %name @@ -89,13 +89,13 @@ rm -rf $RPM_BUILD_ROOT %endif %defattr(-,root,root) %doc README AUTHORS ChangeLog COPYING INSTALL NEWS -/opt/kde3/bin/* -/opt/kde3/share/config/kpowersaverc -/opt/kde3/share/autostart/kpowersave-autostart.desktop -/opt/kde3/share/apps/kpowersave -/opt/kde3/share/icons/??color -/opt/kde3/share/applications/kde/kpowersave.desktop -/opt/kde3/lib*/kde3/kpowersave.* -/opt/kde3/lib*/libkdeinit_kpowersave.* +/opt/trinity/bin/* +/opt/trinity/share/config/kpowersaverc +/opt/trinity/share/autostart/kpowersave-autostart.desktop +/opt/trinity/share/apps/kpowersave +/opt/trinity/share/icons/??color +/opt/trinity/share/applications/kde/kpowersave.desktop +/opt/trinity/lib*/trinity/kpowersave.* +/opt/trinity/lib*/libkdeinit_kpowersave.* %changelog