Browse Source

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


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kdirstat@1248408 283d02a7-25f6-0310-bc7c-ecb5cbfe19
tags/v3.5.13
tpearson 7 years ago
parent
commit
6fca52ce0e
3 changed files with 36 additions and 36 deletions
  1. 15
    15
      acinclude.m4
  2. 3
    3
      build-howto.html
  3. 18
    18
      kdirstat.spec

+ 15
- 15
acinclude.m4 View File

@@ -479,14 +479,14 @@ if test "$1" = "default"; then
479 479
     if test "$kde_qtver" = "2"; then
480 480
       kde_moduledir='\${libdir}/kde2'
481 481
     else
482
-      kde_moduledir='\${libdir}/kde3'
482
+      kde_moduledir='\${libdir}/trinity'
483 483
     fi
484 484
   fi
485 485
   if test -z "$kde_styledir"; then
486
-    kde_styledir='\${libdir}/kde3/plugins/styles'
486
+    kde_styledir='\${libdir}/trinity/plugins/styles'
487 487
   fi
488 488
   if test -z "$kde_widgetdir"; then
489
-    kde_widgetdir='\${libdir}/kde3/plugins/designer'
489
+    kde_widgetdir='\${libdir}/trinity/plugins/designer'
490 490
   fi
491 491
   if test -z "$xdg_appsdir"; then
492 492
     xdg_appsdir='\${datadir}/applications/kde'
@@ -546,7 +546,7 @@ Please check whether you installed aRts correctly or use
546 546
 
547 547
 AC_DEFUN([KDE_SET_DEFAULT_BINDIRS],
548 548
 [
549
-    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"
549
+    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"
550 550
     test -n "$KDEDIR" && kde_default_bindirs="$KDEDIR/bin $kde_default_bindirs"
551 551
     if test -n "$KDEDIRS"; then
552 552
        kde_save_IFS=$IFS
@@ -580,23 +580,23 @@ AC_DEFUN([KDE_SUBST_PROGRAMS],
580 580
         fi
581 581
         KDE_FIND_PATH(meinproc, MEINPROC, [$kde_default_bindirs])
582 582
 
583
-        kde32ornewer=1
583
+        trinity2ornewer=1
584 584
         if test -n "$kde_qtver" && test "$kde_qtver" -lt 3; then
585
-            kde32ornewer=
585
+            trinity2ornewer=
586 586
         else
587 587
             if test "$kde_qtver" = "3" && test "$kde_qtsubver" -le 1; then
588
-                kde32ornewer=
588
+                trinity2ornewer=
589 589
             fi
590 590
         fi
591 591
 
592
-        if test -n "$kde32ornewer"; then
592
+        if test -n "$trinity2ornewer"; then
593 593
             KDE_FIND_PATH(kconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kconfig_compiler)])
594 594
             KDE_FIND_PATH(dcopidlng, DCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)])
595 595
         fi
596 596
         KDE_FIND_PATH(xmllint, XMLLINT, [${prefix}/bin ${exec_prefix}/bin], [XMLLINT=""])
597 597
 
598 598
         if test -n "$MEINPROC" && test ! "$MEINPROC" = "compiled"; then  
599
- 	    kde_sharedirs="/usr/share/kde /usr/local/share /usr/share /opt/kde3/share /opt/kde/share $prefix/share"
599
+ 	    kde_sharedirs="/usr/share/kde /usr/local/share /usr/share /opt/trinity/share /opt/kde/share $prefix/share"
600 600
             test -n "$KDEDIR" && kde_sharedirs="$KDEDIR/share $kde_sharedirs"
601 601
             AC_FIND_FILE(apps/ksgmltools2/customization/kde-chunk.xsl, $kde_sharedirs, KDE_XSL_STYLESHEET)
602 602
 	    if test "$KDE_XSL_STYLESHEET" = "NO"; then
@@ -607,7 +607,7 @@ AC_DEFUN([KDE_SUBST_PROGRAMS],
607 607
         fi
608 608
 
609 609
         DCOP_DEPENDENCIES='$(DCOPIDL)'
610
-        if test -n "$kde32ornewer"; then
610
+        if test -n "$trinity2ornewer"; then
611 611
             KCFG_DEPENDENCIES='$(KCONFIG_COMPILER)'
612 612
             DCOP_DEPENDENCIES='$(DCOPIDL) $(DCOPIDLNG)'
613 613
             AC_SUBST(KCONFIG_COMPILER)
@@ -1746,7 +1746,7 @@ fi
1746 1746
 
1747 1747
 if test -z "$1"; then
1748 1748
 
1749
-kde_incdirs="$kde_libs_prefix/include /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"
1749
+kde_incdirs="$kde_libs_prefix/include /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"
1750 1750
 test -n "$KDEDIR" && kde_incdirs="$KDEDIR/include $KDEDIR/include/kde $KDEDIR $kde_incdirs"
1751 1751
 kde_incdirs="$ac_kde_includes $kde_incdirs"
1752 1752
 AC_FIND_FILE($kde_check_header, $kde_incdirs, kde_incdir)
@@ -1758,7 +1758,7 @@ in the prefix, you've chosen, are no KDE headers installed. This will fail.
1758 1758
 So, check this please and use another prefix!])
1759 1759
 fi
1760 1760
 
1761
-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}"
1761
+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}"
1762 1762
 test -n "$KDEDIR" && kde_libdirs="$KDEDIR/lib${kdelibsuff} $KDEDIR $kde_libdirs"
1763 1763
 kde_libdirs="$ac_kde_libraries $libdir $kde_libdirs"
1764 1764
 AC_FIND_FILE($kde_check_lib, $kde_libdirs, kde_libdir)
@@ -1766,7 +1766,7 @@ ac_kde_libraries="$kde_libdir"
1766 1766
 
1767 1767
 kde_widgetdir=NO
1768 1768
 dnl this might be somewhere else
1769
-AC_FIND_FILE("kde3/plugins/designer/kdewidgets.la", $kde_libdirs, kde_widgetdir)
1769
+AC_FIND_FILE("trinity/plugins/designer/kdewidgets.la", $kde_libdirs, kde_widgetdir)
1770 1770
 
1771 1771
 if test -n "$ac_kde_libraries" && test ! -r "$ac_kde_libraries/$kde_check_lib"; then
1772 1772
 AC_MSG_ERROR([
@@ -1774,14 +1774,14 @@ in the prefix, you've chosen, are no KDE libraries installed. This will fail.
1774 1774
 So, check this please and use another prefix!])
1775 1775
 fi
1776 1776
 
1777
-if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/kde3/plugins/designer/kdewidgets.la"; then
1777
+if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/trinity/plugins/designer/kdewidgets.la"; then
1778 1778
 AC_MSG_ERROR([
1779 1779
 I can't find the designer plugins. These are required and should have been installed
1780 1780
 by kdelibs])
1781 1781
 fi
1782 1782
 
1783 1783
 if test -n "$kde_widgetdir"; then
1784
-    kde_widgetdir="$kde_widgetdir/kde3/plugins/designer"
1784
+    kde_widgetdir="$kde_widgetdir/trinity/plugins/designer"
1785 1785
 fi
1786 1786
 
1787 1787
 

+ 3
- 3
build-howto.html View File

@@ -117,14 +117,14 @@ Watch out for error messages and <b>fix them</b> before reporting
117 117
 errors!
118 118
 </p>
119 119
 
120
-<p>On SuSE Linux systems, KDE 3.x is installed to <em>/opt/kde3</em> which is a
120
+<p>On SuSE Linux systems, KDE 3.x is installed to <em>/opt/trinity</em> which is a
121 121
 good idea if you want to keep some KDE 1.x/2.x programs around. So use that
122
-<em>/opt/kde3</em> prefix for KDirStat, too - otherwise it will be installed to
122
+<em>/opt/trinity</em> prefix for KDirStat, too - otherwise it will be installed to
123 123
 <em>/opt/kde</em> and clutter up a working KDE 1.x/2.x environment.
124 124
 <br>
125 125
 <pre>
126 126
 
127
-    ./configure --prefix=/opt/kde3
127
+    ./configure --prefix=/opt/trinity
128 128
 
129 129
 </pre>
130 130
 <p>

+ 18
- 18
kdirstat.spec View File

@@ -9,7 +9,7 @@
9 9
 #
10 10
 
11 11
 # norootforbuild
12
-# neededforbuild  kde3-devel-packages
12
+# neededforbuild  trinity-devel-packages
13 13
 
14 14
 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 klogd 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 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 python qt3 qt3-devel rpm unsermake update-desktop-files xorg-x11-Mesa xorg-x11-Mesa-devel xorg-x11-devel xorg-x11-libs
15 15
 
@@ -36,16 +36,16 @@ Authors:
36 36
 
37 37
 %prep
38 38
 %setup -q
39
-. /etc/opt/kde3/common_options
39
+. /etc/opt/trinity/common_options
40 40
 update_admin --no-unsermake
41 41
 
42 42
 %build
43
-. /etc/opt/kde3/common_options
43
+. /etc/opt/trinity/common_options
44 44
 ./configure $configkde --disable-final
45 45
 make
46 46
 
47 47
 %install
48
-. /etc/opt/kde3/common_options
48
+. /etc/opt/trinity/common_options
49 49
 make DESTDIR=$RPM_BUILD_ROOT $INSTALL_TARGET
50 50
 %suse_update_desktop_file %name Filesystem
51 51
 %find_lang %name
@@ -53,18 +53,18 @@ make DESTDIR=$RPM_BUILD_ROOT $INSTALL_TARGET
53 53
 %files -f %name.lang
54 54
 %defattr(-,root,root)
55 55
 %doc COPYING AUTHORS ChangeLog TODO README
56
-/opt/kde3/bin/kdirstat
57
-/opt/kde3/share/apps/kdirstat
58
-/opt/kde3/share/appl*/*/kdirstat*
59
-/opt/kde3/share/doc/HTML/*/kdirstat/
60
-%dir /opt/kde3/share/icons/hicolor/16x16
61
-%dir /opt/kde3/share/icons/hicolor/16x16/apps
62
-%dir /opt/kde3/share/icons/hicolor/32x32
63
-%dir /opt/kde3/share/icons/hicolor/32x32/apps
64
-%dir /opt/kde3/share/icons/locolor/16x16/apps
65
-%dir /opt/kde3/share/icons/locolor/32x32/apps
66
-/opt/kde3/share/icons/??color/??x??/*/kdirstat*
67
-%dir /opt/kde3/share/apps/kconf_update
68
-/opt/kde3/share/apps/kconf_update/kdirstat.upd
69
-/opt/kde3/share/apps/kconf_update/fix_move_to_trash_bin.pl
56
+/opt/trinity/bin/kdirstat
57
+/opt/trinity/share/apps/kdirstat
58
+/opt/trinity/share/appl*/*/kdirstat*
59
+/opt/trinity/share/doc/HTML/*/kdirstat/
60
+%dir /opt/trinity/share/icons/hicolor/16x16
61
+%dir /opt/trinity/share/icons/hicolor/16x16/apps
62
+%dir /opt/trinity/share/icons/hicolor/32x32
63
+%dir /opt/trinity/share/icons/hicolor/32x32/apps
64
+%dir /opt/trinity/share/icons/locolor/16x16/apps
65
+%dir /opt/trinity/share/icons/locolor/32x32/apps
66
+/opt/trinity/share/icons/??color/??x??/*/kdirstat*
67
+%dir /opt/trinity/share/apps/kconf_update
68
+/opt/trinity/share/apps/kconf_update/kdirstat.upd
69
+/opt/trinity/share/apps/kconf_update/fix_move_to_trash_bin.pl
70 70
 

Loading…
Cancel
Save