diff -Nru libkpeople-0.99.0+git20140429+r457/cmake/COPYING-CMAKE-SCRIPTS libkpeople-0.99.0+git20140506+r459/cmake/COPYING-CMAKE-SCRIPTS --- libkpeople-0.99.0+git20140429+r457/cmake/COPYING-CMAKE-SCRIPTS 1970-01-01 00:00:00.000000000 +0000 +++ libkpeople-0.99.0+git20140506+r459/cmake/COPYING-CMAKE-SCRIPTS 2014-05-06 02:48:21.000000000 +0000 @@ -0,0 +1,22 @@ +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met: + +1. Redistributions of source code must retain the copyright + notice, this list of conditions and the following disclaimer. +2. Redistributions in binary form must reproduce the copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. +3. The name of the author may not be used to endorse or promote products + derived from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, +INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff -Nru libkpeople-0.99.0+git20140429+r457/CMakeLists.txt libkpeople-0.99.0+git20140506+r459/CMakeLists.txt --- libkpeople-0.99.0+git20140429+r457/CMakeLists.txt 2014-04-29 17:48:29.000000000 +0000 +++ libkpeople-0.99.0+git20140506+r459/CMakeLists.txt 2014-05-06 02:48:21.000000000 +0000 @@ -16,6 +16,7 @@ set(KPEOPLE_VERSION "${KPEOPLE_VERSION_MAJOR}.${KPEOPLE_VERSION_MINOR}.${KPEOPLE_VERSION_PATCH}") set(KPEOPLE_SOVERSION 3) +set(KPEOPLE_LIBVERSION "${KPEOPLE_SOVERSION}.${KPEOPLE_VERSION_MINOR}.${KPEOPLE_VERSION_PATCH}") find_package (KDE4 ${KDE_MIN_VERSION} REQUIRED) find_package (KdepimLibs REQUIRED) diff -Nru libkpeople-0.99.0+git20140429+r457/debian/bzr-builder.manifest libkpeople-0.99.0+git20140506+r459/debian/bzr-builder.manifest --- libkpeople-0.99.0+git20140429+r457/debian/bzr-builder.manifest 2014-04-29 17:48:35.000000000 +0000 +++ libkpeople-0.99.0+git20140506+r459/debian/bzr-builder.manifest 2014-05-06 02:48:23.000000000 +0000 @@ -1,3 +1,3 @@ -# bzr-builder format 0.3 deb-version 0.99.0+git20140429+r457-0ubuntu1 -lp:~blue-shell/blue-shell/libkpeople revid:git-v1:c962a341cfbb60865d2c59c5bd3a608e3db9908e +# bzr-builder format 0.3 deb-version 0.99.0+git20140506+r459-0ubuntu1 +lp:~blue-shell/blue-shell/libkpeople revid:git-v1:97fbce122fdb2e585cd18a1b18c2638ae054e730 merge packaging lp:~blue-shell/blue-shell/libkpeople-ubuntu revid:david@davidedmundson.co.uk-20131227094700-bxfo65gipi35m6oa diff -Nru libkpeople-0.99.0+git20140429+r457/debian/changelog libkpeople-0.99.0+git20140506+r459/debian/changelog --- libkpeople-0.99.0+git20140429+r457/debian/changelog 2014-04-29 17:48:35.000000000 +0000 +++ libkpeople-0.99.0+git20140506+r459/debian/changelog 2014-05-06 02:48:23.000000000 +0000 @@ -1,8 +1,8 @@ -libkpeople (0.99.0+git20140429+r457-0ubuntu1~ubuntu13.10.1) saucy; urgency=low +libkpeople (0.99.0+git20140506+r459-0ubuntu1~ubuntu13.10.1) saucy; urgency=low * Auto build. - -- Launchpad Package Builder Tue, 29 Apr 2014 17:48:35 +0000 + -- Launchpad Package Builder Tue, 06 May 2014 02:48:23 +0000 libkpeople (0-0ubuntu1) UNRELEASED; urgency=low diff -Nru libkpeople-0.99.0+git20140429+r457/src/CMakeLists.txt libkpeople-0.99.0+git20140506+r459/src/CMakeLists.txt --- libkpeople-0.99.0+git20140429+r457/src/CMakeLists.txt 2014-04-29 17:48:29.000000000 +0000 +++ libkpeople-0.99.0+git20140506+r459/src/CMakeLists.txt 2014-05-06 02:48:21.000000000 +0000 @@ -37,7 +37,7 @@ ${KDEPIMLIBS_KABC_LIBS} ) -set_target_properties (kpeople PROPERTIES VERSION ${KPEOPLE_VERSION} SOVERSION ${KPEOPLE_SOVERSION}) +set_target_properties (kpeople PROPERTIES VERSION ${KPEOPLE_LIBVERSION} SOVERSION ${KPEOPLE_SOVERSION}) if (MSVC) set_target_properties (kpeople PROPERTIES diff -Nru libkpeople-0.99.0+git20140429+r457/src/widgets/CMakeLists.txt libkpeople-0.99.0+git20140506+r459/src/widgets/CMakeLists.txt --- libkpeople-0.99.0+git20140429+r457/src/widgets/CMakeLists.txt 2014-04-29 17:48:29.000000000 +0000 +++ libkpeople-0.99.0+git20140506+r459/src/widgets/CMakeLists.txt 2014-05-06 02:48:21.000000000 +0000 @@ -28,7 +28,7 @@ kpeople ) -set_target_properties (kpeoplewidgets PROPERTIES VERSION ${KPEOPLE_VERSION} SOVERSION ${KPEOPLE_SOVERSION}) +set_target_properties (kpeoplewidgets PROPERTIES VERSION ${KPEOPLE_LIBVERSION} SOVERSION ${KPEOPLE_SOVERSION}) if (MSVC) set_target_properties (kpeoplewidgets PROPERTIES