SOURCES: kdeaddons-branch.diff - fortran support
arekm
arekm at pld-linux.org
Tue Aug 2 08:13:26 CEST 2005
Author: arekm Date: Tue Aug 2 06:13:26 2005 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- fortran support
---- Files affected:
SOURCES:
kdeaddons-branch.diff (1.3 -> 1.4)
---- Diffs:
================================================================
Index: SOURCES/kdeaddons-branch.diff
diff -u SOURCES/kdeaddons-branch.diff:1.3 SOURCES/kdeaddons-branch.diff:1.4
--- SOURCES/kdeaddons-branch.diff:1.3 Sat Apr 16 14:19:45 2005
+++ SOURCES/kdeaddons-branch.diff Tue Aug 2 08:13:21 2005
@@ -1,4858 +1,342 @@
-diff -urN -x CVS kdeaddons.orig/admin/acinclude.m4.in kdeaddons/admin/acinclude.m4.in
---- kdeaddons.orig/admin/acinclude.m4.in 2005-02-09 23:21:09.000000000 +0100
-+++ kdeaddons/admin/acinclude.m4.in 2005-03-24 20:18:09.000000000 +0100
-@@ -1644,7 +1644,15 @@
-
- AC_MSG_RESULT([$kde_cv_uic_plugins])
- if test "$kde_cv_uic_plugins" != yes; then
-- AC_MSG_ERROR([you need to install kdelibs first.])
-+ AC_MSG_ERROR([
-+you need to install kdelibs first.
-+
-+If you did install kdelibs, then the Qt version that is picked up by
-+this configure is not the same version you used to compile kdelibs.
-+The Qt Plugin installed by kdelibs is *ONLY* loadable if its the
-+same Qt version, compiled with the same compiler and the same Qt
-+configuration settings.
-+])
- fi
- fi
- ])
-@@ -3104,8 +3112,8 @@
- fi
- rm -f conftest.h conftest.h.gch
- fi
-- AM_CONDITIONAL(unsermake_enable_pch, test "$kde_use_pch" = "yes" && test "$kde_gcc_supports_pch" = "yes")
- fi
-+ AM_CONDITIONAL(unsermake_enable_pch, test "$kde_use_pch" = "yes" && test "$kde_gcc_supports_pch" = "yes")
- if test "$CXX" = "KCC"; then
- dnl unfortunately we currently cannot disable exception support in KCC
- dnl because doing so is binary incompatible and Qt by default links with exceptions :-(
-@@ -3194,6 +3202,51 @@
- ifdef([AM_DEPENDENCIES], AC_REQUIRE([KDE_ADD_DEPENDENCIES]), [])
- ])
-
-+AC_DEFUN([KDE_CHECK_VISIBILITY_GCC_BUG],
-+ [
-+ AC_CACHE_CHECK([for gcc -fvisibility-inlines-hidden bug], kde_cv_val_gcc_visibility_bug,
-+ [
-+ AC_LANG_SAVE
-+ AC_LANG_CPLUSPLUS
-+
-+ safe_CXXFLAGS=$CXXFLAGS
-+ safe_LDFLAGS=$LDFLAGS
-+ CXXFLAGS="$CXXFLAGS -fPIC -fvisibility-inlines-hidden -O0"
-+ LDFLAGS="$LDFLAGS -shared -fPIC"
-+
-+ AC_TRY_LINK(
-+ [
-+ /* http://gcc.gnu.org/bugzilla/show_bug.cgi?id=19664 */
-+ template<typename CharT>
-+ struct VisTest
-+ {
-+ inline VisTest ();
-+ };
-+ template<typename CharT>
-+ inline VisTest<CharT>::VisTest()
-+ {}
-+ extern template class VisTest<char>; // It works if we drop that line
-+ int some_function( int do_something ) __attribute__ ((visibility("default")));
-+ int some_function( int )
-+ {
-+ VisTest<char> a;
-+ return 0;
-+ }
-+ ], [/* elvis is alive */],
-+ kde_cv_val_gcc_visibility_bug=no, kde_cv_val_gcc_visibility_bug=yes)
-+
-+ CXXFLAGS=$safe_CXXFLAGS
-+ LDFLAGS=$safe_LDFLAGS
-+ AC_LANG_RESTORE
-+ ]
-+ )
-+
-+ if test x$kde_cv_val_gcc_visibility_bug = xno; then
-+ CXXFLAGS="$CXXFLAGS -fvisibility-inlines-hidden"
-+ fi
-+ ]
-+)
-+
- AC_DEFUN([KDE_CHECK_AND_ADD_HIDDEN_VISIBILITY],
- [
- if test "$GXX" = "yes"; then
-@@ -3202,7 +3255,9 @@
- KDE_CHECK_COMPILER_FLAG(fno-common, [CXXFLAGS="$CXXFLAGS -fno-common"])
- KDE_CHECK_COMPILER_FLAG(fvisibility=hidden,
- [
-- CXXFLAGS="$CXXFLAGS -fvisibility=hidden -fvisibility-inlines-hidden"
-+ CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
-+ KDE_CHECK_VISIBILITY_GCC_BUG
-+
- HAVE_GCC_VISIBILITY=1
- AC_DEFINE_UNQUOTED(__KDE_HAVE_GCC_VISIBILITY, "$HAVE_GCC_VISIBILITY", [define to 1 if -fvisibility is supported])
- ])
-diff -urN -x CVS kdeaddons.orig/admin/am_edit kdeaddons/admin/am_edit
---- kdeaddons.orig/admin/am_edit 2004-12-17 21:18:28.000000000 +0100
-+++ kdeaddons/admin/am_edit 2005-03-29 11:15:16.000000000 +0200
-@@ -483,6 +483,7 @@
- $MakefileData =~ s/$lookup/$replacement/;
- $lookup =~ s/\\\$\\\(CXXFLAGS\\\)/\\\$\\\(KCXXFLAGS\\\)/;
- $replacement = "$stuff_before\$(KCXXFLAGS) \$(KDE_CXXFLAGS)$stuff_after";
-+ next if ($stuff_before =~ /\$\(KDE_CXXFLAGS\)/ or $stuff_after =~ /\$\(KDE_CXXFLAGS\)/);
- substituteLine($lookup, $replacement);
- } else {
- $found = 0;
-@@ -634,7 +635,7 @@
- if ($pre eq '' && exists($varcontent{$variable})) {
- my @addlist = split(/[\034\s]+/, $varcontent{$variable});
- push(@objlist, @addlist);
-- } elsif ($variable !~ 'OBJEXT') {
-+ } elsif ($variable !~ 'OBJEXT' && $variable !~ /am__objects_\d+/ ) {
- $ocv = 1;
- }
- }
-@@ -2276,7 +2277,7 @@
- "\t echo \"\$\$i\"; \\\n" .
- "\t if ! ";
- $t .= $cxxsuffix eq "KKK" ?
-- "\$(CXX) \$(DEFS) -I. -I\$(srcdir) -I\$(top_builddir) \$(INCLUDES) \$(AM_CPPFLAGS) \$(CPPFLAGS) \$(KDE_CXXFLAGS) " :
-+ "\$(CXX) \$(DEFS) -I. -I\$(srcdir) -I\$(top_builddir) \$(INCLUDES) \$(AM_CPPFLAGS) \$(CPPFLAGS) \$(CXXFLAGS) \$(KDE_CXXFLAGS) " :
- "\$(CXXCOMPILE) ";
- $t .= " --dump-class-hierarchy -c \$\$i.bchecktest.cc; then \\\n" .
- "\t rm -f \$\$i.bchecktest.cc; exit 1; \\\n" .
-@@ -2352,7 +2353,7 @@
- $MakefileData =~ s/\034/\\\n/g; # Restore continuation lines
- # Append our $progId line, _below_ the "generated by automake" line
- # because automake-1.6 relies on the first line to be his own.
-- my $progIdLine = "\# $progId - " . '$Revision$ '."\n";
-+ my $progIdLine = "\# $progId - " . '$Revision$ '."\n";
- if ( !( $MakefileData =~ s/^(.*generated .*by automake.*\n)/$1$progIdLine/ ) ) {
- warn "automake line not found in $makefile\n";
- # Fallback: first line
-diff -urN -x CVS kdeaddons.orig/atlantikdesigner/atlantikdesigner.desktop kdeaddons/atlantikdesigner/atlantikdesigner.desktop
---- kdeaddons.orig/atlantikdesigner/atlantikdesigner.desktop 2005-02-21 19:18:58.000000000 +0100
-+++ kdeaddons/atlantikdesigner/atlantikdesigner.desktop 2005-04-13 04:17:15.000000000 +0200
-@@ -33,7 +33,7 @@
- Name[ru]=КОнŃŃ‚Ń€ŃƒĐşŃ‚ĐžŃ€ Atlantik
- Name[sl]=Snovalnik za Atlantik
- Name[sr]=Atlantik-Ов Đ´Đ¸ĐˇĐ°Ń˜Đ˝ĐľŃ€
--Name[sr at Latn]=Atlantik dizajner
-+Name[sr at Latn]=Atlantik-ov dizajner
- Name[sv]=Atlantik designer
- Name[ta]=ŕŽ
ŕŽŸŕŻŕŽ˛ŕŽžŕŽŁŕŻŕŽŸŕŽżŕŽ•ŕŻ ŕŽľŕŽŸŕŽżŕŽľŕŽŽŕŻˆŕŽŞŕŻŕŽŞŕŽžŕŽŠŕŻ
- Name[tg]=КОркарди Atlantik
-@@ -41,7 +41,6 @@
- Name[tr]=Atlantik TasarÄąmcÄąsÄą
- Name[uk]=РодактОр Atlantik
- Name[xh]=Umzobi we Atlantik
--Name[xx]=xxAtlantik Designerxx
- Name[zh_CN]=Atlantik 莞莥器
- Name[zh_TW]=Atlantik č¨č¨ˆč€
- Comment=Game board designer for Atlantik
-@@ -84,7 +83,7 @@
- Comment[sk]=NĂĄvrhĂĄr pre hru Atlantik
- Comment[sl]=Snovalnik igralnih miz za Atlantik
- Comment[sr]=Đ”Đ¸ĐˇĐ°Ń˜Đ˝ĐľŃ€ тайНи Са Đ¸ĐłŃ€Ńƒ Atlantik
--Comment[sr at Latn]=Dizajner tabli za igru za Atlantik
-+Comment[sr at Latn]=Dizajner tabli za igru Atlantik
- Comment[sv]=Atlantik spelplanskonstruktion
- Comment[ta]=ŕŽ
ŕŽŸŕŻŕŽ˛ŕŽžŕŽŁŕŻŕŽŸŕŽżŕŽ•ŕŻŕŽ•ŕŽżŕŽąŕŻŕŽ•ŕŽžŕŽŠ ŕŽŽŕŻ‡ŕŽœŕŻˆ ŕŽľŕŽżŕŽłŕŻˆŕŽŻŕŽžŕŽŸŕŻŕŽŸŕŻ ŕŽľŕŽŸŕŽżŕŽľŕŽŽŕŻˆŕŽŞŕŻŕŽŞŕŽžŕŽłŕŽ°ŕŻ
- Comment[tg]=КОркарди диСаКн йарОи йОСии Atlantik
-@@ -92,27 +91,31 @@
- Comment[tr]=Atlantik için oyun tahtasĹ dßzenleyici
- Comment[uk]=РодактОр гри Atlantik
- Comment[xh]=Umzobi womdlalo webhodi we Atlantik
--Comment[xx]=xxGame board designer for Atlantikxx
- Comment[zh_CN]=Atlantik 的游ćˆç›˜čŽžčŽĄĺ™¨
- Comment[zh_TW]=Atlantik éŠćˆ˛ćżč¨č¨ˆĺ¸Ť
- Categories=Qt;KDE;Game;BoardGame;
- Encoding=UTF-8
- GenericName=MonopolyÂŽ-like Board Designer
- GenericName[bg]=ДиСаКнор на Atlantik
-+GenericName[ca]=Dissenyador de taulells de tipus MonopolyÂŽ
-+GenericName[cs]=NĂĄvrhĂĄÄ desky podobnĂ˝ MonopolĹŻmÂŽ
- GenericName[da]=MatadorÂŽ-lignende brĂŚtdesigner
- GenericName[de]=MonopolyŽ-ähnlicher Spielbrett-Editor
- GenericName[es]=DiseĂąador de tableros similar al MonopolyÂŽ
- GenericName[et]=MonopolyŽ laadsete mängulaudade disainer
-+GenericName[eu]=MonopolyÂŽ-bezalako diseinatzailea
- GenericName[fr]=Concepteur de plateaux dans le style du MonopolyÂŽ
- GenericName[hu]=MonopolyŽ-szerŹ tåblatervező
- GenericName[is]=Matador (Monopoly) borĂ°hĂśnnuĂ°ur
- GenericName[it]=Gioco da tavolo simile a MonopolyÂŽ
-+GenericName[nb]=MonopolÂŽ-aktig spillebrettmaker
- GenericName[nl]=MonopolyÂŽ-achtige bordontwerper
- GenericName[pl]=Edytor planszy do gry typu MonopolyÂŽ
- GenericName[pt]=Desenhador de Tabuleiros tipo MonopolyÂŽ
- GenericName[pt_BR]=Construtor de Tabuleiros para o Atlantik
- GenericName[ru]=КОнŃŃ‚Ń€ŃƒĐşŃ‚ĐžŃ€ пОНоК типа Monopoly
-+GenericName[sl]=Snovalnik ploĹĄÄ, podobnim za MonopolyÂŽ
- GenericName[sr]=Đ”Đ¸ĐˇĐ°Ń˜Đ˝ĐľŃ€ тайНи наНик на MonopolyÂŽ
--GenericName[sr at Latn]=Đ”Đ¸ĐˇĐ°Ń˜Đ˝ĐľŃ€ тайНи наНик на MonopolyÂŽ
-+GenericName[sr at Latn]=Dizajner tabli nalik na MonopolyÂŽ
- GenericName[sv]=Konstruktion av MonopolÂŽ-liknande spelplaner
- GenericName[uk]=MonopolyÂŽ-пОдійниК диСаКнор Đ´ĐžŃˆĐşĐ¸
-diff -urN -x CVS kdeaddons.orig/debian/atlantikdesigner.1 kdeaddons/debian/atlantikdesigner.1
---- kdeaddons.orig/debian/atlantikdesigner.1 2004-02-05 10:49:36.000000000 +0100
-+++ kdeaddons/debian/atlantikdesigner.1 2005-03-07 08:22:48.000000000 +0100
-@@ -2,7 +2,7 @@
- .\" First parameter, NAME, should be all caps
- .\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
- .\" other parameters are allowed: see man(7), man(1)
--.TH ATLANTIKDESIGNER 1 "February 17, 2003"
-+.TH ATLANTIKDESIGNER 1 "October 14, 2004"
- .\" Please adjust this date whenever revising the manpage.
- .\"
- .\" Some roff macros, for reference:
-@@ -24,9 +24,10 @@
- \fBAtlantik Designer\fP is a game board designer for Atlantik.
- .PP
- Atlantik is a KDE client for playing Monopoly-like board games on the
--monopd network. The purpose of Atlantik is to acquire land in
--major cities in North America and Europe while being a transatlantic
--traveller.
-+monopd network. It can play any board supported by the network
-+server, including the classic Monopoly game as well as the Atlantik
-+game in which the properties include several major cities in North
-+America and Europe.
- .PP
- This application is part of the official KDE add-ons module.
- .SH OPTIONS
-diff -urN -x CVS kdeaddons.orig/debian/atlantikdesigner.menu kdeaddons/debian/atlantikdesigner.menu
---- kdeaddons.orig/debian/atlantikdesigner.menu 2004-03-08 00:59:23.000000000 +0100
-+++ kdeaddons/debian/atlantikdesigner.menu 2005-03-11 23:26:26.000000000 +0100
-@@ -1,7 +1,7 @@
- ?package(atlantikdesigner):needs="X11"\
- section="Games/Board"\
- hints="KDE,Monopoly"\
-- kderemove="1"\
- title="Atlantik Designer"\
-+ longtitle="Atlantik Designer (Monopoly(R)-like Board Designer)"\
- command="/usr/bin/atlantikdesigner"\
- icon="/usr/share/pixmaps/atlantikdesigner.xpm"
-diff -urN -x CVS kdeaddons.orig/debian/atlantikdesigner.override kdeaddons/debian/atlantikdesigner.override
---- kdeaddons.orig/debian/atlantikdesigner.override 2003-02-17 00:41:20.000000000 +0100
-+++ kdeaddons/debian/atlantikdesigner.override 1970-01-01 01:00:00.000000000 +0100
-@@ -1,2 +0,0 @@
--# This tag is required for apps already in the KDE menu.
--atlantikdesigner: menu-item-contains-unknown-tag kderemove /usr/lib/menu/atlantikdesigner:7
-diff -urN -x CVS kdeaddons.orig/debian/changelog kdeaddons/debian/changelog
---- kdeaddons.orig/debian/changelog 2004-08-01 10:43:20.000000000 +0200
-+++ kdeaddons/debian/changelog 2005-03-26 00:04:14.000000000 +0100
-@@ -1,8 +1,49 @@
--kdeaddons (4:3.2.92-1) experimental; urgency=low
-+kdeaddons (4:3.4.0-0pre1) unstable; urgency=low
-
-- * New upstream release.
-+ * New major upstream release.
-+ * Removed obsolete kderemove tags from menu items.
-+ * Re-enable the rellinks konqueror plugin, which is in rather better
-+ shape than it was for KDE 3.3.x.
-+
-+ -- Ben Burton <bab at debian.org> Tue, 8 Mar 2005 07:43:35 +1100
-+
-+kdeaddons (4:3.3.2-2) unstable; urgency=low
-+
-+ * Include the full text of the GFDL in debian/copyright, since all of the
-+ docbook documentation is under this license.
-+
-+ -- Ben Burton <bab at debian.org> Sat, 26 Mar 2005 09:55:33 +1100
-+
-+kdeaddons (4:3.3.2-1) unstable; urgency=low
-+
-+ * New upstream bugfix release.
-+
-+ -- Ben Burton <bab at debian.org> Sat, 22 Jan 2005 06:53:59 +1100
-+
-+kdeaddons (4:3.3.1-1) unstable; urgency=medium
-+
-+ * New upstream bugfix release.
-+ * Patched .lnk kfile plugin and /usr/bin/lnkforward so that they can
-+ distinguish between drive and path information. Previously, lnkforward
-+ would lose path information altogether (and thus fail to work).
-+ * Removed the rellinks plugin, which is terribly broken at this stage
-+ (see Debian bug #276633 and KDE bugs #84966 and #86113).
-+ * Force a rerun of admin/Makefile.common when building (not just after a
-+ clean), since the debian patches affect Makefile.ams.
-+ * Build-conflict with autoconf2.13, since admin/Makefile.common does not
-+ operate correctly in its presence.
-+
-+ -- Ben Burton <bab at debian.org> Sat, 23 Oct 2004 15:17:56 +1000
-+
-+kdeaddons (4:3.3.0-1) unstable; urgency=low
-+
-+ * New upstream release (closes: #270161).
-+ * Package kontact-plugins no longer exists (closes: #268892, #238971).
-+ * Now includes a konqueror search bar (closes: #103073, #269106).
-+ * Changed kate-plugins to depend on tidy instead of just suggest it.
-+ * Happy anniversarymits!
-
-- -- Ben Burton <bab at debian.org> Sun, 1 Aug 2004 18:41:10 +1000
-+ -- Ben Burton <bab at debian.org> Thu, 14 Oct 2004 00:10:01 +1000
-
- kdeaddons (4:3.2.3-2) unstable; urgency=low
-
-diff -urN -x CVS kdeaddons.orig/debian/control kdeaddons/debian/control
---- kdeaddons.orig/debian/control 2004-08-01 10:51:09.000000000 +0200
-+++ kdeaddons/debian/control 2005-03-14 00:43:34.000000000 +0100
-@@ -2,13 +2,14 @@
- Section: kde
- Priority: optional
- Maintainer: Ben Burton <bab at debian.org>
--Build-Depends: atlantik-dev (>> 4:3.2.92), automake1.7, debhelper (>> 4.0.0), gawk, gettext, kdebase-dev (>> 4:3.2.92), kdelibs4-dev (>> 4:3.2.92), kdemultimedia-dev (>> 4:3.2.92), libdb4.0++-dev, libkdegames-dev (>> 4:3.2.92), libkonq4-dev (>> 4:3.2.92), kdepim-dev (>> 4:3.2.92), libsdl1.2-dev (>= 1.2.2-3.3), libxine-dev, xlibs-pic, xmms-dev
-+Build-Depends: atlantik-dev (>= 4:3.4.0), automake1.7, debhelper (>> 4.0.0), gawk, gettext, kdebase-dev (>> 4:3.4.0), kdelibs4-dev (>= 4:3.4.0), kdemultimedia-dev (>= 4:3.4.0), libdb4.2++-dev, libkdegames-dev (>= 4:3.4.0), libkonq4-dev (>= 4:3.4.0), kdepim-dev (>> 4:3.4.0), libsdl1.2-dev (>= 1.2.2-3.3), libssl-dev (>= 0.9.6), libxine-dev, xlibs-pic, xmms-dev
-+Build-Conflicts: autoconf2.13
- Standards-Version: 3.6.1
-
- Package: kdeaddons
- Architecture: all
- Section: kde
--Depends: atlantikdesigner (>= ${Source-Version}), kaddressbook-plugins (>= ${Source-Version}), kate-plugins (>= ${Source-Version}), kdeaddons-kfile-plugins (>= ${Source-Version}), kicker-applets (>= ${Source-Version}), knewsticker-scripts (>= ${Source-Version}), konq-plugins (>= ${Source-Version}), kontact-plugins (>= ${Source-Version}), ksig (>= ${Source-Version}), noatun-plugins (>= ${Source-Version}), vimpart (>= ${Source-Version})
-+Depends: atlantikdesigner (>= ${Source-Version}), kaddressbook-plugins (>= ${Source-Version}), kate-plugins (>= ${Source-Version}), kdeaddons-kfile-plugins (>= ${Source-Version}), kicker-applets (>= ${Source-Version}), knewsticker-scripts (>= ${Source-Version}), konq-plugins (>= ${Source-Version}), ksig (>= ${Source-Version}), noatun-plugins (>= ${Source-Version}), vimpart (>= ${Source-Version})
- Suggests: kdeaddons-doc-html
- Description: add-on plugins and applets provided with KDE
- This is a collection of add-on plugins and applets provided with the official
-@@ -41,8 +42,10 @@
- Atlantik Designer is a game board designer for Atlantik.
- .
- Atlantik is a KDE client for playing Monopoly-like board games on the
-- monopd network. The purpose of Atlantik is to acquire land in major
-- cities in North America and Europe while being a transatlantic traveller.
-+ monopd network. It can play any board supported by the network
-+ server, including the classic Monopoly game as well as the Atlantik
-+ game in which the properties include several major cities in North
-+ America and Europe.
- .
- This package is part of the KDE add-ons module.
-
-@@ -50,21 +53,23 @@
- Architecture: any
- Section: kde
- Depends: ${shlibs:Depends}
--Suggests: kworldclock, kontact-plugins, khelpcenter, kdeaddons-doc-html
-+Suggests: kworldclock, khelpcenter, kdeaddons-doc-html
- Enhances: kaddressbook
--Description: plugins for Kaddressbook, the KDE address book
-+Description: plugins for KAddressBook, the KDE address book
- This package contains a variety of useful plugins for the KDE address
- book. These plugins can be loaded through the KDE address book settings.
- .
-- Highlights include exporting postal addresses as flags in KWorldClock.
-+ Highlights include exporting postal addresses as flags in KWorldClock,
-+ as well as importing and exporting contacts in the native format used
-+ by the German freemail provider GMX.
- .
- This package is part of the KDE add-ons module.
-
- Package: kate-plugins
- Architecture: any
- Section: editors
--Depends: ${shlibs:Depends}
--Suggests: khelpcenter, kdeaddons-doc-html, tidy
-+Depends: ${shlibs:Depends}, kaddressbook, tidy
-+Suggests: khelpcenter, kdeaddons-doc-html
- Enhances: kate
- Description: plugins for Kate, the KDE Advanced Text Editor
- This package contains a variety of useful plugins for Kate, the KDE
-@@ -72,9 +77,9 @@
- manager in Kate settings.
- .
- Highlights include spell checking, text filtering, HTML/XML construction
-- and validation, insertion of shell command output, vim/emacs modeline
-- handling, opening of C/C++ headers, extraction of C/C++ symbols, a Python
-- browser and even more.
-+ and validation, vim/emacs modeline handling, templates for new files
-+ and text snippets, opening of C/C++ headers, extraction of C/C++ symbols,
-+ a tab bar, a Python browser and even more.
- .
- This package is part of the KDE add-ons module.
-
-@@ -88,7 +93,8 @@
- Description: KDE file dialog plugins for text files and folders
- This is a collection of plugins for the KDE file dialog. These plugins
- extend the file dialog to offer advanced meta-information for text,
-- HTML and desktop files, as well as for folders.
-+ HTML and desktop files, as well as for folders, Windows .lnk files,
-+ MIME archives and X.509 certificates.
- .
- This package also includes plugins for the KDE file rename dialog,
- allowing a user to more easily decide what to do when faced with a
-@@ -111,8 +117,8 @@
- This package contains a variety of applets for Kicker, the KDE panel.
- These applets will appear in the panel's Add--Applet menu.
- .
-- Included are a system monitor, a colour picker, a media player controller
-- and a binary clock.
-+ Included are a system monitor, a colour picker, a media player controller,
-+ a mathematical evaluator and a binary clock.
- .
- This package is part of the KDE add-ons module.
-
-@@ -135,37 +141,26 @@
- Package: konq-plugins
- Architecture: any
- Section: kde
--Depends: ${shlibs:Depends}, imagemagick, libjpeg-progs, python
-+Depends: ${shlibs:Depends}, akregator, ark, imagemagick, libjpeg-progs, python
- Suggests: khelpcenter, kdeaddons-doc-html
--Enhances: konqueror
-+Enhances: konqueror, akregator
-+Replaces: akregator (<< 1.1), akregator-konq-plugin (<< 1.1)
-+Conflicts: akregator-konq-plugin (<< 1.1)
-+Provides: akregator-konq-plugin
- Description: plugins for Konqueror, the KDE file/web/doc browser
- This package contains a variety of useful plugins for Konqueror, the
-- file manager, web browser and document viewer for KDE. These plugins
-- will appear in Konqueror's Tools menu.
-+ file manager, web browser and document viewer for KDE. Many of these
-+ plugins will appear in Konqueror's Tools menu.
- .
- Highlights for web browsing include web page translation, web page archiving,
-- auto-refreshing, HTML and CSS structural analysis, fast access to common
-- options, bookmarklets and a crash monitor.
-+ auto-refreshing, HTML and CSS structural analysis, a search toolbar, a
-+ sidebar news ticker, fast access to common options, bookmarklets, a crash
-+ monitor and integration with the aKregator RSS feed reader.
- .
- Highlights for directory browsing include directory filters, image gallery
-- creation, samba share mounting, quick copy/move, a sidebar media player,
-- a graphical disk usage viewer and image conversions and transformations.
-- .
-- This package is part of the KDE add-ons module.
--
--Package: kontact-plugins
--Architecture: any
--Section: kde
--Depends: ${shlibs:Depends}, dcoprss
--Recommends: kaddressbook-plugins
--Suggests: khelpcenter, kdeaddons-doc-html
--Enhances: kontact
--Description: plugins for Kontact, the KDE groupware client
-- This package contains a variety of useful plugins for Kontact, the
-- groupware client for KDE. These plugins can be loaded through the
-- Kontact settings.
-- .
-- Highlights include a news ticker plugin.
-+ creation, archive compression and extraction, quick copy/move, a sidebar
-+ media player, a graphical disk usage viewer and image conversions and
-+ transformations.
- .
- This package is part of the KDE add-ons module.
-
-diff -urN -x CVS kdeaddons.orig/debian/copyright kdeaddons/debian/copyright
---- kdeaddons.orig/debian/copyright 2004-03-08 00:59:23.000000000 +0100
-+++ kdeaddons/debian/copyright 2005-03-14 07:37:32.000000000 +0100
-@@ -1,4 +1,4 @@
--This package was debianized by Ben Burton <bab at debian.org> on
-+This package was debianised by Ben Burton <bab at debian.org> on
- Mon, 18 Jun 2001 02:52:26 -0500.
- Thanks to Mickael Marchand for originally packaging vimpart.
-
-@@ -9,14 +9,30 @@
-
- Upstream authors:
-
-- Many and varied; this package is simply a collection of plugins.
-- See http://www.kde.org/ for further details.
-+ Many and varied; this package is simply a collection of add-ons and
-+ plugins. See http://www.kde.org/ for further details.
-
- Copyright:
-
- All components of this package are released under the GPL (GNU General
- Public License), with the following exceptions:
-
-+ DocBook Documentation:
-+
-+ Permission is granted to copy, distribute and/or modify this
-+ document under the terms of the GNU Free Documentation License,
-+ Version 1.1 or any later version published by the Free Software
-+ Foundation; with no Invariant Sections, with no Front-Cover Texts,
-+ and with no Back-Cover Texts.
-+
-+ A copy of the GNU Free Documentation License (Version 1.2) is
-+ included at the end of this file.
-+
-+ Kate Plugins:
-+
-+ KJS Wrapper:
-+ LGPL (GNU Library General Public License)
-+
- Kicker Applets:
-
- KBinaryClock:
-@@ -43,6 +59,33 @@
- CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-+ Math Expression Evaluator:
-+ Mixture of GPL and the following:
-+
-+ Based on code 'Run' applet code, copyright (c) 2000 Matthias Elter
-+ <elter at kde.org>
-+
-+ Modifications made by Andrew Coles, 2004 <andrew_coles at yahoo.co.uk>
-+
-+ Permission is hereby granted, free of charge, to any person
-+ obtaining a copy of this software and associated documentation
-+ files (the "Software"), to deal in the Software without
-+ restriction, including without limitation the rights to use, copy,
-+ modify, merge, publish, distribute, sublicense, and/or sell copies
-+ of the Software, and to permit persons to whom the Software is
-+ furnished to do so, subject to the following conditions:
-+
-+ The above copyright notice and this permission notice shall be
-+ included in all copies or substantial portions of the Software.
-+
-+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-+ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY
-+ CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
-+ CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-+ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-+
- KNewsTicker Scripts:
-
- All scripts surrendered to the knewsticker scripts section which are
-@@ -71,16 +114,47 @@
- Konqueror Plugins:
-
- Babelfish, crash monitor, directory filter, image gallery,
-- minitools bookmarklets, SMB mounter, user agent changer,
-+ minitools bookmarklets, sidebar news ticker, user agent changer,
- HTML/CSS validators:
- LGPL (GNU Lesser General Public License)
-
-- Kuick copy and move, web archiver:
-+ DOM tree viewer, kuick copy and move, web archiver:
- Mixture of GPL and LGPL
-
-- Sidebar media player:
-+ Image rotation:
- Mixture of GPL and the following:
-
-+ Copyright 2002 Gene Cash All rights reserved.
-+
-+ Redistribution and use in source and binary forms, with or without
-+ modification, are permitted provided that the following conditions
-+ are met:
-+
-+ 1. Redistributions of source code must retain the above copyright
-+ notice, this list of conditions and the following disclaimer.
-+ 2. Redistributions in binary form must reproduce the above copyright
-+ notice, this list of conditions and the following disclaimer in
-+ the documentation and/or other materials provided with the
-+ distribution.
-+
-+ THIS SOFTWARE IS PROVIDED BY GENE CASH ``AS IS'' AND ANY EXPRESS
-+ OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-+ WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-+ ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE
-+ LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
-+ OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
-+ OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-+ BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-+ WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-+ OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
-+ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-+
-+ This means you may do anything you want with this code, except
-+ claim you wrote it. Also, if it breaks you get to keep both pieces.
-+
-+ Sidebar media player:
-+ Mixture of GPL, LGPL and the following:
-+
- Copyright (c) 2000-2001 the noatun authors. See file AUTHORS.
-
- Permission is hereby granted, free of charge, to any person obtaining
-@@ -102,14 +176,38 @@
- FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- DEALINGS IN THE SOFTWARE.
-
-- Kontact Plugins:
-+ Noatun Plugins:
-
-- Newsticker plugin:
-- Mixture of GPL and LGPL (GNU Lesser General Public License)
-+ Alarm:
-+ Mixture of GPL and the following:
-
-- Noatun Plugins:
-+ Copyright (C) 2001 Neil Stevens <multivac at fcmail.com>
-
-- AlsaPlayer, Blurscope, Dead Man's Interface, Jefferson, Lucky Tag Reader:
-+ Permission is hereby granted, free of charge, to any person
-+ obtaining a copy of this software and associated documentation
-+ files (the "Software"), to deal in the Software without
-+ restriction, including without limitation the rights to use, copy,
-+ modify, merge, publish, distribute, sublicense, and/or sell copies
-+ of the Software, and to permit persons to whom the Software is
-+ furnished to do so, subject to the following conditions:
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/kdeaddons-branch.diff?r1=1.3&r2=1.4&f=u
More information about the pld-cvs-commit
mailing list