[SCM] gammaray packaging branch, master, updated. debian/1.2.1-2-9-g5a8bd1a

[Jakub Adam]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/gammaray.git;a=commitdiff;h=c29c143

The following commit has been merged in the master branch:
commit c29c143048c4bab46ee3dc5cce0bc65759df7ddc
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date:   Fri Dec 21 22:49:51 2012 +0100

    Refreshed d/patches/gammaray-probe-versioned-soname.patch
---
 debian/changelog                                   |    1 +
 .../patches/gammaray-probe-versioned-soname.patch  |   10 +++++-----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 94bb532..705cb2b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ gammaray (1.2.2-1) UNRELEASED; urgency=low
   * New upstream release.
   * Removed d/patches/dont-build-functionoverwriter.patch and
     debian/patches/gnu-hurd-build-fix.patch (applied upstream).
+  * Refreshed d/patches/gammaray-probe-versioned-soname.patch.
 
  -- Jakub Adam <jakub.adam at ktknet.cz>  Fri, 21 Dec 2012 22:39:46 +0100
 
diff --git a/debian/patches/gammaray-probe-versioned-soname.patch b/debian/patches/gammaray-probe-versioned-soname.patch
index bdc31de..bec30b2 100644
--- a/debian/patches/gammaray-probe-versioned-soname.patch
+++ b/debian/patches/gammaray-probe-versioned-soname.patch
@@ -10,11 +10,11 @@ Subject: gammaray-probe-versioned-soname
  4 files changed, 4 insertions(+), 2 deletions(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 28a16ce..76e8862 100644
+index f2055bb..4bbee30 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -28,6 +28,7 @@ set(GAMMARAY_VERSION_MINOR "2")
- set(GAMMARAY_VERSION_PATCH "1")
+ set(GAMMARAY_VERSION_PATCH "2")
  set(GAMMARAY_VERSION "${GAMMARAY_VERSION_MAJOR}.${GAMMARAY_VERSION_MINOR}.${GAMMARAY_VERSION_PATCH}")
  set(GAMMARAY_VERSION_STRING "${GAMMARAY_VERSION}")
 +set(GAMMARAY_PROBE_SOVERSION "${GAMMARAY_VERSION_STRING}")
@@ -22,7 +22,7 @@ index 28a16ce..76e8862 100644
  set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
  
 diff --git a/config-gammaray.h.cmake b/config-gammaray.h.cmake
-index 53cf750..faa0803 100644
+index 0236a7c..2bda83c 100644
 --- a/config-gammaray.h.cmake
 +++ b/config-gammaray.h.cmake
 @@ -1,5 +1,6 @@
@@ -33,10 +33,10 @@ index 53cf750..faa0803 100644
  #define GAMMARAY_BUILD_DIR "${CMAKE_BINARY_DIR}"
  
 diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
-index 2ede848..6aadfbf 100644
+index b49d795..10d81e3 100644
 --- a/core/CMakeLists.txt
 +++ b/core/CMakeLists.txt
-@@ -167,6 +167,6 @@ target_link_libraries(gammaray_probe
+@@ -172,6 +172,6 @@ target_link_libraries(gammaray_probe
  if(NOT WIN32)
    target_link_libraries(gammaray_probe dl)
  endif()

-- 
gammaray packaging