[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

pkg-kde: commit - rev 147 - in trunk/packages/kdebindings/debian: . local patches



Author: domi-guest
Date: 2004-08-05 14:45:51 -0600 (Thu, 05 Aug 2004)
New Revision: 147

Added:
   trunk/packages/kdebindings/debian/libkorundum0-ruby1.8.docs
   trunk/packages/kdebindings/debian/libkorundum0-ruby1.8.examples
   trunk/packages/kdebindings/debian/libkorundum0-ruby1.8.install
   trunk/packages/kdebindings/debian/libqt0-ruby1.8.docs
   trunk/packages/kdebindings/debian/libqt0-ruby1.8.examples
   trunk/packages/kdebindings/debian/libqt0-ruby1.8.install
   trunk/packages/kdebindings/debian/libsmokekde-dev.install
   trunk/packages/kdebindings/debian/libsmokekde1.install
   trunk/packages/kdebindings/debian/patches/021-dont-install-example-kjsembed-plugins.diff
   trunk/packages/kdebindings/debian/patches/023-dont-install-jsaccess.diff
   trunk/packages/kdebindings/debian/patches/024-dont-install-javalib-test-program.diff
   trunk/packages/kdebindings/debian/patches/025-dont-install-koala-test-program.diff
   trunk/packages/kdebindings/debian/patches/026-install-qtruby-and-korundum-in-usr.diff
   trunk/packages/kdebindings/debian/patches/027-fix-dcopjava-deps.diff
Removed:
   trunk/packages/kdebindings/debian/kjscmd.manpages
   trunk/packages/kdebindings/debian/libkdec1.docs
   trunk/packages/kdebindings/debian/libkdec1.install
   trunk/packages/kdebindings/debian/libqtc1.install
   trunk/packages/kdebindings/debian/local/kjscmd.1
   trunk/packages/kdebindings/debian/patches/013-qtc_clib_qtc_Makefile.am-noqaccessible.diff
   trunk/packages/kdebindings/debian/patches/019-libqtjavasupport_la.diff
   trunk/packages/kdebindings/debian/patches/020-cleanjarfiles.diff
Modified:
   trunk/packages/kdebindings/debian/changelog
   trunk/packages/kdebindings/debian/control
   trunk/packages/kdebindings/debian/kjscmd.install
   trunk/packages/kdebindings/debian/libkjsembed1.install
   trunk/packages/kdebindings/debian/libsmokeqt1.install
   trunk/packages/kdebindings/debian/patches/017-install-jnilibs-in-lib-jni.diff
   trunk/packages/kdebindings/debian/rules
Log:
updates for KDE 3.3

Modified: trunk/packages/kdebindings/debian/changelog
===================================================================
--- trunk/packages/kdebindings/debian/changelog	2004-08-02 23:44:53 UTC (rev 146)
+++ trunk/packages/kdebindings/debian/changelog	2004-08-05 20:45:51 UTC (rev 147)
@@ -1,3 +1,24 @@
+kdebindings (4:3.2.92-1) unstable; urgency=low
+
+  * New upstream version.
+  * debian/patches/013-qtc_clib_qtc_Makefile.am-noqaccessible.diff,
+    debian/patches/019-libqtjavasupport_la.diff,
+    debian/patches/020-cleanjarfiles.diff: Accepted upstream, removed.
+  * debian/patches/017-install-jnilibs-in-lib-jni.diff: updated.
+  * debian/control: made libqt3-java suggest juic.
+  * debian/changelog: removed the obsolete libkdec1 and libqtc1 packages.
+  * debian/local/kjscmd.1, debian/kjscmd.manpages: removed kjscmd.1 which
+    was accepted upstream.
+  * debian/libkjsembed1.install: install the qprocess kjsembed plugin.
+  * debian/rules: disable the python directory, as sip, pyqt and
+    pykde are all packaged in Debian already.
+  * debian/control: added the libsmokekde1, libsmokekde-dev,
+    libkorundum-ruby1.8 and libqtruby-ruby1.8 packages because of upstream
+    additions.
+  * debian/control: fix libsmokeqt-dev to depend on libsmokeqt1
+
+ -- Dominique Devriese <devriese@kde.org>  Thu,  5 Aug 2004 21:08:08 +0200
+
 kdebindings (4:3.2.3-1) unstable; urgency=low
 
   * New upstream version.

Modified: trunk/packages/kdebindings/debian/control
===================================================================
--- trunk/packages/kdebindings/debian/control	2004-08-02 23:44:53 UTC (rev 146)
+++ trunk/packages/kdebindings/debian/control	2004-08-05 20:45:51 UTC (rev 147)
@@ -1,5 +1,5 @@
 Source: kdebindings
-Build-Depends: binutils-dev, debhelper (>> 4.0.0), gawk, gettext, gij, gcj, libgcj4-dev, fastjar, kdelibs4-dev (>= 4:3.1.4), libglib1.2-dev, libgtk1.2-dev, python2.3-dev, perl (>= 5.6.0-16), libqt3-compat-headers, sharutils
+Build-Depends: binutils-dev, debhelper (>> 4.0.0), gawk, gettext, gij, gcj, libgcj4-dev, fastjar, kdelibs4-dev (>= 4:3.2.92-1), libglib1.2-dev, libgtk1.2-dev, python2.3-dev, perl (>= 5.6.0-16), libqt3-compat-headers (>= 3:3.3.2-0pre2), sharutils
 Section: devel
 Priority: optional
 Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
@@ -16,28 +16,6 @@
  .
  This package is part of the official KDE bindings module.
 
-Package: libqtc1
-Architecture: any
-Section: libs
-Depends: ${shlibs:Depends}
-Description: Qt bindings for C
- This package contains the shared libraries necessary to run programs
- linked with the C bindings to Trolltech's Qt library.  Qt is a very popular
- GUI toolkit, used by the KDE desktop environment.
- .
- This package is part of the official KDE bindings module.
-
-Package: libkdec1
-Architecture: any
-Section: libs
-Depends: ${shlibs:Depends}
-Description: kdelibs bindings for C
- This package contains the shared libraries necessary to run programs
- linked with the C kdelibs bindings.  KDE is the K Desktop Environment, a
- very popular UNIX Desktop Environment.
- .
- This package is part of the official KDE bindings module.
-
 Package: libdcop3-java
 Architecture: all
 Section: libs
@@ -77,6 +55,7 @@
 Architecture: all
 Section: libs
 Depends: libqt3-jni (= ${Source-Version}), gij | java1-runtime | java2-runtime
+Suggests: juic
 Description: Java bindings for Qt
  This package contains the Java classes necessary to run Java programs
  using the Java Qt bindings. Qt is a very popular GUI toolkit, used by
@@ -121,23 +100,44 @@
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}
-Description: Scripting Meta Object Kompiler Engine - binding library to Qt
+Description: Scripting Meta Object Kompiler Engine - Binding Library to Qt
  This library is used by various KDE language bindings packages to provide
- interfaces to the Qt and KDE libraries.
+ interfaces to the Qt library.
  .
  This package is part of the official KDE bindings module.
 
 Package: libsmokeqt-dev
 Architecture: any
 Section: libdevel
+Depends: ${shlibs:Depends}, libsmokeqt1 (>= ${Source-Version})
+Description: Scripting Meta Object Kompiler Engine - Binding Library to Qt - Development Files
+ This library is used by various KDE language bindings packages to
+ provide interfaces to the Qt library. This package contains the
+ development files for the library.
+ .
+ This package is part of the official KDE bindings module.
+
+Package: libsmokekde1
+Architecture: any
+Section: libs
 Depends: ${shlibs:Depends}
-Description: Scripting Meta Object Kompiler Engine - binding library to Qt development files
+Description: Scripting Meta Object Kompiler Engine - Binding Library to KDE
  This library is used by various KDE language bindings packages to provide
- interfaces to the Qt and KDE libraries. This package contains the development
- files for the library.
+ interfaces to the KDE libraries.
  .
  This package is part of the official KDE bindings module.
 
+Package: libsmokekde-dev
+Architecture: any
+Section: libdevel
+Depends: ${shlibs:Depends}, libsmokekde1 (>= ${Source-Version})
+Description: Scripting Meta Object Kompiler Engine - Binding Library to KDE - Development Files
+ This library is used by various KDE language bindings packages to
+ provide interfaces to the Qt and KDE libraries. This package contains
+ the development files for the library.
+ .
+ This package is part of the official KDE bindings module.
+
 Package: python-dcop
 Architecture: any
 Section: python 
@@ -199,3 +199,23 @@
  Designer.
  .
  This package is part of the official KDE bindings module.
+
+Package: libkorundum0-ruby1.8
+Architecture: any
+Section: interpreters
+Depends: ${shlibs:Depends}
+Description: KDE bindings for Ruby
+ This package contains the files necessary for running and developing
+ Ruby code using the Korundum KDE Ruby bindings.
+ .
+ This package is part of the official KDE bindings module.
+
+Package: libqt0-ruby1.8
+Architecture: any
+Section: interpreters
+Depends: ${shlibs:Depends}
+Description: Qt bindings for Ruby
+ This package contains the files necessary for running and developing
+ Ruby code using the Qt Ruby bindings.
+ .
+ This package is part of the official KDE bindings module.

Modified: trunk/packages/kdebindings/debian/kjscmd.install
===================================================================
--- trunk/packages/kdebindings/debian/kjscmd.install	2004-08-02 23:44:53 UTC (rev 146)
+++ trunk/packages/kdebindings/debian/kjscmd.install	2004-08-05 20:45:51 UTC (rev 147)
@@ -1,3 +1,3 @@
 debian/tmp/usr/bin/kjscmd
 debian/tmp/usr/share/applications/kde/kjscmd.desktop
-debian/tmp/usr/share/mimelnk/application/x-javascript.desktop
+debian/tmp/usr/share/man/man1/kjscmd.1

Deleted: trunk/packages/kdebindings/debian/kjscmd.manpages
===================================================================
--- trunk/packages/kdebindings/debian/kjscmd.manpages	2004-08-02 23:44:53 UTC (rev 146)
+++ trunk/packages/kdebindings/debian/kjscmd.manpages	2004-08-05 20:45:51 UTC (rev 147)
@@ -1 +0,0 @@
-debian/local/kjscmd.1

Deleted: trunk/packages/kdebindings/debian/libkdec1.docs
===================================================================
--- trunk/packages/kdebindings/debian/libkdec1.docs	2004-08-02 23:44:53 UTC (rev 146)
+++ trunk/packages/kdebindings/debian/libkdec1.docs	2004-08-05 20:45:51 UTC (rev 147)
@@ -1 +0,0 @@
-kdec/AUTHORS

Deleted: trunk/packages/kdebindings/debian/libkdec1.install
===================================================================
--- trunk/packages/kdebindings/debian/libkdec1.install	2004-08-02 23:44:53 UTC (rev 146)
+++ trunk/packages/kdebindings/debian/libkdec1.install	2004-08-05 20:45:51 UTC (rev 147)
@@ -1,2 +0,0 @@
-debian/tmp/usr/lib/libkdec.so.1.2.0
-debian/tmp/usr/lib/libkdec.so.1

Modified: trunk/packages/kdebindings/debian/libkjsembed1.install
===================================================================
--- trunk/packages/kdebindings/debian/libkjsembed1.install	2004-08-02 23:44:53 UTC (rev 146)
+++ trunk/packages/kdebindings/debian/libkjsembed1.install	2004-08-05 20:45:51 UTC (rev 147)
@@ -4,3 +4,7 @@
 debian/tmp/usr/lib/kde3/libimagefxplugin.la
 debian/tmp/usr/lib/kde3/libimagefxplugin.so
 debian/tmp/usr/share/services/imagefx_plugin.desktop
+debian/tmp/usr/lib/kde3/libqprocessplugin.so
+debian/tmp/usr/lib/kde3/libqprocessplugin.la
+debian/tmp/usr/share/services/qprocess_plugin.desktop
+debian/tmp/usr/share/apps/kjsembed/cmdline.js

Added: trunk/packages/kdebindings/debian/libkorundum0-ruby1.8.docs
===================================================================
--- trunk/packages/kdebindings/debian/libkorundum0-ruby1.8.docs	2004-08-02 23:44:53 UTC (rev 146)
+++ trunk/packages/kdebindings/debian/libkorundum0-ruby1.8.docs	2004-08-05 20:45:51 UTC (rev 147)
@@ -0,0 +1,3 @@
+korundum/README
+korundum/TODO
+korundum/rubylib/templates

Added: trunk/packages/kdebindings/debian/libkorundum0-ruby1.8.examples
===================================================================
--- trunk/packages/kdebindings/debian/libkorundum0-ruby1.8.examples	2004-08-02 23:44:53 UTC (rev 146)
+++ trunk/packages/kdebindings/debian/libkorundum0-ruby1.8.examples	2004-08-05 20:45:51 UTC (rev 147)
@@ -0,0 +1 @@
+korundum/rubylib/examples/*

Added: trunk/packages/kdebindings/debian/libkorundum0-ruby1.8.install
===================================================================
--- trunk/packages/kdebindings/debian/libkorundum0-ruby1.8.install	2004-08-02 23:44:53 UTC (rev 146)
+++ trunk/packages/kdebindings/debian/libkorundum0-ruby1.8.install	2004-08-05 20:45:51 UTC (rev 147)
@@ -0,0 +1,9 @@
+debian/tmp/usr/bin/rbkdesh
+debian/tmp/usr/bin/rbkdeapi
+debian/tmp/usr/bin/krubyinit
+debian/tmp/usr/lib/ruby/1.8/Korundum.rb
+debian/tmp/usr/lib/ruby/1.8/KDE/korundum.rb
+debian/tmp/usr/lib/ruby/1.8/i386-linux/korundum.so.0.0.0
+debian/tmp/usr/lib/ruby/1.8/i386-linux/korundum.so.0
+debian/tmp/usr/lib/ruby/1.8/i386-linux/korundum.so
+debian/tmp/usr/lib/ruby/1.8/i386-linux/korundum.la

Added: trunk/packages/kdebindings/debian/libqt0-ruby1.8.docs
===================================================================
--- trunk/packages/kdebindings/debian/libqt0-ruby1.8.docs	2004-08-02 23:44:53 UTC (rev 146)
+++ trunk/packages/kdebindings/debian/libqt0-ruby1.8.docs	2004-08-05 20:45:51 UTC (rev 147)
@@ -0,0 +1,4 @@
+qtruby/README
+qtruby/README.1st
+qtruby/TODO
+

Added: trunk/packages/kdebindings/debian/libqt0-ruby1.8.examples
===================================================================
--- trunk/packages/kdebindings/debian/libqt0-ruby1.8.examples	2004-08-02 23:44:53 UTC (rev 146)
+++ trunk/packages/kdebindings/debian/libqt0-ruby1.8.examples	2004-08-05 20:45:51 UTC (rev 147)
@@ -0,0 +1,2 @@
+qtruby/rubylib/examples/*
+qtruby/rubylib/tutorial

Added: trunk/packages/kdebindings/debian/libqt0-ruby1.8.install
===================================================================
--- trunk/packages/kdebindings/debian/libqt0-ruby1.8.install	2004-08-02 23:44:53 UTC (rev 146)
+++ trunk/packages/kdebindings/debian/libqt0-ruby1.8.install	2004-08-05 20:45:51 UTC (rev 147)
@@ -0,0 +1,10 @@
+debian/tmp/usr/bin/rbqtsh
+debian/tmp/usr/bin/rbqtapi
+debian/tmp/usr/bin/rbuic
+debian/tmp/usr/bin/qtrubyinit
+debian/tmp/usr/lib/ruby/1.8/i386-linux/qtruby.so.0.0.0
+debian/tmp/usr/lib/ruby/1.8/i386-linux/qtruby.so.0
+debian/tmp/usr/lib/ruby/1.8/i386-linux/qtruby.so
+debian/tmp/usr/lib/ruby/1.8/i386-linux/qtruby.la
+debian/tmp/usr/lib/ruby/1.8/Qt/qtruby.rb
+debian/tmp/usr/lib/ruby/1.8/Qt.rb

Deleted: trunk/packages/kdebindings/debian/libqtc1.install
===================================================================
--- trunk/packages/kdebindings/debian/libqtc1.install	2004-08-02 23:44:53 UTC (rev 146)
+++ trunk/packages/kdebindings/debian/libqtc1.install	2004-08-05 20:45:51 UTC (rev 147)
@@ -1,2 +0,0 @@
-debian/tmp/usr/lib/libqtc.so.1
-debian/tmp/usr/lib/libqtc.so.1.0.0

Added: trunk/packages/kdebindings/debian/libsmokekde-dev.install
===================================================================
--- trunk/packages/kdebindings/debian/libsmokekde-dev.install	2004-08-02 23:44:53 UTC (rev 146)
+++ trunk/packages/kdebindings/debian/libsmokekde-dev.install	2004-08-05 20:45:51 UTC (rev 147)
@@ -0,0 +1,2 @@
+debian/tmp/usr/lib/libsmokekde.so
+debian/tmp/usr/lib/libsmokekde.la

Added: trunk/packages/kdebindings/debian/libsmokekde1.install
===================================================================
--- trunk/packages/kdebindings/debian/libsmokekde1.install	2004-08-02 23:44:53 UTC (rev 146)
+++ trunk/packages/kdebindings/debian/libsmokekde1.install	2004-08-05 20:45:51 UTC (rev 147)
@@ -0,0 +1,2 @@
+debian/tmp/usr/lib/libsmokekde.so.1.2.2
+debian/tmp/usr/lib/libsmokekde.so.1

Modified: trunk/packages/kdebindings/debian/libsmokeqt1.install
===================================================================
--- trunk/packages/kdebindings/debian/libsmokeqt1.install	2004-08-02 23:44:53 UTC (rev 146)
+++ trunk/packages/kdebindings/debian/libsmokeqt1.install	2004-08-05 20:45:51 UTC (rev 147)
@@ -1,2 +1,2 @@
-debian/tmp/usr/lib/libsmokeqt.so.1.2.1
+debian/tmp/usr/lib/libsmokeqt.so.1.2.2
 debian/tmp/usr/lib/libsmokeqt.so.1

Deleted: trunk/packages/kdebindings/debian/local/kjscmd.1
===================================================================
--- trunk/packages/kdebindings/debian/local/kjscmd.1	2004-08-02 23:44:53 UTC (rev 146)
+++ trunk/packages/kdebindings/debian/local/kjscmd.1	2004-08-05 20:45:51 UTC (rev 147)
@@ -1,24 +0,0 @@
-.TH "kjscmd" 1
-.SH NAME
-kjscmd \- A tool for running KJSEmbed scripts from the command line
-.SH SYNOPSIS
-.B kjscmd
-<grammar for command line>
-.SH DESCRIPTION
-kjscmd is a tool for launching KJSEmbed scripts from the command line, and
-can also provide a graphical console for running scripts in.
-.SH OPTIONS
-.TP
-.B \-\-console
-Enables the graphical console. Note that this will not be visible unless the
-script enters the event loop or the --exec parameter is also used.
-.TP
-.B \-\-exec
-Tells kjscmd to enter the event loop after executing the script.
-.TP
-.B \-\-nogui
-Tells kjscmd not to create an X connection. This allows you to use it without
-needing an X server.
-.SH BUGS
-It should autodetect if it is running interactively and do something sensible.
-

Deleted: trunk/packages/kdebindings/debian/patches/013-qtc_clib_qtc_Makefile.am-noqaccessible.diff
===================================================================
--- trunk/packages/kdebindings/debian/patches/013-qtc_clib_qtc_Makefile.am-noqaccessible.diff	2004-08-02 23:44:53 UTC (rev 146)
+++ trunk/packages/kdebindings/debian/patches/013-qtc_clib_qtc_Makefile.am-noqaccessible.diff	2004-08-05 20:45:51 UTC (rev 147)
@@ -1,16 +0,0 @@
-Index: kdebindings/qtc/clib/qtc/Makefile.am
-===================================================================
-RCS file: /home/kde/kdebindings/qtc/clib/qtc/Attic/Makefile.am,v
-retrieving revision 1.13.4.1
-diff -u -r1.13.4.1 Makefile.am
---- kdebindings/qtc/clib/qtc/Makefile.am	4 Apr 2004 22:47:33 -0000	1.13.4.1
-+++ kdebindings/qtc/clib/qtc/Makefile.am	5 Apr 2004 11:59:32 -0000
-@@ -4,7 +4,7 @@
- 
- INCLUDES = -I$(srcdir)/.. $(all_includes)
- 
--libqtc_la_SOURCES = qt_QAccessibleInterface.cpp qt_QTab.cpp qt_QKeySequence.cpp qt_QUuid.cpp qt_QTimeEdit.cpp qt_QTextEdit.cpp qt_QTabletEvent.cpp qt_QSqlResult.cpp qt_QSqlRecord.cpp qt_QSqlQuery.cpp qt_QSqlPropertyMap.cpp qt_QSqlIndex.cpp qt_QSqlForm.cpp qt_QSqlField.cpp qt_QSqlError.cpp qt_QSqlEditorFactory.cpp qt_QSqlDriver.cpp qt_QSqlDatabase.cpp qt_QSqlCursor.cpp qt_QSql.cpp qt_QSettings.cpp qt_QRegExpValidator.cpp qt_QProcess.cpp qt_QLibrary.cpp qt_QIMEvent.cpp qt_QGridView.cpp qt_QErrorMessage.cpp qt_QEditorFactory.cpp qt_QDockWindow.cpp qt_QDockArea.cpp qt_QDesktopWidget.cpp qt_QDateTimeEditBase.cpp qt_QDateTimeEdit.cpp qt_QDateEdit.cpp qt_QDataView.cpp qt_QDataTable.cpp qt_QDataBrowser.cpp qt_QContextMenuEvent.cpp qt_QComboTableItem.cpp qt_QCheckTableItem.cpp qt_QCanvasSpline.cpp qt_QAccessibleObject.cpp qt_QAccessible.cpp qt_QFileInfoList.cpp qt_QTsciiCodec.cpp qt_QUtf16Codec.cpp qt_QUtf8Codec.cpp qt_QWidgetItem.cpp qt_Slot.cpp qt_Qt.cpp qt_QXmlSimpleReader.cpp qt_QXmlReader.cpp qt_QXmlParseException.cpp qt_QXmlNamespaceSupport.cpp qt_QXmlLocator.cpp qt_QXmlLexicalHandler.cpp qt_QXmlInputSource.cpp qt_QXmlErrorHandler.cpp qt_QXmlEntityResolver.cpp qt_QXmlDefaultHandler.cpp qt_QXmlDeclHandler.cpp qt_QXmlDTDHandler.cpp qt_QXmlContentHandler.cpp qt_QXmlAttributes.cpp qt_QWorkspace.cpp qt_QWizard.cpp qt_QWidgetStack.cpp qt_QWidgetList.cpp qt_QWidget.cpp qt_QWheelEvent.cpp qt_QWhatsThis.cpp qt_QWMatrix.cpp qt_QVariant.cpp qt_QValidator.cpp qt_QVGroupBox.cpp qt_QVButtonGroup.cpp qt_QVBoxLayout.cpp qt_QVBox.cpp qt_QUrlOperator.cpp qt_QUrlInfo.cpp qt_QUrl.cpp qt_QUriDrag.cpp qt_QTranslatorMessage.cpp qt_QTranslator.cpp qt_QToolTipGroup.cpp qt_QToolTip.cpp qt_QToolButton.cpp qt_QToolBar.cpp qt_QTimerEvent.cpp qt_QTimer.cpp qt_QTime.cpp qt_QTextView.cpp qt_QTextStream.cpp qt_QTextOStream.cpp qt_QTextIStream.cpp qt_QTextEncoder.cpp qt_QTextDrag.cpp qt_QTextDecoder.cpp qt_QTextCodec.cpp qt_QTextBrowser.cpp qt_QTableSelection.cpp qt_QTableItem.cpp qt_QTable.cpp qt_QTabWidget.cpp qt_QTabDialog.cpp qt_QTabBar.cpp qt_QStyleSheetItem.cpp qt_QStyleSheet.cpp qt_QStyle.cpp qt_QStringList.cpp qt_QString.cpp qt_QStrVec.cpp qt_QStrList.cpp qt_QStrIVec.cpp qt_QStrIList.cpp qt_QStoredDrag.cpp qt_QStatusBar.cpp qt_QSplitter.cpp qt_QSpinBox.cpp qt_QSpacerItem.cpp qt_QSound.cpp qt_QSocketNotifier.cpp qt_QSocketDevice.cpp qt_QSocket.cpp qt_QSlider.cpp qt_QSjisCodec.cpp qt_QSizePolicy.cpp qt_QSizeGrip.cpp qt_QSize.cpp qt_QSimpleRichText.cpp qt_QMenuItem.cpp qt_QByteArray.cpp qt_QSignalMapper.cpp qt_QSignal.cpp qt_QShowEvent.cpp qt_QShared.cpp qt_QSessionManager.cpp qt_QServerSocket.cpp qt_QSemiModal.cpp qt_QScrollView.cpp qt_QScrollBar.cpp qt_QResizeEvent.cpp qt_QRegion.cpp qt_QRegExp.cpp qt_QRect.cpp qt_QRangeControl.cpp qt_QRadioButton.cpp qt_QPushButton.cpp qt_QProgressDialog.cpp qt_QProgressBar.cpp qt_QPrinter.cpp qt_QPrintDialog.cpp qt_QPopupMenu.cpp qt_QPolygonScanner.cpp qt_QPointArray.cpp qt_QPoint.cpp qt_QPixmapCache.cpp qt_QPixmap.cpp qt_QPicture.cpp qt_QPen.cpp qt_QPalette.cpp qt_QPainter.cpp qt_QPaintEvent.cpp qt_QPaintDeviceX11Data.cpp qt_QPaintDeviceMetrics.cpp qt_QPaintDevice.cpp qt_QObjectList.cpp qt_QObjectDictionary.cpp qt_QObject.cpp qt_QNetworkProtocolFactoryBase.cpp qt_QNetworkProtocol.cpp qt_QNetworkOperation.cpp qt_QMultiLineEdit.cpp qt_QMovie.cpp qt_QMoveEvent.cpp qt_QMouseEvent.cpp qt_QMimeSourceFactory.cpp qt_QMimeSource.cpp qt_QMetaProperty.cpp qt_QMetaObject.cpp qt_QMetaEnum.cpp qt_QMetaData.cpp qt_QMessageBox.cpp qt_QMenuData.cpp qt_QMenuBar.cpp qt_QMainWindow.cpp qt_QLocalFs.cpp qt_QListViewItemIterator.cpp qt_QListViewItem.cpp qt_QListView.cpp qt_QListBoxText.cpp qt_QListBoxPixmap.cpp qt_QListBoxItem.cpp qt_QListBox.cpp qt_QLineEdit.cpp qt_QLayoutIterator.cpp qt_QLayoutItem.cpp qt_QLayout.cpp qt_QLabel.cpp qt_QLCDNumber.cpp qt_QKeyEvent.cpp qt_QJpUnicodeConv.cpp qt_QJisCodec.cpp qt_QIntValidator.cpp qt_QInputDialog.cpp qt_QImageTextKeyLang.cpp qt_QImageIO.cpp qt_QImageFormatType.cpp qt_QImageFormat.cpp qt_QImageDrag.cpp qt_QImageDecoder.cpp qt_QImageConsumer.cpp qt_QImage.cpp qt_QIconViewItem.cpp qt_QIconView.cpp qt_QIconSet.cpp qt_QIconDragItem.cpp qt_QIconDrag.cpp qt_QIODeviceSource.cpp qt_QIODevice.cpp qt_QHostAddress.cpp qt_QHideEvent.cpp qt_QHebrewCodec.cpp qt_QHeader.cpp qt_QHGroupBox.cpp qt_QHButtonGroup.cpp qt_QHBoxLayout.cpp qt_QHBox.cpp qt_QGroupBox.cpp qt_QGridLayout.cpp qt_QGrid.cpp qt_QGDictIterator.cpp qt_QGDict.cpp qt_QGCacheIterator.cpp qt_QGCache.cpp qt_QGArray.cpp qt_QFtp.cpp qt_QFrame.cpp qt_QFontMetrics.cpp qt_QFontInfo.cpp qt_QFontDialog.cpp qt_QFontDatabase.cpp qt_QFont.cpp qt_QFocusEvent.cpp qt_QFocusData.cpp qt_QFilePreview.cpp qt_QFileInfo.cpp qt_QFileIconProvider.cpp qt_QFileDialog.cpp qt_QFile.cpp qt_QEvent.cpp qt_QEucKrCodec.cpp qt_QEucJpCodec.cpp qt_QDropSite.cpp qt_QDropEvent.cpp qt_QDragResponseEvent.cpp qt_QDragObject.cpp qt_QDragMoveEvent.cpp qt_QDragManager.cpp qt_QDragLeaveEvent.cpp qt_QDragEnterEvent.cpp qt_QDoubleValidator.cpp qt_QDomText.cpp qt_QDomProcessingInstruction.cpp qt_QDomNotation.cpp qt_QDomNodeList.cpp qt_QDomNode.cpp qt_QDomNamedNodeMap.cpp qt_QDomImplementation.cpp qt_QDomEntityReference.cpp qt_QDomEntity.cpp qt_QDomElement.cpp qt_QDomDocumentType.cpp qt_QDomDocumentFragment.cpp qt_QDomDocument.cpp qt_QDomComment.cpp qt_QDomCharacterData.cpp qt_QDomCDATASection.cpp qt_QDomAttr.cpp qt_QDns.cpp qt_QDirSortItem.cpp qt_QDir.cpp qt_QDialog.cpp qt_QDial.cpp qt_QDateTime.cpp qt_QDate.cpp qt_QDataStream.cpp qt_QDataSource.cpp qt_QDataSink.cpp qt_QDataPump.cpp qt_QCustomMenuItem.cpp qt_QCustomEvent.cpp qt_QCursor.cpp qt_QConstString.cpp qt_QConnectionList.cpp qt_QConnection.cpp qt_QCommonStyle.cpp qt_QComboBox.cpp qt_QColorGroup.cpp qt_QColorDrag.cpp qt_QColorDialog.cpp qt_QColor.cpp qt_QCloseEvent.cpp qt_QClipboard.cpp qt_QClassInfo.cpp qt_QChildEvent.cpp qt_QCheckListItem.cpp qt_QCheckBox.cpp qt_QCharRef.cpp qt_QChar.cpp qt_QCanvasView.cpp qt_QCanvasText.cpp qt_QCanvasSprite.cpp qt_QCanvasRectangle.cpp qt_QCanvasPolygonalItem.cpp qt_QCanvasPolygon.cpp qt_QCanvasPixmapArray.cpp qt_QCanvasPixmap.cpp qt_QCanvasLine.cpp qt_QCanvasItemList.cpp qt_QCanvasItem.cpp qt_QCanvasEllipse.cpp qt_QCanvas.cpp qt_QCString.cpp qt_QButtonGroup.cpp qt_QButton.cpp qt_QBuffer.cpp qt_QBrush.cpp qt_QBoxLayout.cpp qt_QBitmap.cpp qt_QBitVal.cpp qt_QBitArray.cpp qt_QBig5Codec.cpp qt_QAuServer.cpp qt_QAsyncIO.cpp qt_QApplication.cpp qt_QActionGroup.cpp qt_QAction.cpp qt_QAccel.cpp qt_EventFilter.cpp qt_QWidgetFactory.cpp
-+libqtc_la_SOURCES = qt_QTab.cpp qt_QKeySequence.cpp qt_QUuid.cpp qt_QTimeEdit.cpp qt_QTextEdit.cpp qt_QTabletEvent.cpp qt_QSqlResult.cpp qt_QSqlRecord.cpp qt_QSqlQuery.cpp qt_QSqlPropertyMap.cpp qt_QSqlIndex.cpp qt_QSqlForm.cpp qt_QSqlField.cpp qt_QSqlError.cpp qt_QSqlEditorFactory.cpp qt_QSqlDriver.cpp qt_QSqlDatabase.cpp qt_QSqlCursor.cpp qt_QSql.cpp qt_QSettings.cpp qt_QRegExpValidator.cpp qt_QProcess.cpp qt_QLibrary.cpp qt_QIMEvent.cpp qt_QGridView.cpp qt_QErrorMessage.cpp qt_QEditorFactory.cpp qt_QDockWindow.cpp qt_QDockArea.cpp qt_QDesktopWidget.cpp qt_QDateTimeEditBase.cpp qt_QDateTimeEdit.cpp qt_QDateEdit.cpp qt_QDataView.cpp qt_QDataTable.cpp qt_QDataBrowser.cpp qt_QContextMenuEvent.cpp qt_QComboTableItem.cpp qt_QCheckTableItem.cpp qt_QCanvasSpline.cpp qt_QFileInfoList.cpp qt_QTsciiCodec.cpp qt_QUtf16Codec.cpp qt_QUtf8Codec.cpp qt_QWidgetItem.cpp qt_Slot.cpp qt_Qt.cpp qt_QXmlSimpleReader.cpp qt_QXmlReader.cpp qt_QXmlParseException.cpp qt_QXmlNamespaceSupport.cpp qt_QXmlLocator.cpp qt_QXmlLexicalHandler.cpp qt_QXmlInputSource.cpp qt_QXmlErrorHandler.cpp qt_QXmlEntityResolver.cpp qt_QXmlDefaultHandler.cpp qt_QXmlDeclHandler.cpp qt_QXmlDTDHandler.cpp qt_QXmlContentHandler.cpp qt_QXmlAttributes.cpp qt_QWorkspace.cpp qt_QWizard.cpp qt_QWidgetStack.cpp qt_QWidgetList.cpp qt_QWidget.cpp qt_QWheelEvent.cpp qt_QWhatsThis.cpp qt_QWMatrix.cpp qt_QVariant.cpp qt_QValidator.cpp qt_QVGroupBox.cpp qt_QVButtonGroup.cpp qt_QVBoxLayout.cpp qt_QVBox.cpp qt_QUrlOperator.cpp qt_QUrlInfo.cpp qt_QUrl.cpp qt_QUriDrag.cpp qt_QTranslatorMessage.cpp qt_QTranslator.cpp qt_QToolTipGroup.cpp qt_QToolTip.cpp qt_QToolButton.cpp qt_QToolBar.cpp qt_QTimerEvent.cpp qt_QTimer.cpp qt_QTime.cpp qt_QTextView.cpp qt_QTextStream.cpp qt_QTextOStream.cpp qt_QTextIStream.cpp qt_QTextEncoder.cpp qt_QTextDrag.cpp qt_QTextDecoder.cpp qt_QTextCodec.cpp qt_QTextBrowser.cpp qt_QTableSelection.cpp qt_QTableItem.cpp qt_QTable.cpp qt_QTabWidget.cpp qt_QTabDialog.cpp qt_QTabBar.cpp qt_QStyleSheetItem.cpp qt_QStyleSheet.cpp qt_QStyle.cpp qt_QStringList.cpp qt_QString.cpp qt_QStrVec.cpp qt_QStrList.cpp qt_QStrIVec.cpp qt_QStrIList.cpp qt_QStoredDrag.cpp qt_QStatusBar.cpp qt_QSplitter.cpp qt_QSpinBox.cpp qt_QSpacerItem.cpp qt_QSound.cpp qt_QSocketNotifier.cpp qt_QSocketDevice.cpp qt_QSocket.cpp qt_QSlider.cpp qt_QSjisCodec.cpp qt_QSizePolicy.cpp qt_QSizeGrip.cpp qt_QSize.cpp qt_QSimpleRichText.cpp qt_QMenuItem.cpp qt_QByteArray.cpp qt_QSignalMapper.cpp qt_QSignal.cpp qt_QShowEvent.cpp qt_QShared.cpp qt_QSessionManager.cpp qt_QServerSocket.cpp qt_QSemiModal.cpp qt_QScrollView.cpp qt_QScrollBar.cpp qt_QResizeEvent.cpp qt_QRegion.cpp qt_QRegExp.cpp qt_QRect.cpp qt_QRangeControl.cpp qt_QRadioButton.cpp qt_QPushButton.cpp qt_QProgressDialog.cpp qt_QProgressBar.cpp qt_QPrinter.cpp qt_QPrintDialog.cpp qt_QPopupMenu.cpp qt_QPolygonScanner.cpp qt_QPointArray.cpp qt_QPoint.cpp qt_QPixmapCache.cpp qt_QPixmap.cpp qt_QPicture.cpp qt_QPen.cpp qt_QPalette.cpp qt_QPainter.cpp qt_QPaintEvent.cpp qt_QPaintDeviceX11Data.cpp qt_QPaintDeviceMetrics.cpp qt_QPaintDevice.cpp qt_QObjectList.cpp qt_QObjectDictionary.cpp qt_QObject.cpp qt_QNetworkProtocolFactoryBase.cpp qt_QNetworkProtocol.cpp qt_QNetworkOperation.cpp qt_QMultiLineEdit.cpp qt_QMovie.cpp qt_QMoveEvent.cpp qt_QMouseEvent.cpp qt_QMimeSourceFactory.cpp qt_QMimeSource.cpp qt_QMetaProperty.cpp qt_QMetaObject.cpp qt_QMetaEnum.cpp qt_QMetaData.cpp qt_QMessageBox.cpp qt_QMenuData.cpp qt_QMenuBar.cpp qt_QMainWindow.cpp qt_QLocalFs.cpp qt_QListViewItemIterator.cpp qt_QListViewItem.cpp qt_QListView.cpp qt_QListBoxText.cpp qt_QListBoxPixmap.cpp qt_QListBoxItem.cpp qt_QListBox.cpp qt_QLineEdit.cpp qt_QLayoutIterator.cpp qt_QLayoutItem.cpp qt_QLayout.cpp qt_QLabel.cpp qt_QLCDNumber.cpp qt_QKeyEvent.cpp qt_QJpUnicodeConv.cpp qt_QJisCodec.cpp qt_QIntValidator.cpp qt_QInputDialog.cpp qt_QImageTextKeyLang.cpp qt_QImageIO.cpp qt_QImageFormatType.cpp qt_QImageFormat.cpp qt_QImageDrag.cpp qt_QImageDecoder.cpp qt_QImageConsumer.cpp qt_QImage.cpp qt_QIconViewItem.cpp qt_QIconView.cpp qt_QIconSet.cpp qt_QIconDragItem.cpp qt_QIconDrag.cpp qt_QIODeviceSource.cpp qt_QIODevice.cpp qt_QHostAddress.cpp qt_QHideEvent.cpp qt_QHebrewCodec.cpp qt_QHeader.cpp qt_QHGroupBox.cpp qt_QHButtonGroup.cpp qt_QHBoxLayout.cpp qt_QHBox.cpp qt_QGroupBox.cpp qt_QGridLayout.cpp qt_QGrid.cpp qt_QGDictIterator.cpp qt_QGDict.cpp qt_QGCacheIterator.cpp qt_QGCache.cpp qt_QGArray.cpp qt_QFtp.cpp qt_QFrame.cpp qt_QFontMetrics.cpp qt_QFontInfo.cpp qt_QFontDialog.cpp qt_QFontDatabase.cpp qt_QFont.cpp qt_QFocusEvent.cpp qt_QFocusData.cpp qt_QFilePreview.cpp qt_QFileInfo.cpp qt_QFileIconProvider.cpp qt_QFileDialog.cpp qt_QFile.cpp qt_QEvent.cpp qt_QEucKrCodec.cpp qt_QEucJpCodec.cpp qt_QDropSite.cpp qt_QDropEvent.cpp qt_QDragResponseEvent.cpp qt_QDragObject.cpp qt_QDragMoveEvent.cpp qt_QDragManager.cpp qt_QDragLeaveEvent.cpp qt_QDragEnterEvent.cpp qt_QDoubleValidator.cpp qt_QDomText.cpp qt_QDomProcessingInstruction.cpp qt_QDomNotation.cpp qt_QDomNodeList.cpp qt_QDomNode.cpp qt_QDomNamedNodeMap.cpp qt_QDomImplementation.cpp qt_QDomEntityReference.cpp qt_QDomEntity.cpp qt_QDomElement.cpp qt_QDomDocumentType.cpp qt_QDomDocumentFragment.cpp qt_QDomDocument.cpp qt_QDomComment.cpp qt_QDomCharacterData.cpp qt_QDomCDATASection.cpp qt_QDomAttr.cpp qt_QDns.cpp qt_QDirSortItem.cpp qt_QDir.cpp qt_QDialog.cpp qt_QDial.cpp qt_QDateTime.cpp qt_QDate.cpp qt_QDataStream.cpp qt_QDataSource.cpp qt_QDataSink.cpp qt_QDataPump.cpp qt_QCustomMenuItem.cpp qt_QCustomEvent.cpp qt_QCursor.cpp qt_QConstString.cpp qt_QConnectionList.cpp qt_QConnection.cpp qt_QCommonStyle.cpp qt_QComboBox.cpp qt_QColorGroup.cpp qt_QColorDrag.cpp qt_QColorDialog.cpp qt_QColor.cpp qt_QCloseEvent.cpp qt_QClipboard.cpp qt_QClassInfo.cpp qt_QChildEvent.cpp qt_QCheckListItem.cpp qt_QCheckBox.cpp qt_QCharRef.cpp qt_QChar.cpp qt_QCanvasView.cpp qt_QCanvasText.cpp qt_QCanvasSprite.cpp qt_QCanvasRectangle.cpp qt_QCanvasPolygonalItem.cpp qt_QCanvasPolygon.cpp qt_QCanvasPixmapArray.cpp qt_QCanvasPixmap.cpp qt_QCanvasLine.cpp qt_QCanvasItemList.cpp qt_QCanvasItem.cpp qt_QCanvasEllipse.cpp qt_QCanvas.cpp qt_QCString.cpp qt_QButtonGroup.cpp qt_QButton.cpp qt_QBuffer.cpp qt_QBrush.cpp qt_QBoxLayout.cpp qt_QBitmap.cpp qt_QBitVal.cpp qt_QBitArray.cpp qt_QBig5Codec.cpp qt_QAuServer.cpp qt_QAsyncIO.cpp qt_QApplication.cpp qt_QActionGroup.cpp qt_QAction.cpp qt_QAccel.cpp qt_EventFilter.cpp qt_QWidgetFactory.cpp
- KDE_OPTIONS = qtonly
- 
- 

Modified: trunk/packages/kdebindings/debian/patches/017-install-jnilibs-in-lib-jni.diff
===================================================================
--- trunk/packages/kdebindings/debian/patches/017-install-jnilibs-in-lib-jni.diff	2004-08-02 23:44:53 UTC (rev 146)
+++ trunk/packages/kdebindings/debian/patches/017-install-jnilibs-in-lib-jni.diff	2004-08-05 20:45:51 UTC (rev 147)
@@ -1,10 +1,10 @@
 Index: kdebindings/kdejava/koala/kdejava/Makefile.am
 ===================================================================
 RCS file: /home/kde/kdebindings/kdejava/koala/kdejava/Makefile.am,v
-retrieving revision 1.42.2.1
-diff -u -r1.42.2.1 Makefile.am
---- kdebindings/kdejava/koala/kdejava/Makefile.am	1 Apr 2004 01:11:20 -0000	1.42.2.1
-+++ kdebindings/kdejava/koala/kdejava/Makefile.am	2 Apr 2004 12:21:54 -0000
+retrieving revision 1.45
+diff -u -r1.45 Makefile.am
+--- kdebindings/kdejava/koala/kdejava/Makefile.am	1 Jun 2004 15:02:35 -0000	1.45
++++ kdebindings/kdejava/koala/kdejava/Makefile.am	20 Jul 2004 18:31:17 -0000
 @@ -1,5 +1,6 @@
  ####### kdevelop will overwrite this part!!! (begin)##########
 -lib_LTLIBRARIES = libkdejava.la
@@ -16,14 +16,15 @@
 Index: kdebindings/qtjava/javalib/qtjava/Makefile.am
 ===================================================================
 RCS file: /home/kde/kdebindings/qtjava/javalib/qtjava/Makefile.am,v
-retrieving revision 1.26.2.2
-diff -u -r1.26.2.2 Makefile.am
---- kdebindings/qtjava/javalib/qtjava/Makefile.am	1 Apr 2004 01:15:32 -0000	1.26.2.2
-+++ kdebindings/qtjava/javalib/qtjava/Makefile.am	2 Apr 2004 12:21:54 -0000
-@@ -1,5 +1,6 @@
+retrieving revision 1.30
+diff -u -r1.30 Makefile.am
+--- kdebindings/qtjava/javalib/qtjava/Makefile.am	12 Apr 2004 12:06:39 -0000	1.30
++++ kdebindings/qtjava/javalib/qtjava/Makefile.am	20 Jul 2004 18:31:17 -0000
+@@ -1,5 +1,7 @@
  ####### kdevelop will overwrite this part!!! (begin)##########
--lib_LTLIBRARIES = libqtjava.la
+-lib_LTLIBRARIES = libqtjava.la libqtjavasupport.la
 +jniloc_LTLIBRARIES = libqtjava.la
++lib_LTLIBRARIES = libqtjavasupport.la
 +jnilocdir = $(libdir)/jni
  
  

Deleted: trunk/packages/kdebindings/debian/patches/019-libqtjavasupport_la.diff
===================================================================
--- trunk/packages/kdebindings/debian/patches/019-libqtjavasupport_la.diff	2004-08-02 23:44:53 UTC (rev 146)
+++ trunk/packages/kdebindings/debian/patches/019-libqtjavasupport_la.diff	2004-08-05 20:45:51 UTC (rev 147)
@@ -1,34 +0,0 @@
---- kdebindings/qtjava/javalib/qtjava/Makefile.am.old	2004-04-06 02:15:38.000000000 +0200
-+++ kdebindings/qtjava/javalib/qtjava/Makefile.am	2004-04-06 02:18:50.000000000 +0200
-@@ -8,7 +8,7 @@
- 
- AM_LDFLAGS = 
- 
--libqtjava_la_SOURCES = JavaSlot.cpp QSyntaxHighlighter.cpp QToolBox.cpp QSplashScreen.cpp QSpinWidget.cpp QHttpResponseHeader.cpp QHttpRequestHeader.cpp QHttpHeader.cpp QEventLoop.cpp QGb18030Codec.cpp QXmlSimpleReader.cpp QXmlReader.cpp QXmlParseException.cpp QXmlNamespaceSupport.cpp QXmlLocator.cpp QXmlLexicalHandler.cpp QXmlInputSource.cpp QXmlErrorHandler.cpp QXmlEntityResolver.cpp QXmlDTDHandler.cpp QXmlDefaultHandler.cpp QXmlDeclHandler.cpp QXmlContentHandler.cpp QXmlAttributes.cpp QWorkspace.cpp QWMatrix.cpp QWizard.cpp QWidgetStack.cpp QWidgetItem.cpp QWidget.cpp QWheelEvent.cpp QWhatsThis.cpp QVGroupBox.cpp QVButtonGroup.cpp QVBoxLayout.cpp QVBox.cpp QVariant.cpp QValidator.cpp QUuid.cpp QUtf8Codec.cpp QUtf16Codec.cpp QUrlOperator.cpp QUrlInfo.cpp QUrl.cpp QUriDrag.cpp QtSupport.cpp QTsciiCodec.cpp QTranslatorMessage.cpp QTranslator.cpp QToolTipGroup.cpp QToolTip.cpp QToolButton.cpp QToolBar.cpp qtjava.cpp QTimerEvent.cpp QTimer.cpp QTimeEdit.cpp QTextView.cpp QTextStream.cpp QTextOStream.cpp QTextIStream.cpp QTextEncoder.cpp QTextEdit.cpp QTextDrag.cpp QTextDecoder.cpp QTextCodec.cpp QTextBrowser.cpp QTabWidget.cpp QTabletEvent.cpp QTableSelection.cpp QTableItem.cpp QTable.cpp QTabDialog.cpp QTabBar.cpp QTab.cpp Qt.cpp QStyleSheetItem.cpp QStyleSheet.cpp QStyleFactory.cpp QStyle.cpp QStoredDrag.cpp QStatusBar.cpp QSqlResult.cpp QSqlRecord.cpp QSqlQuery.cpp QSqlPropertyMap.cpp QSqlIndex.cpp QSqlForm.cpp QSqlField.cpp QSqlError.cpp QSqlEditorFactory.cpp QSqlDriver.cpp QSqlDatabase.cpp QSqlCursor.cpp QSql.cpp QSplitter.cpp QSpinBox.cpp QSpacerItem.cpp QSound.cpp QSocketNotifier.cpp QSocketDevice.cpp QSocket.cpp QSlider.cpp QSjisCodec.cpp QSizePolicy.cpp QSizeGrip.cpp QSize.cpp QSimpleRichText.cpp QSignalMapper.cpp QSignal.cpp QShowEvent.cpp QSettings.cpp QSessionManager.cpp QServerSocket.cpp QSemiModal.cpp QScrollView.cpp QScrollBar.cpp QResizeEvent.cpp QRegion.cpp QRegExpValidator.cpp QRegExp.cpp QRect.cpp QRangeControl.cpp QRadioButton.cpp QPushButton.cpp QProgressDialog.cpp QProgressBar.cpp QProcess.cpp QPrinter.cpp QPrintDialog.cpp QPopupMenu.cpp QPolygonScanner.cpp QPointArray.cpp QPoint.cpp QPixmap.cpp QPicture.cpp QPen.cpp QPalette.cpp QPaintEvent.cpp QPainter.cpp QPaintDeviceMetrics.cpp QPaintDevice.cpp QObjectCleanupHandler.cpp QObject.cpp QNetworkProtocol.cpp QNetworkOperation.cpp QMultiLineEdit.cpp QMovie.cpp QMoveEvent.cpp QMouseEvent.cpp QMimeSourceFactory.cpp QMimeSource.cpp QMetaProperty.cpp QMetaObject.cpp QMetaEnum.cpp QMetaData.cpp QMessageBox.cpp QMenuItem.cpp QMenuData.cpp QMenuBar.cpp QMainWindow.cpp QLocalFs.cpp QListViewItem.cpp QListView.cpp QListBoxText.cpp QListBoxPixmap.cpp QListBoxItem.cpp QListBox.cpp QLineEdit.cpp QLibrary.cpp QLCDNumber.cpp QLayoutItem.cpp QLayout.cpp QLabel.cpp QKeySequence.cpp QKeyEvent.cpp QJpUnicodeConv.cpp QJisCodec.cpp QIODeviceSource.cpp QIODevice.cpp QIntValidator.cpp QInputDialog.cpp QIMEvent.cpp QImageTextKeyLang.cpp QImageIO.cpp QImageFormatType.cpp QImageFormat.cpp QImageDrag.cpp QImageDecoder.cpp QImageConsumer.cpp QImage.cpp QIconViewItem.cpp QIconView.cpp QIconSet.cpp QIconDragItem.cpp QIconDrag.cpp QHttp.cpp QHostAddress.cpp QHideEvent.cpp QHGroupBox.cpp QHebrewCodec.cpp QHeader.cpp QHButtonGroup.cpp QHBoxLayout.cpp QHBox.cpp QGroupBox.cpp QGridView.cpp QGridLayout.cpp QGrid.cpp QFtp.cpp QFrame.cpp QFontMetrics.cpp QFontInfo.cpp QFontDialog.cpp QFontDatabase.cpp QFont.cpp QFocusEvent.cpp QFocusData.cpp QFilePreview.cpp QFileInfo.cpp QFileIconProvider.cpp QFileDialog.cpp QFile.cpp QEvent.cpp QEucKrCodec.cpp QEucJpCodec.cpp QErrorMessage.cpp QEditorFactory.cpp QDropSite.cpp QDropEvent.cpp QDragResponseEvent.cpp QDragObject.cpp QDragMoveEvent.cpp QDragManager.cpp QDragLeaveEvent.cpp QDragEnterEvent.cpp QDoubleValidator.cpp QDomText.cpp QDomProcessingInstruction.cpp QDomNotation.cpp QDomNode.cpp QDomNamedNodeMap.cpp QDomImplementation.cpp QDomEntityReference.cpp QDomEntity.cpp QDomElement.cpp QDomDocumentType.cpp QDomDocumentFragment.cpp QDomDocument.cpp QDomComment.cpp QDomCharacterData.cpp QDomCDATASection.cpp QDomAttr.cpp QDockWindow.cpp QDockArea.cpp QDir.cpp QDialog.cpp QDial.cpp QDesktopWidget.cpp QDateTimeEditBase.cpp QDateTimeEdit.cpp QDateEdit.cpp QDataView.cpp QDataTable.cpp QDataStream.cpp QDataSource.cpp QDataSink.cpp QDataPump.cpp QDataBrowser.cpp QCustomMenuItem.cpp QCustomEvent.cpp QCursor.cpp QContextMenuEvent.cpp QComboTableItem.cpp QComboBox.cpp QColorGroup.cpp QColorDrag.cpp QColorDialog.cpp QColor.cpp QCloseEvent.cpp QClipboard.cpp QClassInfo.cpp QChildEvent.cpp QCheckTableItem.cpp QCheckListItem.cpp QCheckBox.cpp QCanvasView.cpp QCanvasText.cpp QCanvasSprite.cpp QCanvasSpline.cpp QCanvasRectangle.cpp QCanvasPolygonalItem.cpp QCanvasPolygon.cpp QCanvasPixmapArray.cpp QCanvasPixmap.cpp QCanvasLine.cpp QCanvasItem.cpp QCanvasEllipse.cpp QCanvas.cpp QButtonGroup.cpp QButton.cpp QBuffer.cpp QBrush.cpp QBoxLayout.cpp QBitmap.cpp QBig5Codec.cpp QAuServer.cpp QAsyncIO.cpp QApplication.cpp QActionGroup.cpp QAction.cpp QAccel.cpp 
-+libqtjava_la_SOURCES = QSyntaxHighlighter.cpp QToolBox.cpp QSplashScreen.cpp QSpinWidget.cpp QHttpResponseHeader.cpp QHttpRequestHeader.cpp QHttpHeader.cpp QEventLoop.cpp QGb18030Codec.cpp QXmlSimpleReader.cpp QXmlReader.cpp QXmlParseException.cpp QXmlNamespaceSupport.cpp QXmlLocator.cpp QXmlLexicalHandler.cpp QXmlInputSource.cpp QXmlErrorHandler.cpp QXmlEntityResolver.cpp QXmlDTDHandler.cpp QXmlDefaultHandler.cpp QXmlDeclHandler.cpp QXmlContentHandler.cpp QXmlAttributes.cpp QWorkspace.cpp QWMatrix.cpp QWizard.cpp QWidgetStack.cpp QWidgetItem.cpp QWidget.cpp QWheelEvent.cpp QWhatsThis.cpp QVGroupBox.cpp QVButtonGroup.cpp QVBoxLayout.cpp QVBox.cpp QVariant.cpp QValidator.cpp QUuid.cpp QUtf8Codec.cpp QUtf16Codec.cpp QUrlOperator.cpp QUrlInfo.cpp QUrl.cpp QUriDrag.cpp QTsciiCodec.cpp QTranslatorMessage.cpp QTranslator.cpp QToolTipGroup.cpp QToolTip.cpp QToolButton.cpp QToolBar.cpp qtjava.cpp QTimerEvent.cpp QTimer.cpp QTimeEdit.cpp QTextView.cpp QTextStream.cpp QTextOStream.cpp QTextIStream.cpp QTextEncoder.cpp QTextEdit.cpp QTextDrag.cpp QTextDecoder.cpp QTextCodec.cpp QTextBrowser.cpp QTabWidget.cpp QTabletEvent.cpp QTableSelection.cpp QTableItem.cpp QTable.cpp QTabDialog.cpp QTabBar.cpp QTab.cpp Qt.cpp QStyleSheetItem.cpp QStyleSheet.cpp QStyleFactory.cpp QStyle.cpp QStoredDrag.cpp QStatusBar.cpp QSqlResult.cpp QSqlRecord.cpp QSqlQuery.cpp QSqlPropertyMap.cpp QSqlIndex.cpp QSqlForm.cpp QSqlField.cpp QSqlError.cpp QSqlEditorFactory.cpp QSqlDriver.cpp QSqlDatabase.cpp QSqlCursor.cpp QSql.cpp QSplitter.cpp QSpinBox.cpp QSpacerItem.cpp QSound.cpp QSocketNotifier.cpp QSocketDevice.cpp QSocket.cpp QSlider.cpp QSjisCodec.cpp QSizePolicy.cpp QSizeGrip.cpp QSize.cpp QSimpleRichText.cpp QSignalMapper.cpp QSignal.cpp QShowEvent.cpp QSettings.cpp QSessionManager.cpp QServerSocket.cpp QSemiModal.cpp QScrollView.cpp QScrollBar.cpp QResizeEvent.cpp QRegion.cpp QRegExpValidator.cpp QRegExp.cpp QRect.cpp QRangeControl.cpp QRadioButton.cpp QPushButton.cpp QProgressDialog.cpp QProgressBar.cpp QProcess.cpp QPrinter.cpp QPrintDialog.cpp QPopupMenu.cpp QPolygonScanner.cpp QPointArray.cpp QPoint.cpp QPixmap.cpp QPicture.cpp QPen.cpp QPalette.cpp QPaintEvent.cpp QPainter.cpp QPaintDeviceMetrics.cpp QPaintDevice.cpp QObjectCleanupHandler.cpp QObject.cpp QNetworkProtocol.cpp QNetworkOperation.cpp QMultiLineEdit.cpp QMovie.cpp QMoveEvent.cpp QMouseEvent.cpp QMimeSourceFactory.cpp QMimeSource.cpp QMetaProperty.cpp QMetaObject.cpp QMetaEnum.cpp QMetaData.cpp QMessageBox.cpp QMenuItem.cpp QMenuData.cpp QMenuBar.cpp QMainWindow.cpp QLocalFs.cpp QListViewItem.cpp QListView.cpp QListBoxText.cpp QListBoxPixmap.cpp QListBoxItem.cpp QListBox.cpp QLineEdit.cpp QLibrary.cpp QLCDNumber.cpp QLayoutItem.cpp QLayout.cpp QLabel.cpp QKeySequence.cpp QKeyEvent.cpp QJpUnicodeConv.cpp QJisCodec.cpp QIODeviceSource.cpp QIODevice.cpp QIntValidator.cpp QInputDialog.cpp QIMEvent.cpp QImageTextKeyLang.cpp QImageIO.cpp QImageFormatType.cpp QImageFormat.cpp QImageDrag.cpp QImageDecoder.cpp QImageConsumer.cpp QImage.cpp QIconViewItem.cpp QIconView.cpp QIconSet.cpp QIconDragItem.cpp QIconDrag.cpp QHttp.cpp QHostAddress.cpp QHideEvent.cpp QHGroupBox.cpp QHebrewCodec.cpp QHeader.cpp QHButtonGroup.cpp QHBoxLayout.cpp QHBox.cpp QGroupBox.cpp QGridView.cpp QGridLayout.cpp QGrid.cpp QFtp.cpp QFrame.cpp QFontMetrics.cpp QFontInfo.cpp QFontDialog.cpp QFontDatabase.cpp QFont.cpp QFocusEvent.cpp QFocusData.cpp QFilePreview.cpp QFileInfo.cpp QFileIconProvider.cpp QFileDialog.cpp QFile.cpp QEvent.cpp QEucKrCodec.cpp QEucJpCodec.cpp QErrorMessage.cpp QEditorFactory.cpp QDropSite.cpp QDropEvent.cpp QDragResponseEvent.cpp QDragObject.cpp QDragMoveEvent.cpp QDragManager.cpp QDragLeaveEvent.cpp QDragEnterEvent.cpp QDoubleValidator.cpp QDomText.cpp QDomProcessingInstruction.cpp QDomNotation.cpp QDomNode.cpp QDomNamedNodeMap.cpp QDomImplementation.cpp QDomEntityReference.cpp QDomEntity.cpp QDomElement.cpp QDomDocumentType.cpp QDomDocumentFragment.cpp QDomDocument.cpp QDomComment.cpp QDomCharacterData.cpp QDomCDATASection.cpp QDomAttr.cpp QDockWindow.cpp QDockArea.cpp QDir.cpp QDialog.cpp QDial.cpp QDesktopWidget.cpp QDateTimeEditBase.cpp QDateTimeEdit.cpp QDateEdit.cpp QDataView.cpp QDataTable.cpp QDataStream.cpp QDataSource.cpp QDataSink.cpp QDataPump.cpp QDataBrowser.cpp QCustomMenuItem.cpp QCustomEvent.cpp QCursor.cpp QContextMenuEvent.cpp QComboTableItem.cpp QComboBox.cpp QColorGroup.cpp QColorDrag.cpp QColorDialog.cpp QColor.cpp QCloseEvent.cpp QClipboard.cpp QClassInfo.cpp QChildEvent.cpp QCheckTableItem.cpp QCheckListItem.cpp QCheckBox.cpp QCanvasView.cpp QCanvasText.cpp QCanvasSprite.cpp QCanvasSpline.cpp QCanvasRectangle.cpp QCanvasPolygonalItem.cpp QCanvasPolygon.cpp QCanvasPixmapArray.cpp QCanvasPixmap.cpp QCanvasLine.cpp QCanvasItem.cpp QCanvasEllipse.cpp QCanvas.cpp QButtonGroup.cpp QButton.cpp QBuffer.cpp QBrush.cpp QBoxLayout.cpp QBitmap.cpp QBig5Codec.cpp QAuServer.cpp QAsyncIO.cpp QApplication.cpp QActionGroup.cpp QAction.cpp QAccel.cpp 
- KDE_OPTIONS = qtonly
- 
- 
-@@ -27,5 +27,11 @@
- # of your shared lib (published for the users)
- noinst_HEADERS = QtSupport.h JavaSlot.h
- 
-+lib_LTLIBRARIES = libqtjavasupport.la
-+libqtjavasupport_la_SOURCES = JavaSlot.cpp QtSupport.cpp
-+libqtjavasupport_la_LDFLAGS = $(all_libraries) -no-undefined -version-info 1:0:0
-+libqtjavasupport_la_LIBADD = $(LIB_QT)
-+
- libqtjava_la_LDFLAGS = $(all_libraries) -no-undefined -version-info 1:0:0
--libqtjava_la_LIBADD =  $(LIB_QT)
-+libqtjava_la_LIBADD =  $(LIB_QT) libqtjavasupport.la
-+
---- kdebindings/kdejava/koala/kdejava/Makefile.am.old	2004-04-06 02:19:42.000000000 +0200
-+++ kdebindings/kdejava/koala/kdejava/Makefile.am	2004-04-06 02:24:01.000000000 +0200
-@@ -33,6 +33,6 @@
- 
- libkdejava_la_LDFLAGS = $(all_libraries) -no-undefined -version-info $(SOMAJOR):$(SOMINOR):$(SOSUBMINOR) 
- 
--libkdejava_la_LIBADD = $(top_builddir)/qtjava/javalib/qtjava/libqtjava.la -lkmdi $(LIB_KHTML) $(LIB_KSPELL) $(LIB_KIO)
-+libkdejava_la_LIBADD = $(top_builddir)/qtjava/javalib/qtjava/libqtjavasupport.la -lkmdi $(LIB_KHTML) $(LIB_KSPELL) $(LIB_KIO)
- 
- KDE_OPTIONS = qtonly

Deleted: trunk/packages/kdebindings/debian/patches/020-cleanjarfiles.diff
===================================================================
--- trunk/packages/kdebindings/debian/patches/020-cleanjarfiles.diff	2004-08-02 23:44:53 UTC (rev 146)
+++ trunk/packages/kdebindings/debian/patches/020-cleanjarfiles.diff	2004-08-05 20:45:51 UTC (rev 147)
@@ -1,32 +0,0 @@
-Index: kdebindings/kdejava/koala/Makefile.am
-===================================================================
-RCS file: /home/kde/kdebindings/kdejava/koala/Makefile.am,v
-retrieving revision 1.16.2.1
-diff -u -r1.16.2.1 Makefile.am
---- kdebindings/kdejava/koala/Makefile.am	1 Apr 2004 00:59:28 -0000	1.16.2.1
-+++ kdebindings/kdejava/koala/Makefile.am	6 Apr 2004 20:07:57 -0000
-@@ -39,7 +39,7 @@
- koala_LDFLAGS = $(all_libraries) $(KDE_RPATH)
- 
- # them while "make clean", use CLEANFILES
--DISTCLEANFILES = $(koala_METASOURCES)
-+CLEANFILES = koala.jar
- 
- # make messages.po. Move this one to ../po/ and "make merge" in po
- # the -x is for skipping messages already translated in kdelibs
-Index: kdebindings/qtjava/javalib/Makefile.am
-===================================================================
-RCS file: /home/kde/kdebindings/qtjava/javalib/Makefile.am,v
-retrieving revision 1.5.6.1
-diff -u -r1.5.6.1 Makefile.am
---- kdebindings/qtjava/javalib/Makefile.am	1 Apr 2004 00:58:04 -0000	1.5.6.1
-+++ kdebindings/qtjava/javalib/Makefile.am	6 Apr 2004 20:07:57 -0000
-@@ -32,7 +32,7 @@
- javalib_LDFLAGS = $(all_libraries) 
- 
- # them while "make clean", use CLEANFILES
--DISTCLEANFILES = $(javalib_test_METASOURCES)
-+CLEANFILES = koala.jar
- 
- 
- 

Added: trunk/packages/kdebindings/debian/patches/021-dont-install-example-kjsembed-plugins.diff
===================================================================
--- trunk/packages/kdebindings/debian/patches/021-dont-install-example-kjsembed-plugins.diff	2004-08-02 23:44:53 UTC (rev 146)
+++ trunk/packages/kdebindings/debian/patches/021-dont-install-example-kjsembed-plugins.diff	2004-08-05 20:45:51 UTC (rev 147)
@@ -0,0 +1,25 @@
+Index: kdebindings/kjsembed/plugins/Makefile.am
+===================================================================
+RCS file: /home/kde/kdebindings/kjsembed/plugins/Makefile.am,v
+retrieving revision 1.4
+diff -u -r1.4 Makefile.am
+--- kdebindings/kjsembed/plugins/Makefile.am	12 Apr 2004 14:00:42 -0000	1.4
++++ kdebindings/kjsembed/plugins/Makefile.am	2 Aug 2004 18:46:54 -0000
+@@ -1,7 +1,8 @@
+ INCLUDES= -I$(srcdir)/../.. $(all_includes)
+ KDE_CXXFLAGS = -DQT_NO_ASCII_CAST -DQT_CLEAN_NAMESPACE
+ 
+-kde_module_LTLIBRARIES = libcustomobjectplugin.la libcustomqobjectplugin.la libimagefxplugin.la libqprocessplugin.la
++kde_module_LTLIBRARIES = libimagefxplugin.la libqprocessplugin.la
++noinst_LTLIBRARIES = libcustomobjectplugin.la libcustomqobjectplugin.la 
+ 
+ # the Plugin's source, library search path, and link libraries
+ libcustomobjectplugin_la_SOURCES = customobject_plugin.cpp
+@@ -27,5 +28,6 @@
+ 
+ # this is where the desktop file will go
+ plugindesktopdir   = $(kde_servicesdir)
+-plugindesktop_DATA = customobject_plugin.desktop customqobject_plugin.desktop imagefx_plugin.desktop qprocess_plugin.desktop
++plugindesktop_DATA = imagefx_plugin.desktop qprocess_plugin.desktop
++noinst_DATA = customobject_plugin.desktop customqobject_plugin.desktop
+ 

Added: trunk/packages/kdebindings/debian/patches/023-dont-install-jsaccess.diff
===================================================================
--- trunk/packages/kdebindings/debian/patches/023-dont-install-jsaccess.diff	2004-08-02 23:44:53 UTC (rev 146)
+++ trunk/packages/kdebindings/debian/patches/023-dont-install-jsaccess.diff	2004-08-05 20:45:51 UTC (rev 147)
@@ -0,0 +1,16 @@
+Index: kdebindings/kjsembed/cpptests/jsaccess/Makefile.am
+===================================================================
+RCS file: /home/kde/kdebindings/kjsembed/cpptests/jsaccess/Makefile.am,v
+retrieving revision 1.1
+diff -u -r1.1 Makefile.am
+--- kdebindings/kjsembed/cpptests/jsaccess/Makefile.am	7 May 2004 21:11:48 -0000	1.1
++++ kdebindings/kjsembed/cpptests/jsaccess/Makefile.am	4 Aug 2004 19:33:04 -0000
+@@ -5,7 +5,7 @@
+ 
+ INCLUDES += -DQT_CLEAN_NAMESPACE -DQT_NO_ASCII_CAST
+ 
+-bin_PROGRAMS    = jsaccess
++noinst_PROGRAMS    = jsaccess
+ 
+ jsaccess_SOURCES =        jsaccess.cpp
+ jsaccess_LDFLAGS =        $(all_libraries) $(KDE_RPATH)

Added: trunk/packages/kdebindings/debian/patches/024-dont-install-javalib-test-program.diff
===================================================================
--- trunk/packages/kdebindings/debian/patches/024-dont-install-javalib-test-program.diff	2004-08-02 23:44:53 UTC (rev 146)
+++ trunk/packages/kdebindings/debian/patches/024-dont-install-javalib-test-program.diff	2004-08-05 20:45:51 UTC (rev 147)
@@ -0,0 +1,14 @@
+Index: kdebindings/qtjava/javalib/Makefile.am
+===================================================================
+RCS file: /home/kde/kdebindings/qtjava/javalib/Makefile.am,v
+retrieving revision 1.8
+diff -u -r1.8 Makefile.am
+--- kdebindings/qtjava/javalib/Makefile.am	12 Apr 2004 11:35:01 -0000	1.8
++++ kdebindings/qtjava/javalib/Makefile.am	4 Aug 2004 21:44:11 -0000
+@@ -1,5 +1,5 @@
+ ####### kdevelop will overwrite this part!!! (begin)##########
+-bin_PROGRAMS = javalib
++noinst_PROGRAMS = javalib
+ 
+ ## INCLUDES were found outside kdevelop specific part
+ 

Added: trunk/packages/kdebindings/debian/patches/025-dont-install-koala-test-program.diff
===================================================================
--- trunk/packages/kdebindings/debian/patches/025-dont-install-koala-test-program.diff	2004-08-02 23:44:53 UTC (rev 146)
+++ trunk/packages/kdebindings/debian/patches/025-dont-install-koala-test-program.diff	2004-08-05 20:45:51 UTC (rev 147)
@@ -0,0 +1,14 @@
+Index: kdebindings/kdejava/koala/Makefile.am
+===================================================================
+RCS file: /home/kde/kdebindings/kdejava/koala/Makefile.am,v
+retrieving revision 1.18
+diff -u -r1.18 Makefile.am
+--- kdebindings/kdejava/koala/Makefile.am	12 Apr 2004 11:27:25 -0000	1.18
++++ kdebindings/kdejava/koala/Makefile.am	4 Aug 2004 21:45:32 -0000
+@@ -1,5 +1,5 @@
+ ####### kdevelop will overwrite this part!!! (begin)##########
+-bin_PROGRAMS = koala
++noinst_PROGRAMS = koala
+ 
+ ## INCLUDES were found outside kdevelop specific part
+ 

Added: trunk/packages/kdebindings/debian/patches/026-install-qtruby-and-korundum-in-usr.diff
===================================================================
--- trunk/packages/kdebindings/debian/patches/026-install-qtruby-and-korundum-in-usr.diff	2004-08-02 23:44:53 UTC (rev 146)
+++ trunk/packages/kdebindings/debian/patches/026-install-qtruby-and-korundum-in-usr.diff	2004-08-05 20:45:51 UTC (rev 147)
@@ -0,0 +1,102 @@
+Index: kdebindings/qtruby/rubylib/qtruby/configure.in.in
+===================================================================
+RCS file: /home/kde/kdebindings/qtruby/rubylib/qtruby/configure.in.in,v
+retrieving revision 1.9
+diff -u -r1.9 configure.in.in
+--- kdebindings/qtruby/rubylib/qtruby/configure.in.in	20 Jan 2004 23:09:13 -0000	1.9
++++ kdebindings/qtruby/rubylib/qtruby/configure.in.in	4 Aug 2004 22:08:31 -0000
+@@ -7,12 +7,14 @@
+   RUBY_ARCHDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"archdir"@:>@)'`
+   RUBY_SITEARCHDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"sitearchdir"@:>@)'`
+   RUBY_SITEDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"sitelibdir"@:>@)'`
++  RUBY_RUBYLIBDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"rubylibdir"@:>@)'`
+   RUBY_LIBDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"libdir"@:>@)'`
+   RUBY_LIBRUBYARG=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"LIBRUBYARG_SHARED"@:>@)'`
+   AC_MSG_RESULT([archdir $RUBY_ARCHDIR, sitearchdir $RUBY_SITEARCHDIR, sitedir $RUBY_SITEDIR, libdir $RUBY_LIBDIR, librubyarg $RUBY_LIBRUBYARG])
+   AC_SUBST(RUBY_ARCHDIR)
+   AC_SUBST(RUBY_SITEARCHDIR)
+   AC_SUBST(RUBY_SITEDIR)
++  AC_SUBST(RUBY_RUBYLIBDIR)
+   AC_SUBST(RUBY_LIBDIR)
+   AC_SUBST(RUBY_LIBRUBYARG)
+ fi
+Index: kdebindings/qtruby/rubylib/qtruby/lib/Qt/Makefile.am
+===================================================================
+RCS file: /home/kde/kdebindings/qtruby/rubylib/qtruby/lib/Qt/Makefile.am,v
+retrieving revision 1.5
+diff -u -r1.5 Makefile.am
+--- kdebindings/qtruby/rubylib/qtruby/lib/Qt/Makefile.am	5 Jan 2004 23:46:50 -0000	1.5
++++ kdebindings/qtruby/rubylib/qtruby/lib/Qt/Makefile.am	4 Aug 2004 22:08:31 -0000
+@@ -1,5 +1,5 @@
+-rubylibdir = $(RUBY_SITEDIR)
++rubylibdir = $(RUBY_RUBYLIBDIR)
+ rubylib_DATA = Qt.rb
+ 
+-qtrubylibdir = $(RUBY_SITEDIR)/Qt
++qtrubylibdir = $(RUBY_RUBYLIBDIR)/Qt
+ qtrubylib_DATA = qtruby.rb
+Index: kdebindings/korundum/rubylib/korundum/lib/KDE/Makefile.am
+===================================================================
+RCS file: /home/kde/kdebindings/korundum/rubylib/korundum/lib/KDE/Makefile.am,v
+retrieving revision 1.2
+diff -u -r1.2 Makefile.am
+--- kdebindings/korundum/rubylib/korundum/lib/KDE/Makefile.am	5 Jan 2004 23:30:34 -0000	1.2
++++ kdebindings/korundum/rubylib/korundum/lib/KDE/Makefile.am	4 Aug 2004 22:08:31 -0000
+@@ -1,5 +1,5 @@
+-kderubylibdir = $(RUBY_SITEDIR)/KDE
++kderubylibdir = $(RUBY_RUBYLIBDIR)/KDE
+ kderubylib_DATA = korundum.rb
+ 
+-rubylibdir = $(RUBY_SITEDIR)
++rubylibdir = $(RUBY_RUBYLIBDIR)
+ rubylib_DATA = Korundum.rb
+Index: kdebindings/korundum/rubylib/korundum/configure.in.in
+===================================================================
+RCS file: /home/kde/kdebindings/korundum/rubylib/korundum/configure.in.in,v
+retrieving revision 1.2
+diff -u -r1.2 configure.in.in
+--- kdebindings/korundum/rubylib/korundum/configure.in.in	28 Dec 2003 13:41:48 -0000	1.2
++++ kdebindings/korundum/rubylib/korundum/configure.in.in	4 Aug 2004 22:08:31 -0000
+@@ -7,9 +7,11 @@
+   RUBY_ARCHDIR=`ruby -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"archdir"@:>@)'`
+   RUBY_SITEARCHDIR=`ruby -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"sitearchdir"@:>@)'`
+   RUBY_SITEDIR=`ruby -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"sitelibdir"@:>@)'`
++  RUBY_RUBYLIBDIR=`ruby -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"rubylibdir"@:>@)'`
+   AC_MSG_RESULT([archdir $RUBY_ARCHDIR, sitearchdir $RUBY_SITEARCHDIR, sitedir $RUBY_SITEDIR])
+   AC_SUBST(RUBY_ARCHDIR)
+   AC_SUBST(RUBY_SITEARCHDIR)
++  AC_SUBST(RUBY_RUBYLIBDIR)
+   AC_SUBST(RUBY_SITEDIR)
+ fi
+ 
+Index: kdebindings/qtruby/rubylib/qtruby/Makefile.am
+===================================================================
+RCS file: /home/kde/kdebindings/qtruby/rubylib/qtruby/Makefile.am,v
+retrieving revision 1.13
+diff -u -r1.13 Makefile.am
+--- kdebindings/qtruby/rubylib/qtruby/Makefile.am	5 Jan 2004 23:46:49 -0000	1.13
++++ kdebindings/qtruby/rubylib/qtruby/Makefile.am	4 Aug 2004 22:08:52 -0000
+@@ -6,7 +6,7 @@
+ libqtrubyinternal_la_SOURCES = Qt.cpp handlers.cpp 
+ libqtrubyinternal_la_METASOURCES = AUTO
+ 
+-rubylibdir = $(RUBY_SITEARCHDIR)
++rubylibdir = $(RUBY_ARCHDIR)
+ rubylib_LTLIBRARIES = qtruby.la
+ qtruby_la_SOURCES = 
+ qtruby_la_LDFLAGS = -module $(all_libraries) -version-info 0:0:0 -L$(top_srcdir)/smoke/qt/
+Index: kdebindings/korundum/rubylib/korundum/Makefile.am
+===================================================================
+RCS file: /home/kde/kdebindings/korundum/rubylib/korundum/Makefile.am,v
+retrieving revision 1.2
+diff -u -r1.2 Makefile.am
+--- kdebindings/korundum/rubylib/korundum/Makefile.am	5 Jan 2004 23:30:34 -0000	1.2
++++ kdebindings/korundum/rubylib/korundum/Makefile.am	4 Aug 2004 22:08:52 -0000
+@@ -1,6 +1,6 @@
+ INCLUDES = -I$(top_srcdir)/smoke -I$(top_srcdir)/qtruby/rubylib/qtruby $(all_includes) -I$(RUBY_ARCHDIR)
+ 
+-rubylibdir = $(RUBY_SITEARCHDIR)
++rubylibdir = $(RUBY_ARCHDIR)
+ rubylib_LTLIBRARIES = korundum.la
+ korundum_la_LDFLAGS = -module $(all_libraries) -version-info 0:0:0 -L$(top_srcdir)/smoke/kde/
+ korundum_la_METASOURCES = AUTO

Added: trunk/packages/kdebindings/debian/patches/027-fix-dcopjava-deps.diff
===================================================================
--- trunk/packages/kdebindings/debian/patches/027-fix-dcopjava-deps.diff	2004-08-02 23:44:53 UTC (rev 146)
+++ trunk/packages/kdebindings/debian/patches/027-fix-dcopjava-deps.diff	2004-08-05 20:45:51 UTC (rev 147)
@@ -0,0 +1,24 @@
+Index: kdebindings/dcopjava/binding/Makefile.am
+===================================================================
+RCS file: /home/kde/kdebindings/dcopjava/binding/Makefile.am,v
+retrieving revision 1.3.8.2
+diff -u -r1.3.8.2 Makefile.am
+--- kdebindings/dcopjava/binding/Makefile.am	10 May 2004 15:18:13 -0000	1.3.8.2
++++ kdebindings/dcopjava/binding/Makefile.am	5 Aug 2004 19:12:20 -0000
+@@ -6,10 +6,13 @@
+ 
+ INCLUDES = $(jni_includes) $(all_includes)
+ 
+-client.cpp: org_kde_DCOP_Client.h 
++client.$(OBJEXT): org_kde_DCOP_Client.h 
+ 
+-org_kde_DCOP_Client.h: org/kde/DCOP/Client.class
+-	CLASSPATH=$(srcdir) $(JAVAH) -jni org.kde.DCOP.Client
++client.lo: org_kde_DCOP_Client.h 
++
++org_kde_DCOP_Client.h:
++	$(MAKE) -C org
++	CLASSPATH=.:$(srcdir) $(JAVAH) -jni org.kde.DCOP.Client
+ 
+ SUBDIRS = org
+ 

Modified: trunk/packages/kdebindings/debian/rules
===================================================================
--- trunk/packages/kdebindings/debian/rules	2004-08-02 23:44:53 UTC (rev 146)
+++ trunk/packages/kdebindings/debian/rules	2004-08-05 20:45:51 UTC (rev 147)
@@ -11,21 +11,20 @@
 
 # These are used for cross-compiling and for saving the configure script
 # from having to guess our platform (since we know it already)
-DEB_HOST_GNU_TYPE       ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+	DEB_HOST_GNU_TYPE       ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE      ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
-CFLAGS = -Wall -g
+	CFLAGS = -Wall -g
 
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-       CFLAGS += -O0
-else
-       CFLAGS += -O2
-endif
+	CFLAGS += -O0
+	else
+	CFLAGS += -O2
+	endif
 ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
 	INSTALL_PROGRAM += -s
-endif
+	endif
 
-# I'd like to move to builddir!=srcdir when I can get upstream to build with it.
 objdir = $(CURDIR)/obj-$(DEB_BUILD_GNU_TYPE)
 upstream_version=`head -1 $(CURDIR)/debian/changelog | sed -e "s,.*:\([^-]*\).*,\1,"`
 
@@ -84,7 +83,7 @@
 	$(configkde) \
 	--with-java=/usr \
 	--with-pythondir=/usr/lib/python2.3/site-packages \
-	DO_NOT_COMPILE='dcopperl kalyptus kdeobjc korundum qtobjc qtruby qtsharp xparts'
+	DO_NOT_COMPILE='dcopperl kalyptus qtsharp xparts python'
 	# --enable-final
 
 	touch configure-stamp
@@ -100,10 +99,6 @@
 	cd $(objdir) && \
 	$(MAKE) -C dcopjava 
 
-#dcopperl is disabled
-#	cd dcopperl && $(PERL) Makefile.PL $(perlconfig) ; 
-#	$(MAKE) -C dcopperl
-
 	touch build-stamp
 
 debian-clean:
@@ -140,8 +135,8 @@
 
 	# if Makefile exists run distclean
 	if test -f Makefile; then \
-		$(MAKE) distclean; \
-		$(MAKE) -C dcopjava distclean; \
+		$(MAKE) -k distclean; \
+		$(MAKE) -k -C dcopjava distclean; \
 	fi
 
 	dh_clean
@@ -165,23 +160,13 @@
 	# Fix up the Java packages so they conform to policy
 	mkdir -p debian/tmp/usr/share/java
 	(cd debian/tmp/usr/lib/java ; jar cvf ../../share/java/dcopjava-$(upstream_version).jar org/ )
+	cd debian/tmp/usr/lib/java; rm -rf org
 	ln -s dcopjava-$(upstream_version).jar debian/tmp/usr/share/java/dcopjava.jar
 	mv debian/tmp/usr/lib/java/qtjava.jar debian/tmp/usr/share/java/qtjava-$(upstream_version).jar
 	ln -s qtjava-$(upstream_version).jar debian/tmp/usr/share/java/qtjava.jar
 	mv debian/tmp/usr/lib/java/koala.jar debian/tmp/usr/share/java/koala-$(upstream_version).jar
 	ln -s koala-$(upstream_version).jar debian/tmp/usr/share/java/koala.jar
 
-	dh_install --list-missing
-
-
-# This single target is used to build all the packages, all at once, or
-# one at a time. So keep in mind: any options passed to commands here will
-# affect _all_ packages. Anything you want to only affect one package
-# should be put in another target, such as the install target.
-binary-common:
-
-	dh_testdir
-	dh_testroot
 	dh_installchangelogs
 	dh_installdocs
 	dh_installexamples
@@ -194,6 +179,17 @@
 #	dh_installcron
 #	dh_installinfo
 	dh_installman
+	dh_install --list-missing
+
+
+# This single target is used to build all the packages, all at once, or
+# one at a time. So keep in mind: any options passed to commands here will
+# affect _all_ packages. Anything you want to only affect one package
+# should be put in another target, such as the install target.
+binary-common:
+
+	dh_testdir
+	dh_testroot
 	dh_link
 	dh_strip
 	dh_compress -X.bz2 -X.css -X.dcl -X.docbook -X-license -X.tag



Reply to: