[pkg-kde-commits] rev 2543 - in trunk/packages/kdepim/debian: .
patches po
Daniel Schepler
schepler at costa.debian.org
Mon Dec 5 13:18:12 UTC 2005
Author: schepler
Date: 2005-12-05 13:18:11 +0000 (Mon, 05 Dec 2005)
New Revision: 2543
Added:
trunk/packages/kdepim/debian/libmimelib1c2a.install
trunk/packages/kdepim/debian/patches/01_kdepim_branch_20051201.diff
trunk/packages/kdepim/debian/patches/13_mimelib_self_contained.diff
Removed:
trunk/packages/kdepim/debian/libmimelib1c2.install
trunk/packages/kdepim/debian/patches/01_kdepim_branch_20050901.diff
Modified:
trunk/packages/kdepim/debian/
trunk/packages/kdepim/debian/changelog
trunk/packages/kdepim/debian/control
trunk/packages/kdepim/debian/po/vi.po
trunk/packages/kdepim/debian/rules
Log:
Merge changes from branches/kde-3.4.0.
Property changes on: trunk/packages/kdepim/debian
___________________________________________________________________
Name: svn:ignore
- *.debhelper
*.substvars
stamp-*
files
akregator
kaddressbook
kalarm
kandy
karm
kdepim
kdepim-dev
kdepim-doc
kdepim-doc-html
kdepim-kfile-plugins
kdepim-kio-plugins
kdepim-kresources
kdepim-wizards
kitchensync
kleopatra
kmail
kmailcvt
knode
knotes
kode
konsolekalendar
kontact
korganizer
korn
kpilot
ksync
ktnef
libkcal2b
libkcal2-dev
libkdepim1a
libkdepim1-dev
libkgantt0
libkgantt0-dev
libkleopatra0a
libkleopatra0-dev
libkmime2
libkpimexchange1
libkpimexchange1-dev
libkpimidentities1
libksieve0
libksieve0-dev
libktnef1
libktnef1-dev
libmimelib1c2
libmimelib1-dev
networkstatus
tmp
+ *.debhelper
*.substvars
stamp-*
files
akregator
kaddressbook
kalarm
kandy
karm
kdepim
kdepim-dev
kdepim-doc
kdepim-doc-html
kdepim-kfile-plugins
kdepim-kio-plugins
kdepim-kresources
kdepim-wizards
kitchensync
kleopatra
kmail
kmailcvt
knode
knotes
kode
konsolekalendar
kontact
korganizer
korn
kpilot
ksync
ktnef
libkcal2b
libkcal2-dev
libkdepim1a
libkdepim1-dev
libkgantt0
libkgantt0-dev
libkleopatra0a
libkleopatra0-dev
libkmime2
libkpimexchange1
libkpimexchange1-dev
libkpimidentities1
libksieve0
libksieve0-dev
libktnef1
libktnef1-dev
libmimelib1c2a
libmimelib1-dev
networkstatus
tmp
Modified: trunk/packages/kdepim/debian/changelog
===================================================================
--- trunk/packages/kdepim/debian/changelog 2005-12-05 13:15:17 UTC (rev 2542)
+++ trunk/packages/kdepim/debian/changelog 2005-12-05 13:18:11 UTC (rev 2543)
@@ -1,3 +1,20 @@
+kdepim (4:3.4.3-1) unstable; urgency=low
+
+ * New upstream release.
+ * Apply changes from SVN 3.4 branch.
+ + Fixes a FTBFS with newer versions of g++-4.0.
+ * Rename libmimelib1c2 to libmimelib1c2a due to C++ allocator changes.
+ * New patch 13_mimelib_self_contained.diff:
+ + Link against libkdefakes_pic.a instead of -lkdefakes to
+ eliminate mimelib's dependency on kdelibs.
+ + Fix mimelib/config.h not to require the KDE or QT headers again.
+ This allows dropping the libkdepim-dev dependency from
+ libmimelib1-dev.
+ * Adjust Build-Depends to ensure a version of kdelibs with the
+ allocator changes.
+
+ -- Daniel Schepler <schepler at debian.org> Thu, 1 Dec 2005 19:59:09 +0100
+
kdepim (4:3.4.2-2) unstable; urgency=medium
+++ Changes by Adeodato Simó:
Modified: trunk/packages/kdepim/debian/control
===================================================================
--- trunk/packages/kdepim/debian/control 2005-12-05 13:15:17 UTC (rev 2542)
+++ trunk/packages/kdepim/debian/control 2005-12-05 13:18:11 UTC (rev 2543)
@@ -3,14 +3,14 @@
Priority: optional
Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
Uploaders: Daniel Schepler <schepler at debian.org>
-Build-Depends: g++-3.4 [arm m68k hppa], autoconf, automake1.9, bison, byacc, bzip2, cdbs (>= 0.4.27), debhelper (>= 4.2.21), flex, gawk, gettext, groff-base, kdelibs4-dev (>= 4:3.4.2), libbluetooth1-dev, libgnokii2-dev (>= 0.6.5), libgpgme11-dev, liblockdev1-dev, libmal-dev, libpisock-dev, libreadline5-dev, libsasl2-dev, libtool (>= 1.5), libxpm-dev, libxss-dev, sharutils, texinfo
+Build-Depends: g++-3.4 [arm m68k hppa], autoconf, automake1.9, bison, byacc, bzip2, cdbs (>= 0.4.27), debhelper (>= 4.2.21), flex, gawk, gettext, groff-base, kdelibs4-dev (>= 4:3.4.3-2), libbluetooth1-dev, libgnokii2-dev (>= 0.6.5), libgpgme11-dev, liblockdev1-dev, libmal-dev, libpisock-dev, libreadline5-dev, libsasl2-dev, libtool (>= 1.5), libxpm-dev, libxss-dev, sharutils, texinfo
Build-Depends-Indep: doxygen, qt3-doc, kdelibs4-doc
Standards-Version: 3.6.2
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}), libkcal2b (>= ${Source-Version}), libkdepim1a (>= ${Source-Version}), libkgantt0 (>= ${Source-Version}), libkleopatra0a (>= ${Source-Version}), libkpimexchange1 (>= ${Source-Version}), libkpimidentities1 (>= ${Source-Version}), libksieve0 (>= ${Source-Version}), libktnef1 (>= ${Source-Version}), libmimelib1c2 (>= ${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}), ksync (>= ${Source-Version}), ktnef (>= ${Source-Version}), networkstatus (>= ${Source-Version}), libkcal2b (>= ${Source-Version}), libkdepim1a (>= ${Source-Version}), libkgantt0 (>= ${Source-Version}), libkleopatra0a (>= ${Source-Version}), libkpimexchange1 (>= ${Source-Version}), libkpimidentities1 (>= ${Source-Version}), libksieve0 (>= ${Source-Version}), libktnef1 (>= ${Source-Version}), libmimelib1c2a (>= ${Source-Version})
Suggests: kdepim-doc-html
Description: KDE Personal Information Management metapackage
kdepim is a collection of Personal Information Management (PIM) tools for the
@@ -554,12 +554,12 @@
.
This package is part of the official KDE pim module.
-Package: libmimelib1c2
+Package: libmimelib1c2a
Section: libs
Architecture: any
Depends: ${shlibs:Depends}
-Conflicts: libmimelib1a
-Replaces: libmimelib1a
+Conflicts: libmimelib1a, libmimelib1c2
+Replaces: libmimelib1a, libmimelib1c2
Description: KDE mime library
This library is used by several KDE applications to handle mime types.
.
@@ -570,7 +570,7 @@
Package: libmimelib1-dev
Section: libdevel
Architecture: any
-Depends: libmimelib1c2 (= ${Source-Version}), libkdepim1-dev (= ${Source-Version})
+Depends: libmimelib1c2a (= ${Source-Version})
Description: KDE mime library [development]
This library is used by several KDE applications to handle mime types.
.
Deleted: trunk/packages/kdepim/debian/libmimelib1c2.install
Copied: trunk/packages/kdepim/debian/libmimelib1c2a.install (from rev 2542, branches/kde-3.4.0/packages/kdepim/debian/libmimelib1c2a.install)
Deleted: trunk/packages/kdepim/debian/patches/01_kdepim_branch_20050901.diff
Copied: trunk/packages/kdepim/debian/patches/01_kdepim_branch_20051201.diff (from rev 2542, branches/kde-3.4.0/packages/kdepim/debian/patches/01_kdepim_branch_20051201.diff)
Copied: trunk/packages/kdepim/debian/patches/13_mimelib_self_contained.diff (from rev 2542, branches/kde-3.4.0/packages/kdepim/debian/patches/13_mimelib_self_contained.diff)
Modified: trunk/packages/kdepim/debian/po/vi.po
===================================================================
--- trunk/packages/kdepim/debian/po/vi.po 2005-12-05 13:15:17 UTC (rev 2542)
+++ trunk/packages/kdepim/debian/po/vi.po 2005-12-05 13:18:11 UTC (rev 2543)
@@ -15,41 +15,47 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0\n"
-#.Type: select
-#.choices
-#:../kpilot.templates:3
+#. Type: select
+#. choices
+#: ../kpilot.templates:3
msgid "None, ttyS0, ttyS1, ttyS2, ttyS3, ircomm0, ttyUSB0, ttyUSB1"
msgstr "Không có, ttyS0, ttyS1, ttyS2, ttyS3, ircomm0, ttyUSB0, ttyUSB1"
-#.Type: select
-#.description
-#:../kpilot.templates:4
+#. Type: select
+#. description
+#: ../kpilot.templates:4
msgid "Which communication port to use with the Palm?"
msgstr "Nên dùng cổng liên lạc nào với thiết bị Palm?"
-#.Type: select
-#.description
-#:../kpilot.templates:4
+#. Type: select
+#. description
+#: ../kpilot.templates:4
msgid ""
"A symbolic file /dev/pilot may be created to the port use to talk to the "
"Palm."
-msgstr "Có thể tạo một liên kết tượng trưng đến cổng sẽ dùng để liên lạc với thiết bị Palm."
+msgstr ""
+"Có thể tạo một liên kết tượng trưng đến cổng sẽ dùng để liên lạc với thiết "
+"bị Palm."
-#.Type: select
-#.description
-#:../kpilot.templates:4
+#. Type: select
+#. description
+#: ../kpilot.templates:4
msgid ""
"ttyS? are the four serial ports, ircomm0 is the IrDA (infra red) port, "
"ttyUSB? are the USB ports."
-msgstr "• ttySx là cổng nối tiếp"
-"• ircommx là cổng IrDA (hồng ngoại)"
-"• ttyUSBx là cổng USB"
+msgstr ""
+"• ttySx là cổng nối tiếp• ircommx là cổng IrDA (hồng ngoại)• ttyUSBx là cổng "
+"USB"
-#.Type: select
-#.description
-#:../kpilot.templates:4
+#. Type: select
+#. description
+#: ../kpilot.templates:4
msgid ""
"To ease the use of the Palm connected to the port its access rights will be "
"lowered to allow access to any user. If it is a security problem for you, "
"select \"None\" and manage the link and its access rights yourself."
-msgstr "Để làm cho dễ dàng sử dụng thiết bị Palm được kết nối đến cổng này, đã mở rộng quyền hạn để cho phép mọi người truy cập nó. Nếu làm như thế rủi rõ bảo mật trên máy tính bạn, có thể chọn «không có» tại đây, và tự quản lý liên kết này và quyền hạn truy cập nó."
+msgstr ""
+"Để làm cho dễ dàng sử dụng thiết bị Palm được kết nối đến cổng này, đã mở "
+"rộng quyền hạn để cho phép mọi người truy cập nó. Nếu làm như thế rủi rõ bảo "
+"mật trên máy tính bạn, có thể chọn «không có» tại đây, và tự quản lý liên "
+"kết này và quyền hạn truy cập nó."
Modified: trunk/packages/kdepim/debian/rules
===================================================================
--- trunk/packages/kdepim/debian/rules 2005-12-05 13:15:17 UTC (rev 2542)
+++ trunk/packages/kdepim/debian/rules 2005-12-05 13:18:11 UTC (rev 2543)
@@ -38,7 +38,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.4.2
+shlibs_ver=4:3.4.3
DEB_DH_MAKESHLIBS_ARGS_libkcal2b := -V'libkcal2b (>= $(shlibs_ver))'
DEB_DH_MAKESHLIBS_ARGS_libkdenetwork2 := -V'libkdenetwork2 (>= $(shlibs_ver))'
DEB_DH_MAKESHLIBS_ARGS_libkdepim1a := -V'libkdepim1a (>= $(shlibs_ver))'
@@ -49,13 +49,13 @@
DEB_DH_MAKESHLIBS_ARGS_libkpimidentities1 := -V'libkpimidentities1 (>= $(shlibs_ver))'
DEB_DH_MAKESHLIBS_ARGS_libksieve0 := -V'libksieve0 (>= $(shlibs_ver))'
DEB_DH_MAKESHLIBS_ARGS_libktnef1 := -V'libktnef1 (>= $(shlibs_ver))'
-DEB_DH_MAKESHLIBS_ARGS_libmimelib1c102 := -V'libmimelib1c102 (>= $(shlibs_ver))'
+DEB_DH_MAKESHLIBS_ARGS_libmimelib1c2a := -V'libmimelib1c2a (>= $(shlibs_ver))'
PACKAGES_WITH_LIBS := akregator kaddressbook kalarm kdepim-kresources \
kdepim-wizards kitchensync kleopatra kmail knode knotes kode kontact \
korganizer kpilot ksync ktnef libkcal2b libkdenetwork2 libkdepim1a \
libkgantt0 libkleopatra0a libkmime2 libkpimexchange1 \
- libkpimidentities1 libksieve0 libktnef1 libmimelib1c102
+ libkpimidentities1 libksieve0 libktnef1 libmimelib1c2a
# kontact starts fine without korganizer or kpilot dependencies
# specialdates is only in recommends to get the kaddressbook dependency there
More information about the pkg-kde-commits
mailing list