Ver código fonte

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

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/koffice@1248408 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
tags/v3.5.13
tpearson 8 anos atrás
pai
commit
b29a88760d
25 arquivos alterados com 265 adições e 265 exclusões
  1. +1
    -1
      Doxyfile.temp
  2. +14
    -14
      README.PACKAGERS
  3. +20
    -20
      acinclude.m4
  4. +140
    -140
      chalk/doc/chalk.xmi
  5. +20
    -20
      configure.in
  6. +17
    -17
      configure.in.in
  7. +1
    -1
      doc/api/Doxyfile.koffice
  8. +2
    -2
      kexi/data/Makefile.am
  9. +1
    -1
      kexi/debian/changelog
  10. +1
    -1
      kexi/debian/debiandirs
  11. +4
    -4
      kexi/debian/kexi-mysql-driver.install
  12. +4
    -4
      kexi/debian/kexi-postgresql-driver.install
  13. +19
    -19
      kexi/debian/kexi.install
  14. +2
    -2
      kexi/debian/overrides/kexi-postgresql-driver
  15. +1
    -1
      kexi/debian/rules
  16. +2
    -2
      kexi/doc/dev/CHANGELOG-Kexi-js
  17. +2
    -2
      kexi/doc/dev/TODO-Kexi-js
  18. +1
    -1
      kexi/doc/kexidb/kexidb.doxygen
  19. +1
    -1
      kexi/formeditor/editlistviewdialog.cpp
  20. +1
    -1
      kexi/kexidb/drivers/common.pro
  21. +2
    -2
      kpresenter/templates/Screenpresentations/Makefile.am
  22. +2
    -2
      kpresenter/templates/Screenpresentations/kde3.desktop
  23. +1
    -1
      kspread/DESIGN.html
  24. +2
    -2
      kspread/Doxyfile
  25. +4
    -4
      mimetypes/Makefile.am

+ 1
- 1
Doxyfile.temp Ver arquivo

@@ -144,7 +144,7 @@ RTF_EXTENSIONS_FILE =
#---------------------------------------------------------------------------
GENERATE_MAN = NO
MAN_OUTPUT = man
MAN_EXTENSION = .kde3
MAN_EXTENSION = .trinity
MAN_LINKS = YES
#---------------------------------------------------------------------------
# configuration options related to the XML output

+ 14
- 14
README.PACKAGERS Ver arquivo

@@ -35,18 +35,18 @@ the corresponding 'native' libraries: libmysqlclient for MySQL; and
and libpqxx for PostgreSQL (libpqxx in turn depends on libpq).

Thus, the MySQL driver package could contain:
lib/kde3/kexidb_mysqldriver.so
lib/kde3/kexidb_mysqldriver.la
lib/kde3/keximigrate_mysql.so
lib/kde3/keximigrate_mysql.la
lib/trinity/kexidb_mysqldriver.so
lib/trinity/kexidb_mysqldriver.la
lib/trinity/keximigrate_mysql.so
lib/trinity/keximigrate_mysql.la
share/services/kexidb_mysqldriver.desktop
share/services/keximigrate_mysql.desktop

The PostgreSQL driver package consists of the following files:
lib/kde3/kexidb_pqxxsqldriver.so
lib/kde3/kexidb_pqxxsqldriver.la
lib/kde3/keximigrate_pqxx.so
lib/kde3/keximigrate_pqxx.la
lib/trinity/kexidb_pqxxsqldriver.so
lib/trinity/kexidb_pqxxsqldriver.la
lib/trinity/keximigrate_pqxx.so
lib/trinity/keximigrate_pqxx.la
share/services/kexidb_pqxxsqldriver.desktop
share/services/keximigrate_pqxx.desktop

@@ -115,16 +115,16 @@ The scripting language plugins can be found in:
koffice/lib/kross/python; and
koffice/lib/kross/ruby.
They install as:
lib/kde3/krosspython.{la,so}; and
lib/kde3/krossruby.{la,so}
lib/trinity/krosspython.{la,so}; and
lib/trinity/krossruby.{la,so}

It is recommended to put each interpreter plugin into a separate
package, and the user decide if they would like support for each
language individually.

For example, the Python scripting package may contain:
lib/kde3/krosspython.so
lib/kde3/krosspython.la
lib/trinity/krosspython.so
lib/trinity/krosspython.la
share/apps/kexi/scripts/exportxhtml/ExportXHTML.py
share/apps/kexi/scripts/exportxhtml/ExportXHTML.rc
share/apps/kexi/scripts/importxhtml/ImportXHTML.py
@@ -135,8 +135,8 @@ For example, the Python scripting package may contain:
share/apps/chalk/scripts/reshapehisto.py

and the Ruby scripting package may contain:
lib/kde3/krossruby.so
lib/kde3/krossruby.la
lib/trinity/krossruby.so
lib/trinity/krossruby.la
share/apps/chalk/scripts/ruby/invert.rb
share/apps/chalk/scripts/ruby/changecs.rb
share/apps/chalk/scripts/ruby/randompaint.rb

+ 20
- 20
acinclude.m4 Ver arquivo

@@ -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)
@@ -1784,7 +1784,7 @@ fi

if test -z "$1"; then

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"
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"
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)
@@ -1796,7 +1796,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)
@@ -1804,7 +1804,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([
@@ -1812,14 +1812,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



+ 140
- 140
chalk/doc/chalk.xmi
Diferenças do arquivo suprimidas por serem muito extensas
Ver arquivo


+ 20
- 20
configure.in Ver arquivo

@@ -249,9 +249,9 @@ AC_COMPILE_IFELSE([
#error KDE 3.2
#endif
],
need_kde32_compat="no"
need_trinity2_compat="no"
,
need_kde32_compat="yes"
need_trinity2_compat="yes"
)

AC_COMPILE_IFELSE([
@@ -260,9 +260,9 @@ AC_COMPILE_IFELSE([
#error KDE 3.3
#endif
],
need_kde33_compat="no"
need_trinity3_compat="no"
,
need_kde33_compat="yes"
need_trinity3_compat="yes"
)

AC_COMPILE_IFELSE([
@@ -271,9 +271,9 @@ AC_COMPILE_IFELSE([
#error KDE 3.4
#endif
],
need_kde34_compat="no"
need_trinity4_compat="no"
,
need_kde34_compat="yes"
need_trinity4_compat="yes"
)

AC_COMPILE_IFELSE([
@@ -282,24 +282,24 @@ AC_COMPILE_IFELSE([
#error KDE 3.5.x (x < 2)
#endif
],
need_kde351_compat="no"
need_trinity51_compat="no"
,
need_kde351_compat="yes"
need_trinity51_compat="yes"
)
CXXFLAGS="$kdeversion_save_CXXFLAGS"
LIBS="$kdeversion_safe_LIBS"
AC_LANG_RESTORE

if test "$need_kde32_compat" = "yes"; then
if test "$need_trinity2_compat" = "yes"; then
AC_MSG_RESULT([KDE 3.2.x])
else
if test "$need_kde33_compat" = "yes"; then
if test "$need_trinity3_compat" = "yes"; then
AC_MSG_RESULT([KDE 3.3.x])
else
if test "$need_kde34_compat" = "yes"; then
if test "$need_trinity4_compat" = "yes"; then
AC_MSG_RESULT([KDE 3.4.x])
else
if test "$need_kde351_compat" = "yes"; then
if test "$need_trinity51_compat" = "yes"; then
AC_MSG_RESULT([KDE 3.5.x (x < 2)])
else
AC_MSG_RESULT([KDE 3.5.x (x >=2) or SVN trunk])
@@ -308,13 +308,13 @@ else
fi
fi

AM_CONDITIONAL(need_kde32_compatibility, test "$need_kde32_compat" = "yes")
AM_CONDITIONAL(need_kde33_compatibility, test "$need_kde33_compat" = "yes")
AM_CONDITIONAL(need_kde34_compatibility, test "$need_kde34_compat" = "yes")
AM_CONDITIONAL(need_kde351_compatibility, test "$need_kde351_compat" = "yes")
AM_CONDITIONAL(need_trinity2_compatibility, test "$need_trinity2_compat" = "yes")
AM_CONDITIONAL(need_trinity3_compatibility, test "$need_trinity3_compat" = "yes")
AM_CONDITIONAL(need_trinity4_compatibility, test "$need_trinity4_compat" = "yes")
AM_CONDITIONAL(need_trinity51_compatibility, test "$need_trinity51_compat" = "yes")

# Keep the old KDE 3.1 test, as long as it is still used
AM_CONDITIONAL(need_kde31_compatibility, test "supported" = "no")
AM_CONDITIONAL(need_trinity1_compatibility, test "supported" = "no")

# --- End KDE 3.2 check ---

@@ -1833,7 +1833,7 @@ AC_CONFIG_FILES([ kexi/3rdparty/kolibs/Makefile ])
AC_CONFIG_FILES([ kexi/3rdparty/uuid/Makefile ])
AC_CONFIG_FILES([ kexi/core/Makefile ])
AC_CONFIG_FILES([ kexi/data/Makefile ])
AC_CONFIG_FILES([ kexi/data/kde34compat/Makefile ])
AC_CONFIG_FILES([ kexi/data/trinity4compat/Makefile ])
AC_CONFIG_FILES([ kexi/examples/Makefile ])
AC_CONFIG_FILES([ kexi/formeditor/Makefile ])
AC_CONFIG_FILES([ kexi/formeditor/factories/Makefile ])
@@ -2171,8 +2171,8 @@ AC_CONFIG_FILES([ lib/kwmf/Makefile ])
AC_CONFIG_FILES([ lib/store/Makefile ])
AC_CONFIG_FILES([ lib/store/tests/Makefile ])
AC_CONFIG_FILES([ mimetypes/Makefile ])
AC_CONFIG_FILES([ mimetypes/kde33/Makefile ])
AC_CONFIG_FILES([ mimetypes/kde351/Makefile ])
AC_CONFIG_FILES([ mimetypes/trinity3/Makefile ])
AC_CONFIG_FILES([ mimetypes/trinity51/Makefile ])
AC_CONFIG_FILES([ pics/Makefile ])
AC_CONFIG_FILES([ pics/crystalsvg/Makefile ])
AC_CONFIG_FILES([ plugins/Makefile ])

+ 17
- 17
configure.in.in Ver arquivo

@@ -182,9 +182,9 @@ AC_COMPILE_IFELSE([
#error KDE 3.2
#endif
],
need_kde32_compat="no"
need_trinity2_compat="no"
,
need_kde32_compat="yes"
need_trinity2_compat="yes"
)

AC_COMPILE_IFELSE([
@@ -193,9 +193,9 @@ AC_COMPILE_IFELSE([
#error KDE 3.3
#endif
],
need_kde33_compat="no"
need_trinity3_compat="no"
,
need_kde33_compat="yes"
need_trinity3_compat="yes"
)

AC_COMPILE_IFELSE([
@@ -204,9 +204,9 @@ AC_COMPILE_IFELSE([
#error KDE 3.4
#endif
],
need_kde34_compat="no"
need_trinity4_compat="no"
,
need_kde34_compat="yes"
need_trinity4_compat="yes"
)

AC_COMPILE_IFELSE([
@@ -215,24 +215,24 @@ AC_COMPILE_IFELSE([
#error KDE 3.5.x (x < 2)
#endif
],
need_kde351_compat="no"
need_trinity51_compat="no"
,
need_kde351_compat="yes"
need_trinity51_compat="yes"
)
CXXFLAGS="$kdeversion_save_CXXFLAGS"
LIBS="$kdeversion_safe_LIBS"
AC_LANG_RESTORE

if test "$need_kde32_compat" = "yes"; then
if test "$need_trinity2_compat" = "yes"; then
AC_MSG_RESULT([KDE 3.2.x])
else
if test "$need_kde33_compat" = "yes"; then
if test "$need_trinity3_compat" = "yes"; then
AC_MSG_RESULT([KDE 3.3.x])
else
if test "$need_kde34_compat" = "yes"; then
if test "$need_trinity4_compat" = "yes"; then
AC_MSG_RESULT([KDE 3.4.x])
else
if test "$need_kde351_compat" = "yes"; then
if test "$need_trinity51_compat" = "yes"; then
AC_MSG_RESULT([KDE 3.5.x (x < 2)])
else
AC_MSG_RESULT([KDE 3.5.x (x >=2) or SVN trunk])
@@ -241,13 +241,13 @@ else
fi
fi

AM_CONDITIONAL(need_kde32_compatibility, test "$need_kde32_compat" = "yes")
AM_CONDITIONAL(need_kde33_compatibility, test "$need_kde33_compat" = "yes")
AM_CONDITIONAL(need_kde34_compatibility, test "$need_kde34_compat" = "yes")
AM_CONDITIONAL(need_kde351_compatibility, test "$need_kde351_compat" = "yes")
AM_CONDITIONAL(need_trinity2_compatibility, test "$need_trinity2_compat" = "yes")
AM_CONDITIONAL(need_trinity3_compatibility, test "$need_trinity3_compat" = "yes")
AM_CONDITIONAL(need_trinity4_compatibility, test "$need_trinity4_compat" = "yes")
AM_CONDITIONAL(need_trinity51_compatibility, test "$need_trinity51_compat" = "yes")

# Keep the old KDE 3.1 test, as long as it is still used
AM_CONDITIONAL(need_kde31_compatibility, test "supported" = "no")
AM_CONDITIONAL(need_trinity1_compatibility, test "supported" = "no")

# --- End KDE 3.2 check ---


+ 1
- 1
doc/api/Doxyfile.koffice Ver arquivo

@@ -119,7 +119,7 @@ RTF_STYLESHEET_FILE =
RTF_EXTENSIONS_FILE =
GENERATE_MAN = NO
MAN_OUTPUT =
MAN_EXTENSION = .kde3
MAN_EXTENSION = .trinity
MAN_LINKS = YES
GENERATE_XML = NO
XML_OUTPUT = xml

+ 2
- 2
kexi/data/Makefile.am Ver arquivo

@@ -45,8 +45,8 @@ x-kexiproject-shortcut.desktop
#TODO: add x-kexi-shortcut-table etc.

#kde <=3.4
if need_kde34_compatibility
KDE34COMPAT = kde34compat
if need_trinity4_compatibility
KDE34COMPAT = trinity4compat
endif

SUBDIRS = $(KDE34COMPAT)

+ 1
- 1
kexi/debian/changelog Ver arquivo

@@ -16,7 +16,7 @@ kexi (0.1cvs20050407-3) unstable; urgency=low
kexi (0.1cvs20050407-2) unstable; urgency=low

* Add the missing files that renders the package unusable
* Add debian/$(package)/usr/lib/kde3 for the dh_shlibdeps calls
* Add debian/$(package)/usr/lib/trinity for the dh_shlibdeps calls

-- Igor Genibel <igenibel@debian.org> Thu, 7 Apr 2005 17:04:40 +0200


+ 1
- 1
kexi/debian/debiandirs Ver arquivo

@@ -5,6 +5,6 @@ export infodir=/usr/share/info
export mandir=/usr/share/man
export qtdir=/usr/share/qt3
export kde_cgidir=/usr/lib/cgi-bin
export kde_confdir=/etc/kde3
export kde_confdir=/etc/trinity
export kde_htmldir=/usr/share/doc/kde/HTML
configkde=--disable-debug --disable-rpath --prefix=$(kde_prefix) --sysconfdir=$(sysconfdir) --includedir=$(kde_includedir) --infodir=$(infodir) --mandir=$(mandir) --with-qt-dir=$(qtdir)

+ 4
- 4
kexi/debian/kexi-mysql-driver.install Ver arquivo

@@ -1,6 +1,6 @@
debian/tmp/usr/lib/kde3/kexidb_mysqldriver.so
debian/tmp/usr/lib/kde3/kexidb_mysqldriver.la
debian/tmp/usr/lib/kde3/keximigrate_mysql.so
debian/tmp/usr/lib/kde3/keximigrate_mysql.la
debian/tmp/usr/lib/trinity/kexidb_mysqldriver.so
debian/tmp/usr/lib/trinity/kexidb_mysqldriver.la
debian/tmp/usr/lib/trinity/keximigrate_mysql.so
debian/tmp/usr/lib/trinity/keximigrate_mysql.la
debian/tmp/usr/share/services/kexidb_mysqldriver.desktop
debian/tmp/usr/share/services/keximigrate_mysql.desktop

+ 4
- 4
kexi/debian/kexi-postgresql-driver.install Ver arquivo

@@ -1,7 +1,7 @@
debian/tmp/usr/lib/kde3/kexidb_pqxxsqldriver.so
debian/tmp/usr/lib/kde3/kexidb_pqxxsqldriver.la
debian/tmp/usr/lib/kde3/keximigrate_pqxx.so
debian/tmp/usr/lib/kde3/keximigrate_pqxx.la
debian/tmp/usr/lib/trinity/kexidb_pqxxsqldriver.so
debian/tmp/usr/lib/trinity/kexidb_pqxxsqldriver.la
debian/tmp/usr/lib/trinity/keximigrate_pqxx.so
debian/tmp/usr/lib/trinity/keximigrate_pqxx.la
debian/tmp/usr/share/services/kexidb_pqxxsqldriver.desktop
debian/tmp/usr/share/services/keximigrate_pqxx.desktop


+ 19
- 19
kexi/debian/kexi.install Ver arquivo

@@ -18,18 +18,18 @@ debian/tmp/usr/lib/libkexirelationsview.la
debian/tmp/usr/lib/libkexisql2.la
debian/tmp/usr/lib/libkexisql3.la
debian/tmp/usr/lib/libkformdesigner.la
debian/tmp/usr/lib/kde3/kexidb_sqlite2driver.la
debian/tmp/usr/lib/kde3/kexidb_sqlite3driver.la
debian/tmp/usr/lib/kde3/containers.la
debian/tmp/usr/lib/kde3/stdwidgets.la
debian/tmp/usr/lib/kde3/libkformdesigner_part.la
debian/tmp/usr/lib/kde3/kexihandler_form.la
debian/tmp/usr/lib/kde3/kexihandler_migration.la
debian/tmp/usr/lib/kde3/kexihandler_query.la
debian/tmp/usr/lib/kde3/kexihandler_relation.la
debian/tmp/usr/lib/kde3/kexihandler_table.la
debian/tmp/usr/lib/kde3/kexidbwidgets.la
debian/tmp/usr/lib/kde3/kexi.la
debian/tmp/usr/lib/trinity/kexidb_sqlite2driver.la
debian/tmp/usr/lib/trinity/kexidb_sqlite3driver.la
debian/tmp/usr/lib/trinity/containers.la
debian/tmp/usr/lib/trinity/stdwidgets.la
debian/tmp/usr/lib/trinity/libkformdesigner_part.la
debian/tmp/usr/lib/trinity/kexihandler_form.la
debian/tmp/usr/lib/trinity/kexihandler_migration.la
debian/tmp/usr/lib/trinity/kexihandler_query.la
debian/tmp/usr/lib/trinity/kexihandler_relation.la
debian/tmp/usr/lib/trinity/kexihandler_table.la
debian/tmp/usr/lib/trinity/kexidbwidgets.la
debian/tmp/usr/lib/trinity/kexi.la
debian/tmp/usr/lib/libkexisql3.so.3.0.0
debian/tmp/usr/lib/libkexisql3.so.3
debian/tmp/usr/lib/libkexisql3.so
@@ -73,13 +73,13 @@ debian/tmp/usr/lib/libkexiformutils.so



debian/tmp/usr/lib/kde3/kexidb_sqlite*
debian/tmp/usr/lib/kde3/containers*
debian/tmp/usr/lib/kde3/stdwidgets*
debian/tmp/usr/lib/kde3/lib*
debian/tmp/usr/lib/kde3/kexihandler*
debian/tmp/usr/lib/kde3/kexidbwidgets*
debian/tmp/usr/lib/kde3/kexi.*
debian/tmp/usr/lib/trinity/kexidb_sqlite*
debian/tmp/usr/lib/trinity/containers*
debian/tmp/usr/lib/trinity/stdwidgets*
debian/tmp/usr/lib/trinity/lib*
debian/tmp/usr/lib/trinity/kexihandler*
debian/tmp/usr/lib/trinity/kexidbwidgets*
debian/tmp/usr/lib/trinity/kexi.*
debian/tmp/usr/share/applications/
debian/tmp/usr/share/icons/
debian/tmp/usr/share/mimelnk/

+ 2
- 2
kexi/debian/overrides/kexi-postgresql-driver Ver arquivo

@@ -1,2 +1,2 @@
kexi-postgresql-driver: binary-or-shlib-defines-rpath ./usr/lib/kde3/keximigrate_pqxx.so /usr/lib
kexi-postgresql-driver: binary-or-shlib-defines-rpath ./usr/lib/kde3/kexidb_pqxxsqldriver.so /usr/lib
kexi-postgresql-driver: binary-or-shlib-defines-rpath ./usr/lib/trinity/keximigrate_pqxx.so /usr/lib
kexi-postgresql-driver: binary-or-shlib-defines-rpath ./usr/lib/trinity/kexidb_pqxxsqldriver.so /usr/lib

+ 1
- 1
kexi/debian/rules Ver arquivo

@@ -11,7 +11,7 @@ DEB_DH_MAKESHLIBS_ARGS_ALL := -n
PACKAGES_WITH_LIBS := kexi kexi-postgresql-driver kexi-mysql-driver \
libkexi-dev

DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib:debian/$(p)/usr/lib/kde3)
DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib:debian/$(p)/usr/lib/trinity)

# We need this commented out until sqlite 3.0 is available in Debian
# DEB_EXTRA_CONNFIGURE_FLAGS := --without-included-sqlite

+ 2
- 2
kexi/doc/dev/CHANGELOG-Kexi-js Ver arquivo

@@ -3954,7 +3954,7 @@ KexiDB:

2004-05-08
Form Designer: Extra widgets
- fixes for kde3.1 compatibility
- fixes for trinity.1 compatibility
- implicit deleting is cleaner than explicit

2004-05-06
@@ -4745,7 +4745,7 @@ KexiActionProxy:
- Tables in relation view: sizes fixed

2004-01-07
- Build fixes for gcc2.95 on kde3.1
- Build fixes for gcc2.95 on trinity.1
- Relations View: connection and viewtable focusing fixed and some actions added

2004-01-06

+ 2
- 2
kexi/doc/dev/TODO-Kexi-js Ver arquivo

@@ -712,11 +712,11 @@ TODO:::::::
dipesh just change a value, go to design mode and switch back to dataview...
dipesh [KCrash handler]
dipesh #3 0xb59b156f in KexiFormScrollView::createEditor ()
dipesh from /usr/lib/kde3/kexihandler_form.so
dipesh from /usr/lib/trinity/kexihandler_form.so
dipesh #4 0xb7e5f502 in KexiDataAwareObjectInterface::startEditCurrentCell ()
dipesh from /usr/lib/libkexidatatable.so.0
dipesh #5 0xb59b276a in KexiFormScrollView::valueChanged ()
dipesh from /usr/lib/kde3/kexihandler_form.so
dipesh from /usr/lib/trinity/kexihandler_form.so
dipesh I look where the crasher is coming from.
dipesh oh, in KexiFormScrollView::createEditor
dipesh column( col ) returns NULL

+ 1
- 1
kexi/doc/kexidb/kexidb.doxygen Ver arquivo

@@ -148,7 +148,7 @@ RTF_EXTENSIONS_FILE =
#---------------------------------------------------------------------------
GENERATE_MAN = NO
MAN_OUTPUT = man
MAN_EXTENSION = .kde3
MAN_EXTENSION = .trinity
MAN_LINKS = YES
#---------------------------------------------------------------------------
# configuration options related to the XML output

+ 1
- 1
kexi/formeditor/editlistviewdialog.cpp Ver arquivo

@@ -39,7 +39,7 @@ namespace KFormDesigner {
/////////////////////////////////////////////////////////////////////////////////

EditListViewDialog::EditListViewDialog(TQWidget *parent)
//js(kde3.2 dependent) : KDialogBase(Tabbed, 0/* WFlags */, parent, "editlistview_dialog", true, i18n("Edit listview contents"), Ok|Cancel, Ok, false)
//js(trinity.2 dependent) : KDialogBase(Tabbed, 0/* WFlags */, parent, "editlistview_dialog", true, i18n("Edit listview contents"), Ok|Cancel, Ok, false)
: KDialogBase(Tabbed, i18n("Edit Listview Contents"), Ok|Cancel, Ok, parent, "editlistview_dialog", true /* modal */, false)
{
m_column = addPage(i18n("Columns"));

+ 1
- 1
kexi/kexidb/drivers/common.pro Ver arquivo

@@ -1,4 +1,4 @@
CONFIG += kde3lib
CONFIG += trinitylib

TEMPLATE = lib
include( $(KEXI)/kexidb/common.pro )

+ 2
- 2
kpresenter/templates/Screenpresentations/Makefile.am Ver arquivo

@@ -1,13 +1,13 @@

template_DATA = .directory GradientBlueRed.desktop \
kde.desktop kde2.desktop kde3.desktop classroom.desktop savannah.desktop \
kde.desktop kde2.desktop trinity.desktop classroom.desktop savannah.desktop \
SnowyMountains.desktop TotallyNewProduct.desktop \
BlueBreezeDouble.desktop BlueBreezePicture.desktop BlueBreezeSingle.desktop CopperPlain.desktop

templatedir = $(kde_datadir)/kpresenter/templates/Screenpresentations

templatesrc_DATA = GradientBlueRed.kpt \
kde.kpt kde2.kpt kde3.kpt classroom.kpt savannah.kpt \
kde.kpt kde2.kpt trinity.kpt classroom.kpt savannah.kpt \
SnowyMountains.kpt TotallyNewProduct.kpt \
BlueBreezeDouble.kpt BlueBreezePicture.kpt BlueBreezeSingle.kpt \
CopperPlain.kpt

+ 2
- 2
kpresenter/templates/Screenpresentations/kde3.desktop Ver arquivo

@@ -1,6 +1,6 @@
[Desktop Entry]
Type=Link
URL=.source/kde3.kpt
URL=.source/trinity.kpt
Name=KDE 3
Name[ne]=KDE ३
Comment=A presentation with KDE 3 theming
@@ -42,4 +42,4 @@ Comment[uz]=KDE 3 mavzulik namoyish
Comment[uz@cyrillic]=KDE 3 мавзулик намойиш
Comment[zh_CN]=带有 KDE 3 主题的演示文稿
Comment[zh_TW]=KDE 3 佈景主題展示
Icon=template_kde3
Icon=template_trinity

+ 1
- 1
kspread/DESIGN.html Ver arquivo

@@ -730,7 +730,7 @@ because of the term <i>Tabelle</i> (German, literally means table). The correct
term is <i>sheet</i> or <i>worksheet</i>. The English version of Microsoft
uses <i>sheet</i> while the German version uses <i>Tabelle</i>.</p>

<p>Use <a href="http://developer.kde.org/documentation/library/kdeqt/kde3arch/devel-binarycompatibility.htm">d-pointer</a> trick (also known pimpl) whenever possible. Such practice will help when later on
<p>Use <a href="http://developer.kde.org/documentation/library/kdeqt/trinityarch/devel-binarycompatibility.htm">d-pointer</a> trick (also known pimpl) whenever possible. Such practice will help when later on
we want to expose the API and need to maintain binary compatibility. But the
most important thing is to separate the interface and the implementation.
Furthermore, build time is reduced since modification on the implementation

+ 2
- 2
kspread/Doxyfile Ver arquivo

@@ -791,7 +791,7 @@ MAN_OUTPUT =
# The MAN_EXTENSION tag determines the extension that is added to
# the generated man pages (default is the subroutine's section .3)

MAN_EXTENSION = .kde3
MAN_EXTENSION = .trinity

# If the MAN_LINKS tag is set to YES and Doxygen generates man output,
# then it will generate one additional man file for each entity
@@ -1147,7 +1147,7 @@ GENERATE_HTML =
GENERATE_MAN =
GENERATE_LATEX =
TAGFILES = \
/usr/local/kde3/share/doc/HTML/en/kdelibs-apidocs/qt/qt.tag=/usr/local/qt-copy/doc/html
/usr/local/trinity/share/doc/HTML/en/kdelibs-apidocs/qt/qt.tag=/usr/local/qt-copy/doc/html
GENERATE_TAGFILE = ../apidocs/kspread/kspread.tag
IGNORE_PREFIX = K
HAVE_DOT = YES

+ 4
- 4
mimetypes/Makefile.am Ver arquivo

@@ -1,9 +1,9 @@
if need_kde33_compatibility
KDE33MIMEDIR = kde33
if need_trinity3_compatibility
KDE33MIMEDIR = trinity3
endif

if need_kde351_compatibility
KDE351MIMEDIR = kde351
if need_trinity51_compatibility
KDE351MIMEDIR = trinity51
endif

SUBDIRS = $(KDE33MIMEDIR) $(KDE351MIMEDIR)

Carregando…
Cancelar
Salvar