rev 6194 - in trunk/packages/kdepim/debian: . patches

Sune Vuorela pusling-guest at alioth.debian.org
Tue May 15 09:10:10 UTC 2007 

Author: pusling-guest
Date: 2007-05-15 09:10:10 +0000 (Tue, 15 May 2007)
New Revision: 6194

Removed:
   trunk/packages/kdepim/debian/ksync.install
   trunk/packages/kdepim/debian/ksync.manpages
   trunk/packages/kdepim/debian/ksync.menu
   trunk/packages/kdepim/debian/patches/01_branch_627763.diff
   trunk/packages/kdepim/debian/patches/01_branch_630633_store_kwallet_passwords.diff
   trunk/packages/kdepim/debian/patches/01_branch_630850_fix_crm114_typo.diff
   trunk/packages/kdepim/debian/patches/01_branch_631934_fix_kmail_dimap_crash.diff
   trunk/packages/kdepim/debian/patches/01_branch_633069_c++_fixes.diff
   trunk/packages/kdepim/debian/patches/01_branch_633071_kmail_crash.diff
   trunk/packages/kdepim/debian/patches/01_branch_643329_imap_crash.diff
   trunk/packages/kdepim/debian/patches/01_branch_643369_template_crash.diff
   trunk/packages/kdepim/debian/patches/01_branch_644873_fix_open_count.diff
   trunk/packages/kdepim/debian/patches/01_branch_644877_dont_crash_if_folders_are_deleted.diff
   trunk/packages/kdepim/debian/patches/01_branch_644897_fix_imap_crash.diff
   trunk/packages/kdepim/debian/patches/01_branch_644903_fix_folder_crash.diff
   trunk/packages/kdepim/debian/patches/01_branch_644988_fix_imap_account_creation_crash.diff
   trunk/packages/kdepim/debian/patches/01_branch_645047_kmail_crash_gpg_related.diff
   trunk/packages/kdepim/debian/patches/01_branch_645389_kmail_crash_delete_imap.diff
   trunk/packages/kdepim/debian/patches/01_branch_645673_ensure_main_widget.diff
   trunk/packages/kdepim/debian/patches/01_branch_645830_dont_crash_if_folder_gone.diff
   trunk/packages/kdepim/debian/patches/01_branch_649334_fix_kmail_folder_crash.diff
   trunk/packages/kdepim/debian/patches/01_branch_649957_guard_possible_crash.diff
   trunk/packages/kdepim/debian/patches/01_branch_650978_guard_more_crash.diff
   trunk/packages/kdepim/debian/patches/01_branch_650987_fix_crash_creating_index.diff
   trunk/packages/kdepim/debian/patches/03_kmail-templates.patch
   trunk/packages/kdepim/debian/patches/04_kmail-140660.patch
   trunk/packages/kdepim/debian/patches/20_pilot-link0.12.2.pilotAppInfo.h.diff
   trunk/packages/kdepim/debian/patches/20_pilot-link0.12.2.pilotMemo.h.diff
   trunk/packages/kdepim/debian/patches/28_clamav-0.90.diff
   trunk/packages/kdepim/debian/patches/29_kdepim_kio_imap_dos.diff
Modified:
   trunk/packages/kdepim/debian/changelog
   trunk/packages/kdepim/debian/control
   trunk/packages/kdepim/debian/kdepim-dev.install
   trunk/packages/kdepim/debian/kdepim-kio-plugins.install
   trunk/packages/kdepim/debian/kitchensync.install
Log:
first stab at 3.5.7 - hope it compiles


Modified: trunk/packages/kdepim/debian/changelog
===================================================================
--- trunk/packages/kdepim/debian/changelog	2007-05-15 08:16:01 UTC (rev 6193)
+++ trunk/packages/kdepim/debian/changelog	2007-05-15 09:10:10 UTC (rev 6194)
@@ -1,3 +1,19 @@
+kdepim (4:3.5.7-1) unstable; urgency=low
+
+  * New upstream release
+    - Remove all the branch pull patches (01*)
+    - Remove the clamav patch (merged upstream)
+    - Remove patch to fix theoretical kio imap infinite loop (merged upstream) 
+    - remove template patch - applied upstream
+    - remove patch 04 - applied upstream
+    - Remove kpilot header patches - applied upstream
+    - Ksync package goes bye bye
+    - kitchensync has changed big time. Conflict against older kdebluetooth.
+
+
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 16 Apr 2007 21:37:29 +0200
+
 kdepim (4:3.5.6.dfsg.1-2) unstable; urgency=low
 
   * Upload to unstable after Etch release.

Modified: trunk/packages/kdepim/debian/control
===================================================================
--- trunk/packages/kdepim/debian/control	2007-05-15 08:16:01 UTC (rev 6193)
+++ trunk/packages/kdepim/debian/control	2007-05-15 09:10:10 UTC (rev 6194)
@@ -5,7 +5,7 @@
 Uploaders: Daniel Schepler <schepler at debian.org>, Josh Metzler <joshdeb at metzlers.org>, Ana Beatriz Guerrero Lopez <ana at debian.org>, Sune Vuorela <debian at pusling.com>, Fathi Boudra <fboudra at free.fr>
 Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), automake1.9,
  cdparanoia, gawk, gettext, kdelibs4-dev (>= 4:3.5.6), bison, byacc, bzip2,
- flex, groff-base,
+ flex, groff-base, libopensync0-dev,
  libbluetooth2-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64],
  libboost-dev (>= 1.33.1), libgnokii3-dev, libgpgme11-dev, liblockdev1-dev,
  libpisock-dev, libreadline5-dev, libsasl2-dev, libssl-dev,
@@ -17,7 +17,7 @@
 Package: kdepim
 Section: kde
 Architecture: all
-Depends: akregator (>= ${Source-Version}), kaddressbook (>= ${Source-Version}), kalarm (>= ${Source-Version}), kandy (>= ${Source-Version}), karm (>= ${Source-Version}), kdepim-kfile-plugins (>= ${Source-Version}), kdepim-kio-plugins (>= ${Source-Version}), kdepim-kresources (>= ${Source-Version}), kdepim-wizards (>= ${Source-Version}), kitchensync (>= ${Source-Version}), kleopatra (>= ${Source-Version}), kmail (>= ${Source-Version}), kmailcvt (>= ${Source-Version}), knode (>= ${Source-Version}), knotes (>= ${Source-Version}), konsolekalendar (>= ${Source-Version}), kontact (>= ${Source-Version}), korganizer (>= ${Source-Version}), korn (>= ${Source-Version}), kpilot (>= ${Source-Version}), ksync (>= ${Source-Version}), ktnef (>= ${Source-Version}), networkstatus (>= ${Source-Version}), libindex0 (>= ${Source-Version}), libkcal2b (>= ${Source-Version}), libkdepim1a (>= ${Source-Version}), libkgantt0 (>= ${Source-Version}), libkleopatra1 (>= ${Source-Version}), libkpimexchange1 (>= ${Source-Version}), libkpimidentities1 (>= ${Source-Version}), libksieve0 (>= ${Source-Version}), libktnef1 (>= ${Source-Version}), libmimelib1c2a (>= ${Source-Version})
+Depends: akregator (>= ${Source-Version}), kaddressbook (>= ${Source-Version}), kalarm (>= ${Source-Version}), kandy (>= ${Source-Version}), karm (>= ${Source-Version}), kdepim-kfile-plugins (>= ${Source-Version}), kdepim-kio-plugins (>= ${Source-Version}), kdepim-kresources (>= ${Source-Version}), kdepim-wizards (>= ${Source-Version}), kitchensync (>= ${Source-Version}), kleopatra (>= ${Source-Version}), kmail (>= ${Source-Version}), kmailcvt (>= ${Source-Version}), knode (>= ${Source-Version}), knotes (>= ${Source-Version}), konsolekalendar (>= ${Source-Version}), kontact (>= ${Source-Version}), korganizer (>= ${Source-Version}), korn (>= ${Source-Version}), kpilot (>= ${Source-Version}), ktnef (>= ${Source-Version}), networkstatus (>= ${Source-Version}), libindex0 (>= ${Source-Version}), libkcal2b (>= ${Source-Version}), libkdepim1a (>= ${Source-Version}), libkgantt0 (>= ${Source-Version}), libkleopatra1 (>= ${Source-Version}), libkpimexchange1 (>= ${Source-Version}), libkpimidentities1 (>= ${Source-Version}), libksieve0 (>= ${Source-Version}), libktnef1 (>= ${Source-Version}), libmimelib1c2a (>= ${Source-Version})
 Suggests: kdepim-doc-html
 Description: Personal Information Management apps from the official KDE release
  KDE (the K Desktop Environment) is a powerful Open Source graphical
@@ -43,7 +43,7 @@
 Package: kdepim-dev
 Section: devel
 Architecture: any
-Depends: kaddressbook (= ${Source-Version}), kalarm (= ${Source-Version}), kdepim-kresources (= ${Source-Version}), kitchensync (= ${Source-Version}), kmail (= ${Source-Version}), knotes (= ${Source-Version}), kontact (= ${Source-Version}), korganizer (= ${Source-Version}), kpilot (= ${Source-Version}), ksync (= ${Source-Version}), libkpimidentities1 (= ${Source-Version}), libkcal2-dev (= ${Source-Version}), libkdepim1-dev (= ${Source-Version}), libkgantt0-dev (= ${Source-Version}), libkleopatra1-dev (= ${Source-Version}), libkpimexchange1-dev (= ${Source-Version}), libksieve0-dev (= ${Source-Version}), libktnef1-dev (= ${Source-Version}), libmimelib1-dev (= ${Source-Version})
+Depends: kaddressbook (= ${Source-Version}), kalarm (= ${Source-Version}), kdepim-kresources (= ${Source-Version}), kitchensync (= ${Source-Version}), kmail (= ${Source-Version}), knotes (= ${Source-Version}), kontact (= ${Source-Version}), korganizer (= ${Source-Version}), kpilot (= ${Source-Version}), libkpimidentities1 (= ${Source-Version}), libkcal2-dev (= ${Source-Version}), libkdepim1-dev (= ${Source-Version}), libkgantt0-dev (= ${Source-Version}), libkleopatra1-dev (= ${Source-Version}), libkpimexchange1-dev (= ${Source-Version}), libksieve0-dev (= ${Source-Version}), libktnef1-dev (= ${Source-Version}), libmimelib1-dev (= ${Source-Version})
 Replaces: libkcal2-dev (<< 4:3.4.1), libmimelib1-dev (<< 4:3.4.2)
 Description: KDE Personal Information Management [development]
  This package contains development files needed to compile kdepim applications.
@@ -214,9 +214,10 @@
 Architecture: any
 Depends: ${shlibs:Depends}
 Suggests: konqueror
+Conflicts: kdebluetooth-irmcsync (<< 0.99+1.0beta2-4.1)
 Description: Synchronization framework
  This package contains a synchronization framework, still under heavy
- development.  It also contains the multisynk GUI frontend.
+ development.  Kitchensync uses opensync.
  .
  This package is part of KDE, and a component of the KDE PIM module.
  See the 'kde' and 'kdepim' packages for more information.
@@ -384,19 +385,6 @@
  This package is part of KDE, and a component of the KDE PIM module.
  See the 'kde' and 'kdepim' packages for more information.
 
-Package: ksync
-Section: utils
-Architecture: any
-Depends: ${shlibs:Depends}
-Description: KDE Sync
- KSync is a small application using libksync, which provides a GUI for
- selecting and syncing files, which contain data of the types, for which
- implementations of the libksync interfaces exist. It is able to sync data
- across networks by using the KDE ioslaves.
- .
- This package is part of KDE, and a component of the KDE PIM module.
- See the 'kde' and 'kdepim' packages for more information.
-
 Package: ktnef
 Section: kde
 Architecture: any

Modified: trunk/packages/kdepim/debian/kdepim-dev.install
===================================================================
--- trunk/packages/kdepim/debian/kdepim-dev.install	2007-05-15 08:16:01 UTC (rev 6193)
+++ trunk/packages/kdepim/debian/kdepim-dev.install	2007-05-15 09:10:10 UTC (rev 6194)
@@ -4,7 +4,6 @@
 /usr/include/kde/calendar
 /usr/include/kde/kabc
 /usr/include/kde/kaddressbook
-/usr/include/kde/kitchensync
 /usr/include/kde/kmail
 /usr/include/kde/kmailIface.h
 /usr/include/kde/kmailicalIface.h
@@ -46,8 +45,6 @@
 /usr/lib/libkgroupwarebase.so
 /usr/lib/libkgroupwaredav.la
 /usr/lib/libkgroupwaredav.so
-/usr/lib/libkitchensyncui.la
-/usr/lib/libkitchensyncui.so
 /usr/lib/libkmime.la
 /usr/lib/libkmime.so
 /usr/lib/libknoteskolab.la
@@ -56,8 +53,6 @@
 /usr/lib/libknotes_xmlrpc.so
 /usr/lib/libkocorehelper.la
 /usr/lib/libkocorehelper.so
-/usr/lib/libkonnector.la
-/usr/lib/libkonnector.so
 /usr/lib/libkontact.la
 /usr/lib/libkontact.so
 /usr/lib/libkorganizer.la
@@ -76,9 +71,7 @@
 /usr/lib/libkpinterfaces.so
 /usr/lib/libkslox.la
 /usr/lib/libkslox.so
-/usr/lib/libksync.la
-/usr/lib/libksync.so
-/usr/lib/libksync2.la
-/usr/lib/libksync2.so
-/usr/lib/libmultisynk.la
-/usr/lib/libmultisynk.so
+/usr/lib/libkitchensync.la
+/usr/lib/libkitchensync.so
+/usr/lib/libqopensync.la
+/usr/lib/libqopensync.so

Modified: trunk/packages/kdepim/debian/kdepim-kio-plugins.install
===================================================================
--- trunk/packages/kdepim/debian/kdepim-kio-plugins.install	2007-05-15 08:16:01 UTC (rev 6193)
+++ trunk/packages/kdepim/debian/kdepim-kio-plugins.install	2007-05-15 09:10:10 UTC (rev 6194)
@@ -11,5 +11,4 @@
 /usr/share/services/imap4.protocol
 /usr/share/services/imaps.protocol
 /usr/share/services/mbox.protocol
-/usr/share/services/overview.desktop
 /usr/share/services/sieve.protocol

Modified: trunk/packages/kdepim/debian/kitchensync.install
===================================================================
--- trunk/packages/kdepim/debian/kitchensync.install	2007-05-15 08:16:01 UTC (rev 6193)
+++ trunk/packages/kdepim/debian/kitchensync.install	2007-05-15 09:10:10 UTC (rev 6194)
@@ -1,58 +1,13 @@
 /usr/bin/kitchensync
-/usr/bin/multisynk
 /usr/lib/kde3/libkitchensyncpart.la
 /usr/lib/kde3/libkitchensyncpart.so
-/usr/lib/kde3/libksfilter_addressbook.la
-/usr/lib/kde3/libksfilter_addressbook.so
-/usr/lib/kde3/libksfilter_calendar.la
-/usr/lib/kde3/libksfilter_calendar.so
-/usr/lib/kde3/libksync_backup.la
-/usr/lib/kde3/libksync_backup.so
-/usr/lib/kde3/libksync_debugger.la
-/usr/lib/kde3/libksync_debugger.so
-/usr/lib/kde3/libksync_restore.la
-/usr/lib/kde3/libksync_restore.so
-/usr/lib/kde3/libksync_pluckerpart.la
-/usr/lib/kde3/libksync_pluckerpart.so
-/usr/lib/kde3/libksync_syncerpart.la
-/usr/lib/kde3/libksync_syncerpart.so
-/usr/lib/kde3/libksync_viewer.la
-/usr/lib/kde3/libksync_viewer.so
-/usr/lib/kde3/libmultisynkpart.la
-/usr/lib/kde3/libmultisynkpart.so
-/usr/lib/kde3/liboverviewpart.la
-/usr/lib/kde3/liboverviewpart.so
-/usr/lib/libkabckonnector.la
-/usr/lib/libkabckonnector.so
-/usr/lib/libkcalkonnector.la
-/usr/lib/libkcalkonnector.so
-/usr/lib/libkitchensyncui.so.0
-/usr/lib/libkitchensyncui.so.0.0.0
-/usr/lib/libkonnector.so.0
-/usr/lib/libkonnector.so.0.0.0
-/usr/lib/libksync2.so.0
-/usr/lib/libksync2.so.0.0.0
-/usr/lib/liblocalkonnector.la
-/usr/lib/liblocalkonnector.so
-/usr/lib/libmultisynk.so.0
-/usr/lib/libmultisynk.so.0.0.0
-/usr/lib/libqtopiakonnector.la
-/usr/lib/libqtopiakonnector.so
-/usr/lib/libremotekonnector.la
-/usr/lib/libremotekonnector.so
-/usr/share/applications/kde/multisynk.desktop
 /usr/share/apps/kitchensync
-/usr/share/apps/konqueror/servicemenus/kitchensync-pluck.desktop
-/usr/share/apps/konqueror/servicemenus/kitchensync-pluck-rdf.desktop
-/usr/share/apps/multisynk
-/usr/share/doc/kde/HTML/en/multisynk
-/usr/share/icons/hicolor/16x16/apps/multisynk.png
-/usr/share/icons/hicolor/22x22/apps/multisynk.png
-/usr/share/icons/hicolor/32x32/apps/multisynk.png
-/usr/share/icons/hicolor/48x48/apps/multisynk.png
-/usr/share/services/kitchensync
-/usr/share/services/kresources/konnector
-/usr/share/services/kresources/konnector_manager.desktop
-/usr/share/servicetypes/filter.desktop
-/usr/share/servicetypes/kitchensync.desktop
-/usr/share/servicetypes/konnector.desktop
+/usr/lib/libkitchensync.so.0
+/usr/lib/libkitchensync.so.0.0.0
+/usr/lib/libqopensync.so.0
+/usr/lib/libqopensync.so.0.0.0
+/usr/share/applications/kde/kitchensync.desktop
+/usr/share/icons/hicolor/16x16/apps/kitchensync.png
+/usr/share/icons/hicolor/22x22/apps/kitchensync.png
+/usr/share/icons/hicolor/32x32/apps/kitchensync.png
+/usr/share/icons/hicolor/48x48/apps/kitchensync.png

Deleted: trunk/packages/kdepim/debian/ksync.install

Deleted: trunk/packages/kdepim/debian/ksync.manpages

Deleted: trunk/packages/kdepim/debian/ksync.menu

Deleted: trunk/packages/kdepim/debian/patches/01_branch_627763.diff

Deleted: trunk/packages/kdepim/debian/patches/01_branch_630633_store_kwallet_passwords.diff

Deleted: trunk/packages/kdepim/debian/patches/01_branch_630850_fix_crm114_typo.diff

Deleted: trunk/packages/kdepim/debian/patches/01_branch_631934_fix_kmail_dimap_crash.diff

Deleted: trunk/packages/kdepim/debian/patches/01_branch_633069_c++_fixes.diff

Deleted: trunk/packages/kdepim/debian/patches/01_branch_633071_kmail_crash.diff

Deleted: trunk/packages/kdepim/debian/patches/01_branch_643329_imap_crash.diff

Deleted: trunk/packages/kdepim/debian/patches/01_branch_643369_template_crash.diff

Deleted: trunk/packages/kdepim/debian/patches/01_branch_644873_fix_open_count.diff

Deleted: trunk/packages/kdepim/debian/patches/01_branch_644877_dont_crash_if_folders_are_deleted.diff

Deleted: trunk/packages/kdepim/debian/patches/01_branch_644897_fix_imap_crash.diff

Deleted: trunk/packages/kdepim/debian/patches/01_branch_644903_fix_folder_crash.diff

Deleted: trunk/packages/kdepim/debian/patches/01_branch_644988_fix_imap_account_creation_crash.diff

Deleted: trunk/packages/kdepim/debian/patches/01_branch_645047_kmail_crash_gpg_related.diff

Deleted: trunk/packages/kdepim/debian/patches/01_branch_645389_kmail_crash_delete_imap.diff

Deleted: trunk/packages/kdepim/debian/patches/01_branch_645673_ensure_main_widget.diff

Deleted: trunk/packages/kdepim/debian/patches/01_branch_645830_dont_crash_if_folder_gone.diff

Deleted: trunk/packages/kdepim/debian/patches/01_branch_649334_fix_kmail_folder_crash.diff

Deleted: trunk/packages/kdepim/debian/patches/01_branch_649957_guard_possible_crash.diff

Deleted: trunk/packages/kdepim/debian/patches/01_branch_650978_guard_more_crash.diff

Deleted: trunk/packages/kdepim/debian/patches/01_branch_650987_fix_crash_creating_index.diff

Deleted: trunk/packages/kdepim/debian/patches/03_kmail-templates.patch

Deleted: trunk/packages/kdepim/debian/patches/04_kmail-140660.patch

Deleted: trunk/packages/kdepim/debian/patches/20_pilot-link0.12.2.pilotAppInfo.h.diff

Deleted: trunk/packages/kdepim/debian/patches/20_pilot-link0.12.2.pilotMemo.h.diff

Deleted: trunk/packages/kdepim/debian/patches/28_clamav-0.90.diff

Deleted: trunk/packages/kdepim/debian/patches/29_kdepim_kio_imap_dos.diff

More information about the pkg-kde-commits mailing list