Update Debian and Ubuntu packaging for latest GIT sources

diff --git a/debian/lenny/tdebase/debian/tdebase-tdeio-plugins-trinity.install b/debian/lenny/tdebase/debian/tdebase-tdeio-plugins-trinity.install
index 3384916..802c9cf 100644
--- a/debian/lenny/tdebase/debian/tdebase-tdeio-plugins-trinity.install
+++ b/debian/lenny/tdebase/debian/tdebase-tdeio-plugins-trinity.install
@@ -308,11 +308,16 @@
 debian/tmp/opt/trinity/share/mimelnk/media/cdrom_unmounted.desktop
 debian/tmp/opt/trinity/share/mimelnk/media/cdrom_unmounted_decrypted.desktop
 debian/tmp/opt/trinity/share/mimelnk/media/cdrom_unmounted_encrypted.desktop
-debian/tmp/opt/trinity/share/mimelnk/media/cdwriter_mounted.desktop
-debian/tmp/opt/trinity/share/mimelnk/media/cdwriter_mounted_decrypted.desktop
-debian/tmp/opt/trinity/share/mimelnk/media/cdwriter_unmounted.desktop
-debian/tmp/opt/trinity/share/mimelnk/media/cdwriter_unmounted_decrypted.desktop
-debian/tmp/opt/trinity/share/mimelnk/media/cdwriter_unmounted_encrypted.desktop
+debian/tmp/opt/trinity/share/mimelnk/media/cd-r_mounted.desktop
+debian/tmp/opt/trinity/share/mimelnk/media/cd-r_mounted_decrypted.desktop
+debian/tmp/opt/trinity/share/mimelnk/media/cd-r_unmounted.desktop
+debian/tmp/opt/trinity/share/mimelnk/media/cd-r_unmounted_decrypted.desktop
+debian/tmp/opt/trinity/share/mimelnk/media/cd-r_unmounted_encrypted.desktop
+debian/tmp/opt/trinity/share/mimelnk/media/cd-rw_mounted.desktop
+debian/tmp/opt/trinity/share/mimelnk/media/cd-rw_mounted_decrypted.desktop
+debian/tmp/opt/trinity/share/mimelnk/media/cd-rw_unmounted.desktop
+debian/tmp/opt/trinity/share/mimelnk/media/cd-rw_unmounted_decrypted.desktop
+debian/tmp/opt/trinity/share/mimelnk/media/cd-rw_unmounted_encrypted.desktop
 debian/tmp/opt/trinity/share/mimelnk/media/dvd_mounted.desktop
 debian/tmp/opt/trinity/share/mimelnk/media/dvd_mounted_decrypted.desktop
 debian/tmp/opt/trinity/share/mimelnk/media/dvd_unmounted.desktop
diff --git a/debian/squeeze/tdebase/debian/tdebase-tdeio-plugins-trinity.install b/debian/squeeze/tdebase/debian/tdebase-tdeio-plugins-trinity.install
index 3384916..802c9cf 100644
--- a/debian/squeeze/tdebase/debian/tdebase-tdeio-plugins-trinity.install
+++ b/debian/squeeze/tdebase/debian/tdebase-tdeio-plugins-trinity.install
@@ -308,11 +308,16 @@
 debian/tmp/opt/trinity/share/mimelnk/media/cdrom_unmounted.desktop
 debian/tmp/opt/trinity/share/mimelnk/media/cdrom_unmounted_decrypted.desktop
 debian/tmp/opt/trinity/share/mimelnk/media/cdrom_unmounted_encrypted.desktop
-debian/tmp/opt/trinity/share/mimelnk/media/cdwriter_mounted.desktop
-debian/tmp/opt/trinity/share/mimelnk/media/cdwriter_mounted_decrypted.desktop
-debian/tmp/opt/trinity/share/mimelnk/media/cdwriter_unmounted.desktop
-debian/tmp/opt/trinity/share/mimelnk/media/cdwriter_unmounted_decrypted.desktop
-debian/tmp/opt/trinity/share/mimelnk/media/cdwriter_unmounted_encrypted.desktop
+debian/tmp/opt/trinity/share/mimelnk/media/cd-r_mounted.desktop
+debian/tmp/opt/trinity/share/mimelnk/media/cd-r_mounted_decrypted.desktop
+debian/tmp/opt/trinity/share/mimelnk/media/cd-r_unmounted.desktop
+debian/tmp/opt/trinity/share/mimelnk/media/cd-r_unmounted_decrypted.desktop
+debian/tmp/opt/trinity/share/mimelnk/media/cd-r_unmounted_encrypted.desktop
+debian/tmp/opt/trinity/share/mimelnk/media/cd-rw_mounted.desktop
+debian/tmp/opt/trinity/share/mimelnk/media/cd-rw_mounted_decrypted.desktop
+debian/tmp/opt/trinity/share/mimelnk/media/cd-rw_unmounted.desktop
+debian/tmp/opt/trinity/share/mimelnk/media/cd-rw_unmounted_decrypted.desktop
+debian/tmp/opt/trinity/share/mimelnk/media/cd-rw_unmounted_encrypted.desktop
 debian/tmp/opt/trinity/share/mimelnk/media/dvd_mounted.desktop
 debian/tmp/opt/trinity/share/mimelnk/media/dvd_mounted_decrypted.desktop
 debian/tmp/opt/trinity/share/mimelnk/media/dvd_unmounted.desktop
diff --git a/ubuntu/maverick/tdebase/debian/tdebase-tdeio-plugins-trinity.install b/ubuntu/maverick/tdebase/debian/tdebase-tdeio-plugins-trinity.install
index 3384916..802c9cf 100644
--- a/ubuntu/maverick/tdebase/debian/tdebase-tdeio-plugins-trinity.install
+++ b/ubuntu/maverick/tdebase/debian/tdebase-tdeio-plugins-trinity.install
@@ -308,11 +308,16 @@
 debian/tmp/opt/trinity/share/mimelnk/media/cdrom_unmounted.desktop
 debian/tmp/opt/trinity/share/mimelnk/media/cdrom_unmounted_decrypted.desktop
 debian/tmp/opt/trinity/share/mimelnk/media/cdrom_unmounted_encrypted.desktop
-debian/tmp/opt/trinity/share/mimelnk/media/cdwriter_mounted.desktop
-debian/tmp/opt/trinity/share/mimelnk/media/cdwriter_mounted_decrypted.desktop
-debian/tmp/opt/trinity/share/mimelnk/media/cdwriter_unmounted.desktop
-debian/tmp/opt/trinity/share/mimelnk/media/cdwriter_unmounted_decrypted.desktop
-debian/tmp/opt/trinity/share/mimelnk/media/cdwriter_unmounted_encrypted.desktop
+debian/tmp/opt/trinity/share/mimelnk/media/cd-r_mounted.desktop
+debian/tmp/opt/trinity/share/mimelnk/media/cd-r_mounted_decrypted.desktop
+debian/tmp/opt/trinity/share/mimelnk/media/cd-r_unmounted.desktop
+debian/tmp/opt/trinity/share/mimelnk/media/cd-r_unmounted_decrypted.desktop
+debian/tmp/opt/trinity/share/mimelnk/media/cd-r_unmounted_encrypted.desktop
+debian/tmp/opt/trinity/share/mimelnk/media/cd-rw_mounted.desktop
+debian/tmp/opt/trinity/share/mimelnk/media/cd-rw_mounted_decrypted.desktop
+debian/tmp/opt/trinity/share/mimelnk/media/cd-rw_unmounted.desktop
+debian/tmp/opt/trinity/share/mimelnk/media/cd-rw_unmounted_decrypted.desktop
+debian/tmp/opt/trinity/share/mimelnk/media/cd-rw_unmounted_encrypted.desktop
 debian/tmp/opt/trinity/share/mimelnk/media/dvd_mounted.desktop
 debian/tmp/opt/trinity/share/mimelnk/media/dvd_mounted_decrypted.desktop
 debian/tmp/opt/trinity/share/mimelnk/media/dvd_unmounted.desktop

Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging

diff --git a/debian/lenny/applications/krecipes/debian/control b/debian/lenny/applications/krecipes/debian/control
index 700f46f..a545595 100644
--- a/debian/lenny/applications/krecipes/debian/control
+++ b/debian/lenny/applications/krecipes/debian/control
@@ -12,7 +12,7 @@
 Package: krecipes-trinity
 Architecture: any
 Depends: krecipes-data-trinity (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}
-Suggests: libtqt3-mt-mysql | libtqt3-mt-psql, krecipes-doc-trinity (= ${source:Version})
+Suggests: libtqt3-mt-sqlite3 | libtqt3-mt-mysql | libtqt3-mt-psql, krecipes-doc-trinity (= ${source:Version})
 Description: recipes manager for TDE
  Krecipes is a TDE application designed to manage recipes. It can help you to
  do your shopping list, search through your recipes to find what you can do
diff --git a/debian/lenny/tdelibs/debian/control b/debian/lenny/tdelibs/debian/control
index 3204740..8d9a4b0 100644
--- a/debian/lenny/tdelibs/debian/control
+++ b/debian/lenny/tdelibs/debian/control
@@ -16,7 +16,7 @@
  libxml2-dev, libxml2-utils, libxslt1-dev, libavahi-tqt-dev,
  sharutils, texinfo, libogg-dev, libtqtinterface-dev,
  gettext-kde, lsb-release, base-files, sudo, libr-dev,
- libudev-dev, cmake, libltdl-dev
+ libudev-dev, cmake, libltdl-dev, libmagic-dev
 Build-Depends-Indep: doxygen, libtqtinterface-doc, graphviz, gsfonts-x11
 Standards-Version: 3.8.3
 
diff --git a/debian/squeeze/applications/krecipes/debian/control b/debian/squeeze/applications/krecipes/debian/control
index 700f46f..a545595 100644
--- a/debian/squeeze/applications/krecipes/debian/control
+++ b/debian/squeeze/applications/krecipes/debian/control
@@ -12,7 +12,7 @@
 Package: krecipes-trinity
 Architecture: any
 Depends: krecipes-data-trinity (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}
-Suggests: libtqt3-mt-mysql | libtqt3-mt-psql, krecipes-doc-trinity (= ${source:Version})
+Suggests: libtqt3-mt-sqlite3 | libtqt3-mt-mysql | libtqt3-mt-psql, krecipes-doc-trinity (= ${source:Version})
 Description: recipes manager for TDE
  Krecipes is a TDE application designed to manage recipes. It can help you to
  do your shopping list, search through your recipes to find what you can do
diff --git a/debian/squeeze/tdelibs/debian/control b/debian/squeeze/tdelibs/debian/control
index 3204740..8d9a4b0 100644
--- a/debian/squeeze/tdelibs/debian/control
+++ b/debian/squeeze/tdelibs/debian/control
@@ -16,7 +16,7 @@
  libxml2-dev, libxml2-utils, libxslt1-dev, libavahi-tqt-dev,
  sharutils, texinfo, libogg-dev, libtqtinterface-dev,
  gettext-kde, lsb-release, base-files, sudo, libr-dev,
- libudev-dev, cmake, libltdl-dev
+ libudev-dev, cmake, libltdl-dev, libmagic-dev
 Build-Depends-Indep: doxygen, libtqtinterface-doc, graphviz, gsfonts-x11
 Standards-Version: 3.8.3
 
diff --git a/openbsd/14.0.0/dependencies/tqt3/patches/patch-src_tools_qfile_cpp b/openbsd/14.0.0/dependencies/tqt3/patches/patch-src_tools_qfile_cpp
deleted file mode 100644
index ddf1ad4..0000000
--- a/openbsd/14.0.0/dependencies/tqt3/patches/patch-src_tools_qfile_cpp
+++ /dev/null
@@ -1,68 +0,0 @@
---- src/tools/qfile.cpp.orig	Fri Sep  5 20:07:14 2014
-+++ src/tools/qfile.cpp	Fri Sep  5 20:11:15 2014
-@@ -73,8 +73,13 @@
- {
- public:
-     TQString errorString;
-+    int lastAccess;
- };
- 
-+#define ACCESS_NONE -1
-+#define ACCESS_READ 0
-+#define ACCESS_WRITE 1
-+
- extern bool qt_file_access( const TQString& fn, int t );
- 
- /*!
-@@ -199,6 +204,7 @@
- {
-     delete d;
-     d = new TQFilePrivate;
-+    d->lastAccess = ACCESS_NONE;
-     setFlags( IO_Direct );
-     setStatus( IO_Ok );
-     setErrorString( qt_fileerr_unknown );
-@@ -385,6 +391,10 @@
-     if ( isRaw() ) {				// raw file
- 	nread = TQIODevice::readLine( p, maxlen );
-     } else {					// buffered file
-+        if (d->lastAccess == ACCESS_WRITE) {
-+            ::fseek(fh, 0, SEEK_CUR);
-+            d->lastAccess = ACCESS_READ;
-+        }
- 	p = fgets( p, maxlen, fh );
- 	if ( p ) {
- 	    nread = tqstrlen( p );
-@@ -466,6 +476,10 @@
- 	char buf[1];
- 	ch = readBlock( buf, 1 ) == 1 ? buf[0] : EOF;
-     } else {					// buffered file
-+        if (d->lastAccess == ACCESS_WRITE) {
-+            ::fseek(fh, 0, SEEK_CUR);
-+            d->lastAccess = ACCESS_READ;
-+        }
- 	if ( (ch = getc( fh )) != EOF ) {
- 	    if ( !isSequentialAccess() )
- 		ioIndex++;
-@@ -502,6 +516,10 @@
- 	buf[0] = ch;
- 	ch = writeBlock( buf, 1 ) == 1 ? ch : EOF;
-     } else {					// buffered file
-+        if (d->lastAccess == ACCESS_READ) {
-+            ::fseek(fh, 0, SEEK_CUR);
-+            d->lastAccess = ACCESS_WRITE;
-+        }
- 	if ( (ch = putc( ch, fh )) != EOF ) {
- 	    if ( !isSequentialAccess() )
- 		ioIndex++;
-@@ -556,6 +574,10 @@
- 	else
- 	    ch = EOF;
-     } else {					// buffered file
-+        if (d->lastAccess == ACCESS_WRITE) {
-+            ::fseek(fh, 0, SEEK_CUR);
-+            d->lastAccess = ACCESS_READ;
-+        }
- 	if ( (ch = ungetc(ch, fh)) != EOF ) {
- 	    if ( !isSequentialAccess() )
- 		ioIndex--;
diff --git a/openbsd/14.0.0/dependencies/tqt3/patches/patch-src_tools_qfile_unix_cpp b/openbsd/14.0.0/dependencies/tqt3/patches/patch-src_tools_qfile_unix_cpp
deleted file mode 100644
index 989554b..0000000
--- a/openbsd/14.0.0/dependencies/tqt3/patches/patch-src_tools_qfile_unix_cpp
+++ /dev/null
@@ -1,54 +0,0 @@
---- src/tools/qfile_unix.cpp.orig	Fri Sep  5 20:17:49 2014
-+++ src/tools/qfile_unix.cpp	Fri Sep  5 20:20:59 2014
-@@ -56,6 +56,17 @@
- #include <errno.h>
- #include <limits.h>
- 
-+class TQFilePrivate
-+{
-+public:
-+    TQString errorString;
-+    int lastAccess;
-+};
-+
-+#define ACCESS_NONE -1
-+#define ACCESS_READ 0
-+#define ACCESS_WRITE 1
-+
- extern const char* qt_fileerr_read;
- 
- bool qt_file_access( const TQString& fn, int t )
-@@ -525,6 +536,7 @@
- #else
- 	ok = ( ::fseek(fh, pos, SEEK_SET) == 0 );
- #endif
-+    d->lastAccess = ACCESS_NONE;
-     }
-     if ( ok )
- #if defined(QT_LARGEFILE_SUPPORT) && !defined(QT_ABI_QT4)
-@@ -593,6 +605,10 @@
- 		setErrorStringErrno( errno );
- 	    }
- 	} else {					// buffered file
-+        if (d->lastAccess == ACCESS_WRITE) {
-+        ::fseek(fh, 0, SEEK_CUR);
-+        d->lastAccess = ACCESS_READ;
-+        }
- 	    nread += fread( p, 1, len-nread, fh );
- 	    if ( (uint)nread != len ) {
- 		if ( ferror( fh ) || nread==0 ) {
-@@ -644,8 +660,13 @@
 ** Diff limit reached (max: 250 lines) **