diff options
| author | Lisandro Damián Nicanor Pérez Meyer <perezmeyer@gmail.com> | 2014-04-08 22:47:45 -0300 |
|---|---|---|
| committer | Lisandro Damián Nicanor Pérez Meyer <perezmeyer@gmail.com> | 2014-04-08 22:47:45 -0300 |
| commit | e8d87b8dea95dd3b891c0a76e6c9509903b192f4 (patch) | |
| tree | d2db60776a14b091cbf521855ec74a6d14b922ff | |
| parent | 2906a960bc7ebf01105ff26d21cba2bdecefea98 (diff) | |
| parent | a612fa4630c9338209032d4f0f09894ef8824021 (diff) | |
| download | kde4libs-e8d87b8dea95dd3b891c0a76e6c9509903b192f4.tar.gz | |
Merge branch 'master' into kde4.12
Conflicts:
debian/changelog
debian/libkde3support4.symbols
debian/libkdecore5.symbols
debian/libkfile4.symbols
debian/libkhtml5.symbols
debian/libkmediaplayer4.symbols
debian/libkparts4.symbols
debian/libkrossui4.symbols
debian/libktexteditor4.symbols
debian/libplasma3.symbols
I kept the symbols files as they already where for 4.12.
| -rw-r--r-- | debian/changelog | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index acd5538..3c66d2d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -16,6 +16,17 @@ kde4libs (4:4.12.2-1) experimental; urgency=medium -- Maximiliano Curia <maxy@debian.org> Mon, 10 Feb 2014 11:32:25 +0100 +kde4libs (4:4.11.5-2) unstable; urgency=medium + + [ Maximiliano Curia ] + * Confirm symbols (Closes: #741290). + * Bump Standards-Version to 3.9.5, no changes needed. + + [ Lisandro Damián Nicanor Pérez Meyer ] + * Update symbols files with current build log. + + -- Lisandro Damián Nicanor Pérez Meyer <lisandro@debian.org> Tue, 08 Apr 2014 22:03:50 -0300 + kde4libs (4:4.11.5-1) unstable; urgency=low * New upstream release. |