[graywolf] 02/02: Export patches from gbp-pq

Ruben Undheim rubund-guest at moszumanska.debian.org
Sat May 14 13:59:21 UTC 2016


This is an automated email from the git hooks/post-receive script.

rubund-guest pushed a commit to branch master
in repository graywolf.

commit 2b25861af76886a5eb92a844af6d14fde8075af8
Author: Ruben Undheim <ruben.undheim at gmail.com>
Date:   Sat May 14 15:58:50 2016 +0200

    Export patches from gbp-pq
---
 debian/changelog                                    |  6 ++++++
 debian/patches/01_no_rpath_in_debian_package.patch  | 17 +++++++++++------
 debian/patches/02_dont_create_link.patch            | 17 +++++++++++------
 debian/patches/04_install_directory_multiarch.patch | 17 +++++++++++------
 4 files changed, 39 insertions(+), 18 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1869db2..e6ae883 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+graywolf (0.1.3-2) UNRELEASED; urgency=medium
+
+  * Use gbp-pq for patch management
+
+ -- Ruben Undheim <ruben.undheim at gmail.com>  Sat, 14 May 2016 15:58:36 +0200
+
 graywolf (0.1.3-1) unstable; urgency=low
 
   * New upstream release
diff --git a/debian/patches/01_no_rpath_in_debian_package.patch b/debian/patches/01_no_rpath_in_debian_package.patch
index 5ef8707..bb3f58c 100644
--- a/debian/patches/01_no_rpath_in_debian_package.patch
+++ b/debian/patches/01_no_rpath_in_debian_package.patch
@@ -1,12 +1,17 @@
 From: Ruben Undheim <ruben.undheim at gmail.com>
-Subject: No built-in RPATH is desired in the Debian package
- even though it's present in the upstream install.
+Date: Sat, 14 May 2016 15:58:01 +0200
+Subject: No built-in RPATH is desired in the Debian package even though it's
+ present in the upstream install.
 
 Forwarded: doesn't make sense upstream
-Index: debian-graywolf/CMakeLists.txt
-===================================================================
---- debian-graywolf.orig/CMakeLists.txt
-+++ debian-graywolf/CMakeLists.txt
+---
+ CMakeLists.txt | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 10e2b22..b8b6444 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
 @@ -3,11 +3,11 @@ project (graywolf)
  
  INCLUDE(CheckIncludeFiles)
diff --git a/debian/patches/02_dont_create_link.patch b/debian/patches/02_dont_create_link.patch
index 2783e79..fdff778 100644
--- a/debian/patches/02_dont_create_link.patch
+++ b/debian/patches/02_dont_create_link.patch
@@ -1,13 +1,18 @@
+From: Ruben Undheim <ruben.undheim at gmail.com>
+Date: Sat, 14 May 2016 15:58:01 +0200
 Subject: The upstream command for creating symlink causes trouble when
  building the Debian packages. It is done by dh_link instead.
 
-From: Ruben Undheim <ruben.undheim at gmail.com>
 Forwarded: Doesn't make sense upstream
-Index: graywolf/CMakeLists.txt
-===================================================================
---- graywolf.orig/CMakeLists.txt	2015-07-22 17:23:02.615507725 +0200
-+++ graywolf/CMakeLists.txt	2015-07-22 17:23:28.441230555 +0200
-@@ -14,7 +14,6 @@
+---
+ CMakeLists.txt | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index b8b6444..2411c46 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -14,7 +14,6 @@ CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/config.h.in ${CMAKE_CURRENT_BINARY_DI
  
  
  install(DIRECTORY flow DESTINATION lib/graywolf/bin)
diff --git a/debian/patches/04_install_directory_multiarch.patch b/debian/patches/04_install_directory_multiarch.patch
index a490255..b5eeda3 100644
--- a/debian/patches/04_install_directory_multiarch.patch
+++ b/debian/patches/04_install_directory_multiarch.patch
@@ -1,11 +1,16 @@
+From: Ruben Undheim <ruben.undheim at gmail.com>
+Date: Sat, 14 May 2016 15:58:01 +0200
 Subject: This patch makes the library support multi-arch
 
-From: Ruben Undheim <ruben.undheim at gmail.com>
-Index: graywolf/src/Ylib/CMakeLists.txt
-===================================================================
---- graywolf.orig/src/Ylib/CMakeLists.txt	2015-07-22 19:23:59.054959148 +0200
-+++ graywolf/src/Ylib/CMakeLists.txt	2015-07-22 19:24:18.034778631 +0200
-@@ -12,4 +12,4 @@
+---
+ src/Ylib/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/Ylib/CMakeLists.txt b/src/Ylib/CMakeLists.txt
+index 7e0ce81..25a295f 100644
+--- a/src/Ylib/CMakeLists.txt
++++ b/src/Ylib/CMakeLists.txt
+@@ -12,4 +12,4 @@ set_target_properties(ycadgraywolf PROPERTIES VERSION 0.0.0 SOVERSION 0)
  
  INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include ${CMAKE_BINARY_DIR}/include)
  

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/graywolf.git



More information about the debian-science-commits mailing list