[SCM] KDE Development Platform Libraries module packaging branch, kde4.8, updated. debian/4.8.3-1

Modestas Vainius modax at alioth.debian.org
Sat May 26 15:54:08 UTC 2012 

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kde4libs.git;a=commitdiff;h=a6d1486

The following commit has been merged in the kde4.8 branch:
commit a6d1486f21adf163b2d46d4e506c06f0963dacab
Merge: 32c70a4b328e475a652a322173623b32962062b7 5e38645d15d15e1a8ab0666ae473ec2ae8a77d37
Author: Modestas Vainius <modax at debian.org>
Date:   Sat May 26 17:41:47 2012 +0300

    Merge branch 'master' into kde4.8
    
    Conflicts:
    	debian/changelog
    	debian/libkdecore5.symbols
    	debian/libkdeui5.symbols
    	debian/libkdewebkit5.symbols
    	debian/libkhtml5.symbols
    	debian/libkio5.symbols
    	debian/libkparts4.symbols
    	debian/libnepomukquery4a.symbols
    	debian/libplasma3.symbols
    	debian/patches/series

 debian/changelog                              |   14 ++
 debian/libkcmutils4.symbols                   |    8 +-
 debian/libkde3support4.symbols                |    8 +-
 debian/libkdecore5.symbols                    |  179 +++++++++++++------------
 debian/libkdeui5.symbols                      |   35 +++--
 debian/libkdewebkit5.symbols                  |    4 -
 debian/libkemoticons4.symbols                 |    4 +-
 debian/libkfile4.symbols                      |   14 +-
 debian/libkhtml5.symbols                      |   52 +++----
 debian/libkio5.symbols                        |   42 +++---
 debian/libkjsapi4.symbols                     |   25 ++--
 debian/libkjsembed4.symbols                   |  107 +++++++--------
 debian/libknewstuff2-4.symbols                |   18 ++--
 debian/libktexteditor4.symbols                |   26 ++--
 debian/libnepomukquery4a.symbols              |    2 -
 debian/libnepomukutils4.symbols               |    4 +-
 debian/libplasma3.symbols                     |   16 ++-
 debian/libsolid4.symbols                      |   21 ++--
 debian/libthreadweaver4.symbols               |    8 +-
 debian/patches/python3-support-bytecode.patch |   88 ++++++++++++
 debian/patches/series                         |    1 +
 21 files changed, 385 insertions(+), 291 deletions(-)

diff --cc debian/changelog
index 61aecaf,7329550..927d449
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,29 -1,17 +1,43 @@@
 +kde4libs (4:4.8.3-0r1) UNRELEASED; urgency=low
 +
 +  * New upstream release.
 +    - FindXine.cmake doesn't call xine-config anymore (Closes: #656914)
 +
 +  [ Eshat Cakar ]
 +  * Add myself to uploaders.
 +  * Update installed files.
 +  * Update not-installed files.
 +  * Remove upstream_better-check-for-return-values-of-m_protocols.value.patch
 +    (applied upstream).
 +
 +  [ José Manuel Santamaría Lema ]
 +  * Update symbols files.
 +  * Bump Standards-Version to 3.9.3, no changes needed.
 +  * Remove -DBUILD_libkactivities=OFF from the cmake parameters, no longer
 +    needed.
 +
 +  [ Pino Toscano ]
 +  * libsolid4: suggest media-player-info on Linux archs.
 +
 +  [ Modestas Vainius ]
 +  * Drop upstream_Add-missing-include.patch, stolen from upstream.
 +
 + -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 08 Mar 2012 17:23:21 +0100
 +
+ kde4libs (4:4.7.4-6) unstable; urgency=low
+ 
+   * Team upload.
+ 
+   [ Scott Kitterman ]
+   * Confirm symbols files for all archs except amd64 and s390x
+   * Add support to cmake/modules/PythonMacros.cmake for the environment
+     variable $PYTHONDONTWRITEBYTECODE to work around the lack of support for
+     Python 3 byte code compilation (Closes: #672552)
+     - Added in debian/patches/python3-support-bytecode.patch
+     - Thanks to Colin Watson for the patch
+ 
+  -- Scott Kitterman <scott at kitterman.com>  Sat, 19 May 2012 15:36:15 -0400
+ 
  kde4libs (4:4.7.4-5) unstable; urgency=low
  
    * Team upload.
diff --cc debian/libnepomukquery4a.symbols
index 0162679,ab4a658..564ab3f
--- a/debian/libnepomukquery4a.symbols
+++ b/debian/libnepomukquery4a.symbols
@@@ -1,8 -1,6 +1,6 @@@
 -# SymbolsHelper-Confirmed: 4:4.7.4-5 kfreebsd-amd64 kfreebsd-i386
 +# SymbolsHelper-Confirmed: 4:4.8.1 amd64
  libnepomukquery.so.4 libnepomukquery4a #MINVER#
  * Build-Depends-Package: kdelibs5-dev
-  (arch=kfreebsd-amd64 kfreebsd-i386)_ZN4KUrl4ListD1Ev at Base 4:4.6.5
-  (arch=kfreebsd-amd64 kfreebsd-i386)_ZN4KUrl4ListD2Ev at Base 4:4.6.5
   _ZN7Nepomuk5Query10SimpleTerm10setSubTermERKNS0_4TermE at Base 4:4.4.0
   _ZN7Nepomuk5Query10SimpleTermC1EPNS0_11TermPrivateE at Base 4:4.4.0
   _ZN7Nepomuk5Query10SimpleTermC1ERKNS0_4TermE at Base 4:4.4.0
diff --cc debian/libplasma3.symbols
index 1685348,7f2c2fa..791a6cc
--- a/debian/libplasma3.symbols
+++ b/debian/libplasma3.symbols
@@@ -1,12 -1,13 +1,13 @@@
 -# SymbolsHelper-Confirmed: 4:4.7.4-5 armel armhf hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
 +# SymbolsHelper-Confirmed: 4:4.8.1 amd64
  libplasma.so.3 libplasma3 #MINVER#
  * Build-Depends-Package: kdelibs5-dev
-  (optional=templinst|arch=hurd-i386)_ZN12KConfigGroup10writeEntryIiEEvPKcRKT_6QFlagsIN11KConfigBase15WriteConfigFlagEE at Base 4:4.6.2
-  (optional=templinst|arch=ia64)_ZN12KConfigGroup14writeListCheckI7QStringEEvPKcRK5QListIT_E6QFlagsIN11KConfigBase15WriteConfigFlagEE at Base 4:4.6.2
+  (optional=templinst|arch=armel armhf ia64 mips mipsel powerpc s390 sparc)_ZN12KConfigGroup14writeListCheckI7QStringEEvPKcRK5QListIT_E6QFlagsIN11KConfigBase15WriteConfigFlagEE at Base 4:4.6.2
+  (optional=templinst|arch=!hurd-i386 !i386 !kfreebsd-amd64 !kfreebsd-i386|subst)_ZN12KConfigGroup14writeListCheckI{qreal}EEvPKcRK5QListIT_E6QFlagsIN11KConfigBase15WriteConfigFlagEE at Base 4:4.7.4-5
+  (arch=kfreebsd-amd64 kfreebsd-i386)_ZN15KConfigSkeletonD0Ev at Base 4:4.7.4-5
+  (arch=kfreebsd-amd64 kfreebsd-i386)_ZN15KConfigSkeletonD1Ev at Base 4:4.7.4-5
+  (arch=kfreebsd-amd64 kfreebsd-i386)_ZN15KConfigSkeletonD2Ev at Base 4:4.7.4-5
   (arch=kfreebsd-amd64 kfreebsd-i386)_ZN19KCoreConfigSkeleton8ItemEnum6ChoiceD1Ev at Base 4:4.6.5
   (arch=kfreebsd-amd64 kfreebsd-i386)_ZN19KCoreConfigSkeleton8ItemEnum6ChoiceD2Ev at Base 4:4.6.5
-  (arch=kfreebsd-amd64 kfreebsd-i386)_ZN4KUrl4ListD1Ev at Base 4:4.6.5
-  (arch=kfreebsd-amd64 kfreebsd-i386)_ZN4KUrl4ListD2Ev at Base 4:4.6.5
   _ZN5Jolie11MetaService11loadServiceERK7QStringS3_ at Base 4:4.4.4-2~
   _ZN5Jolie11MetaService13unloadServiceERK7QString at Base 4:4.4.4-2~
   _ZN5Jolie11MetaService14addRedirectionERK7QStringS3_RKNS_5ValueES6_ at Base 4:4.4.4-2~
diff --cc debian/patches/series
index 0395be1,98e4c71..18d67be
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -21,3 -21,6 +21,4 @@@ findpythonlibrary_layout_deb_on_debian.
  ktar_header_checksum_fix.diff
  ktar_longlink_length_in_bytes.diff
  glibc_filesystem.diff
 -upstream_better-check-for-return-values-of-m_protocols.value.patch
 -upstream_Add-missing-include.patch
+ python3-support-bytecode.patch

-- 
KDE Development Platform Libraries module packaging

More information about the pkg-kde-commits mailing list