rev 7405 - in trunk/packages/kdepim/debian: . patches
Ana Beatriz Guerrero López
ana at alioth.debian.org
Thu Oct 11 12:29:30 UTC 2007
Author: ana
Date: 2007-10-11 12:29:30 +0000 (Thu, 11 Oct 2007)
New Revision: 7405
Removed:
trunk/packages/kdepim/debian/patches/01_branch_kmail_forwarding.diff
trunk/packages/kdepim/debian/patches/01_branch_korganizer_birthdays.diff
trunk/packages/kdepim/debian/patches/01_branch_quota-fix.diff
Modified:
trunk/packages/kdepim/debian/changelog
trunk/packages/kdepim/debian/control
trunk/packages/kdepim/debian/control.in
trunk/packages/kdepim/debian/patches/14_kmail_filter_icons.diff
trunk/packages/kdepim/debian/rules
Log:
kdepim 3.5.8
Modified: trunk/packages/kdepim/debian/changelog
===================================================================
--- trunk/packages/kdepim/debian/changelog 2007-10-11 06:48:06 UTC (rev 7404)
+++ trunk/packages/kdepim/debian/changelog 2007-10-11 12:29:30 UTC (rev 7405)
@@ -1,3 +1,15 @@
+kdepim (4:3.5.8-1) unstable; urgency=low
+
+ * New upstream release.
+ * Resync patches:
+ - Remove, applied upstream:
+ 01_branch_kmail_forwarding, 01_branch_korganizer_birthdays,
+ 01_branch_quota-fix,
+ - Fix offset: 14_kmail_filter_icons.
+ * Update uploaders.
+
+ -- Ana Beatriz Guerrero Lopez <ana at debian.org> Thu, 11 Oct 2007 14:32:25 +0200
+
kdepim (4:3.5.7-4) unstable; urgency=low
* Rebuild without --enable final on all archs now. It seems the only way
Modified: trunk/packages/kdepim/debian/control
===================================================================
--- trunk/packages/kdepim/debian/control 2007-10-11 06:48:06 UTC (rev 7404)
+++ trunk/packages/kdepim/debian/control 2007-10-11 12:29:30 UTC (rev 7405)
@@ -2,9 +2,9 @@
Section: kde
Priority: optional
Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
-Uploaders: Ana Beatriz Guerrero Lopez <ana at debian.org>, Daniel Schepler <schepler at debian.org>, Josh Metzler <joshdeb at metzlers.org>, Sune Vuorela <debian at pusling.com>
+Uploaders: Ana Beatriz Guerrero Lopez <ana at debian.org>, Josh Metzler <joshdeb at metzlers.org>, Sune Vuorela <debian at pusling.com>
Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), automake1.9,
- cdparanoia, gawk, gettext, kdelibs4-dev (>= 4:3.5.7), bison, byacc, bzip2,
+ cdparanoia, gawk, gettext, kdelibs4-dev (>= 4:3.5.8), bison, byacc, bzip2,
flex, groff-base, libopensync0-dev,
libbluetooth2-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64],
libboost-dev (>= 1.33.1), libgnokii3-dev, libgpgme11-dev, liblockdev1-dev,
@@ -482,7 +482,7 @@
Package: libkdepim1-dev
Section: libdevel
Architecture: any
-Depends: libkdepim1a (= ${Source-Version}), kdelibs4-dev (>= 4:3.5.7)
+Depends: libkdepim1a (= ${Source-Version}), kdelibs4-dev (>= 4:3.5.8)
Replaces: kdepim-dev (<< 4:3.4.1)
Description: KDE PIM library [development]
This is the development package which contains the headers for the libkdepim
Modified: trunk/packages/kdepim/debian/control.in
===================================================================
--- trunk/packages/kdepim/debian/control.in 2007-10-11 06:48:06 UTC (rev 7404)
+++ trunk/packages/kdepim/debian/control.in 2007-10-11 12:29:30 UTC (rev 7405)
@@ -4,7 +4,7 @@
Maintainer: @@@MAINTAINER@@@
Uploaders: @@@UPLOADERS@@@
Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), automake1.9,
- cdparanoia, gawk, gettext, kdelibs4-dev (>= 4:3.5.7), bison, byacc, bzip2,
+ cdparanoia, gawk, gettext, kdelibs4-dev (>= 4:3.5.8), bison, byacc, bzip2,
flex, groff-base, libopensync0-dev,
libbluetooth2-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64],
libboost-dev (>= 1.33.1), libgnokii3-dev, libgpgme11-dev, liblockdev1-dev,
@@ -482,7 +482,7 @@
Package: libkdepim1-dev
Section: libdevel
Architecture: any
-Depends: libkdepim1a (= ${Source-Version}), kdelibs4-dev (>= 4:3.5.7)
+Depends: libkdepim1a (= ${Source-Version}), kdelibs4-dev (>= 4:3.5.8)
Replaces: kdepim-dev (<< 4:3.4.1)
Description: KDE PIM library [development]
This is the development package which contains the headers for the libkdepim
Deleted: trunk/packages/kdepim/debian/patches/01_branch_kmail_forwarding.diff
Deleted: trunk/packages/kdepim/debian/patches/01_branch_korganizer_birthdays.diff
Deleted: trunk/packages/kdepim/debian/patches/01_branch_quota-fix.diff
Modified: trunk/packages/kdepim/debian/patches/14_kmail_filter_icons.diff
===================================================================
--- trunk/packages/kdepim/debian/patches/14_kmail_filter_icons.diff 2007-10-11 06:48:06 UTC (rev 7404)
+++ trunk/packages/kdepim/debian/patches/14_kmail_filter_icons.diff 2007-10-11 12:29:30 UTC (rev 7405)
@@ -41,24 +41,22 @@
diff -Nur kdepim-3.5.4/kmail/kmstartup.cpp kdepim-3.5.4.new/kmail/kmstartup.cpp
--- kdepim-3.5.4/kmail/kmstartup.cpp 2006-07-22 10:14:16.000000000 +0200
+++ kdepim-3.5.4.new/kmail/kmstartup.cpp 2006-08-18 15:48:04.000000000 +0200
-@@ -114,6 +114,7 @@
+@@ -116,6 +116,7 @@
"3.4a",
"3.4b",
"3.4.1",
-+ "3.5-filter-icons",
- "3.5.4"
++ "3.5-filter-icons",
+ "3.5.4",
+ "3.5.7-imap-flag-migration"
};
- static const int numUpdates = sizeof updates / sizeof *updates;
diff -Nur kdepim-3.5.4/kmail/Makefile.am kdepim-3.5.4.new/kmail/Makefile.am
--- kdepim-3.5.4/kmail/Makefile.am 2006-08-18 15:39:43.000000000 +0200
+++ kdepim-3.5.4.new/kmail/Makefile.am 2006-08-18 15:49:08.000000000 +0200
-@@ -175,7 +175,8 @@
- kmail-3.3-misc.pl \
+@@ -191,6 +191,7 @@
kmail-3.3b1-misc.pl \
kmail-3.4-misc.pl \
-- kmail-3.4.1-update-status-filters.pl
-+ kmail-3.4.1-update-status-filters.pl \
-+ kmail-3.5-filter-icons.pl
-
+ kmail-3.4.1-update-status-filters.pl \
++ kmail-3.5-filter-icons.pl \
+ kmail-3.5-trigger-flag-migration.pl
+
confdir = $(kde_confdir)
- conf_DATA = kmail.antispamrc kmail.antivirusrc
Modified: trunk/packages/kdepim/debian/rules
===================================================================
--- trunk/packages/kdepim/debian/rules 2007-10-11 06:48:06 UTC (rev 7404)
+++ trunk/packages/kdepim/debian/rules 2007-10-11 12:29:30 UTC (rev 7405)
@@ -47,7 +47,7 @@
DEB_INSTALL_CHANGELOGS_ALL = $(shell for f in ChangeLog CHANGELOG CHANGES; do if test -s $(DEB_SRCDIR)/$(cdbs_curpkg)/$$f; then echo $(DEB_SRCDIR)/$(cdbs_curpkg)/$$f; break; fi; done)
-shlibs_ver=4:3.5.7
+shlibs_ver=4:3.5.8
DEB_DH_MAKESHLIBS_ARGS_libindex0 := -V'libindex0 (>= $(shlibs_ver))'
DEB_DH_MAKESHLIBS_ARGS_libkcal2b := -V'libkcal2b (>= $(shlibs_ver))'
DEB_DH_MAKESHLIBS_ARGS_libkdenetwork2 := -V'libkdenetwork2 (>= $(shlibs_ver))'
More information about the pkg-kde-commits
mailing list