[SCM] KDE Development Platform Libraries module packaging branch, master, updated. debian/4.10.5-1-10-g220320a

Maximiliano Curia maxy at alioth.debian.org
Wed Jul 17 08:22:21 UTC 2013


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

The following commit has been merged in the master branch:
commit 9ac456fee8f7c05ba8178999ab8c294b4d1a6c34
Merge: 1da1b76771adaa10c51f2deb06b368837106db7a f6a26ab48d73a5a508ec7c166c362168493d95ef
Author: Maximiliano Curia <maxy at debian.org>
Date:   Wed Jul 17 10:19:29 2013 +0200

    Merge tag 'debian/4.8.4-4'
    
    4:4.8.4-4 unstable; urgency=low
    
    Conflicts:
    	debian/changelog
    	debian/control
    	debian/libkde3support4.symbols
    	debian/libkdeui5.symbols
    	debian/libkhtml5.symbols
    	debian/libkio5.symbols
    	debian/libkjsapi4.symbols
    	debian/libknewstuff2-4.symbols
    	debian/libnepomuk4.symbols
    	debian/libplasma3.symbols
    	debian/patches/series

 debian/changelog                                   |   13 ++-
 debian/control                                     |    1 +
 .../fix-copying-of-files-with-extended-ACLs.patch  |   96 ++++++++++++++++++++
 debian/patches/series                              |    1 +
 4 files changed, 110 insertions(+), 1 deletion(-)

diff --cc debian/changelog
index 85e86bd,45c8822..c226202
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,110 -1,13 +1,121 @@@
 +kde4libs (4:4.10.5-2) UNRELEASED; urgency=low
 +
-   * 
++  * Merge with kde4libs (4:4.8.4-4) unstable; urgency=low.
++    - Fix changelog typo. (Closes: #692398)
 +
 + -- Maximiliano Curia <maxy at debian.org>  Wed, 17 Jul 2013 10:12:35 +0200
 +
 +kde4libs (4:4.10.5-1) unstable; urgency=low
 +
 +  * New upstream release. (Closes: #697074)
 +  * Update symbols and bump shared-desktop-ontologies b-d to 0.11.
 +
 + -- Maximiliano Curia <maxy at debian.org>  Thu, 11 Jul 2013 14:27:27 +0200
 +
 +kde4libs (4:4.10.4-1) experimental; urgency=low
 +
 +  * New upstream release.
 +
 +  [ Pino Toscano ]
 +  * Fix typo in description of libkunitconversion4. (Closes: #705955)
 +
 +  [ Maximiliano Curia ]
 +  * Bump debhelper build-dep/compat to 9.
 +  * Bump Standards-Version to 3.9.4.
 +  * Remove patch install_kcookiescfg.pl_with_exec_perms.diff.
 +  * Remove patch upstream_Remove-extra-sys-mount.h-include.patch.
 +  * Update symbols files to make lintian versions parser pass.
 +  * Update symbols, add new symbols:
 +    - libkdecore5.symbols
 +    - libktexteditor4.symbols
 +  * Use SSL/TLS certificates bundle from ca-certificates package, thanks to
 +    Thijs Kinkhorst <thijs at debian.org>. (Closes: #511597)
 +  * Avoid usage of HUpnp by config instead of Build-Conflicts.
 +  * Add myself to the Uploaders field.
 +
 +  [ Lisandro Damián Nicanor Pérez Meyer ]
 +  * Remove hal as libsolid4 dependency for non-linux archs, as it will get
 +    removed from Debian (Closes: #710198).
 +
 +  [ Maximiliano Curia ]
 +  * Symbols update for libnepomuk4.
 +  * Update vcs fields.
 +
 + -- Maximiliano Curia <maxy at debian.org>  Thu, 13 Jun 2013 16:39:51 +0200
 +
 +kde4libs (4:4.10.2-3) experimental; urgency=low
 +
 +  * Ensure newer kde-runtime in dependencies.
 +  * Update uploaders.
 +
 + -- Sune Vuorela <sune at debian.org>  Mon, 22 Apr 2013 08:39:39 +0200
 +
 +kde4libs (4:4.10.2-2) experimental; urgency=low
 +
 +  [ Pino Toscano ]
 +  * Backport upstream commit a4dd84f42abea1ff9cdd15e156c63776c0bf854b to fix
 +    building on Hurd; patch upstream_Remove-extra-sys-mount.h-include.patch.
 +  * Make kdelibs-bin conflict with kdelibs4c2a, since now it provides
 +    kmailservice/ktelnetservice in /usr/bin. (Closes: #704669)
 +  * Extend patch kfreebsd_support.diff with the addition on GNU/kFreeBSD of the
 +    C-/CXX-/LD-FLAGS used on Linux and Hurd too.
 +  * Add patch kfreebsd_getmntent.diff to force the use of setmntent/getmntent
 +    on GNU/kFreeBSD.
 +
 + -- Sune Vuorela <sune at debian.org>  Mon, 08 Apr 2013 00:13:37 +0000
 +
 +kde4libs (4:4.10.2-1) experimental; urgency=low
 +
 +  * New upstream release.
 +
 +  [ Lisandro Damián Nicanor Pérez Meyer ]
 +  * Remove:
 +    - 01_upstream_nepomuk_fix_76e0376d7582cfe5b898c56bf3779ca2279dace8.diff
 +    - 02_upstream_nepomuk_fix_bde5aad1e9f7bfb6f8d5c60197797de4a315158d.diff
 +    - 03_upstream_powermanager_fix_05f1a19291af5c16745b76c3e0944c5b80ef5870.diff
 +    which were taken from upstream.
 +  * Refresh patches:
 +    - make_libkdeinit4_private.diff.
 +    - add_dlrestrictions_support.diff
 +  * Update symbols files with:
 +    - the build logs of the previous version.
 +    - the build log of the current version in amd64.
 +  * Add fix-copying-of-files-with-extended-ACLs.patch taken from upstream
 +    commit 73ea8cee7661579d3c414f510f6a74fc241c3ecf.
 +
 +  [ José Manuel Santamaría Lema ]
 +  * Update patches:
 +    - add install_kcookiescfg.pl_with_exec_perms.diff.
 +    - drop fix-copying-of-files-with-extended-ACLs.patch, applied upstream.
 +    - drop python3-support-bytecode.patch, applied upstream.
 +    - drop findpythonlibrary_layout_deb_on_debian.diff, no longer needed. 
 +    - update make_libkdeinit4_private.diff.
 +    - refresh other patches to make them apply without any offset.
 +  * Bump libsoprano-dev build dependency to >= 2.7.56.
 +  * Add aspell to build dependencies, this is a workaround for a possible bug in
 +    the build system.
 +  * Explain in README.source why some optional missing build depends reported by
 +    cmake aren't in Build-Depends.
 +  * Add libhupnp-dev to Build-Conflicts.
 +  * Use wildcards in install files (in a way that an SONAME bump won't go
 +    unnoticed).
 +  * Update installed files.
 +  * Update symbols files.
 +  * Add lintian overrides for 'hardening-no-fortify-functions'.
 +  * Change section of kdoctools from libs to doc.
 +
 + -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 01 Oct 2012 15:08:51 +0200
 +
+ kde4libs (4:4.8.4-4) unstable; urgency=low
+ 
+   * Backport an upstream patch to fix copying of files with extended ACLs.
 -  * The rebuild will get the package rebuilt with xz comression
++  * The rebuild will get the package rebuilt with xz compression
+     (Closes: #688766).
+   * Add myself to Uploaders.
+   * Confirm symbol files on more Debian arches.
+ 
+  -- Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>  Thu, 25 Oct 2012 18:11:08 -0300
+ 
  kde4libs (4:4.8.4-3) unstable; urgency=low
  
    * Team upload.
diff --cc debian/control
index 1a3fd58,23aa9be..2702477
--- a/debian/control
+++ b/debian/control
@@@ -4,10 -4,12 +4,11 @@@ Priority: optiona
  Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
  Uploaders: Sune Vuorela <sune at debian.org>,
   Fathi Boudra <fabo at debian.org>,
 - Modestas Vainius <modax at debian.org>, 
 + Modestas Vainius <modax at debian.org>,
   George Kiagiadakis <kiagiadakis.george at gmail.com>,
 - José Manuel Santamaría Lema <panfaust at gmail.com>,
 - Eshat Cakar <info at eshat.de>,
 - Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>
 -Build-Depends: debhelper (>= 7.3.16), cmake (>= 2.6.4), pkg-kde-tools (>= 0.14), libdlrestrictions-dev (>= 0.14),
++ Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>,
 + Maximiliano Curia <maxy at debian.org>
 +Build-Depends: debhelper (>= 9), cmake (>= 2.6.4), pkg-kde-tools (>= 0.14), libdlrestrictions-dev (>= 0.14),
   shared-mime-info (>= 0.30), dpkg-dev (>= 1.15.5), libphonon-dev (>= 4:4.6.0really4.3.80),
   libqt4-dev (>= 4:4.7.0), libqt4-opengl-dev (>= 4:4.7.0), libqtwebkit-dev,
   libpng12-dev, libssl-dev, libsm-dev, flex, bison,
diff --cc debian/patches/series
index ba888d4,4ee21d2..8266dc9
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -20,4 -23,6 +20,5 @@@ add_dlrestrictions_support.dif
  ktar_header_checksum_fix.diff
  ktar_longlink_length_in_bytes.diff
  glibc_filesystem.diff
 -python3-support-bytecode.patch
+ fix-copying-of-files-with-extended-ACLs.patch
 +kfreebsd_getmntent.diff

-- 
KDE Development Platform Libraries module packaging



More information about the pkg-kde-commits mailing list