[cliquer] 05/11: rebase patches with gbp-pq

Mattia Rizzolo mattia at debian.org
Wed Nov 22 10:34:50 UTC 2017


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

mattia pushed a commit to branch master
in repository cliquer.

commit 21facbedc85ab7ba258a92a778d73da410566f3a
Author: Mattia Rizzolo <mattia at debian.org>
Date:   Wed Nov 22 11:21:59 2017 +0100

    rebase patches with gbp-pq
    
    Gbp-Dch: Ignore
    Signed-off-by: Mattia Rizzolo <mattia at debian.org>
---
 .../0001-make-local-function-in-cl.c-static.patch      | 10 +++-------
 debian/patches/0002-build-shared-library.patch         | 18 +++++++-----------
 debian/patches/0003-rename-cl-binary-to-cliquer.patch  | 10 +++-------
 debian/patches/0004-more-usual-flags-usage.patch       | 10 +++-------
 debian/patches/0005-add-install-target.patch           | 10 +++-------
 5 files changed, 19 insertions(+), 39 deletions(-)

diff --git a/debian/patches/0001-make-local-function-in-cl.c-static.patch b/debian/patches/0001-make-local-function-in-cl.c-static.patch
index 18762b3..cd514fb 100644
--- a/debian/patches/0001-make-local-function-in-cl.c-static.patch
+++ b/debian/patches/0001-make-local-function-in-cl.c-static.patch
@@ -1,11 +1,10 @@
-From 1f5b9b32eb955c01135f484120cf5d68e25ba5e8 Mon Sep 17 00:00:00 2001
-From: Bernhard R. Link <brlink at debian.org>
+From: "Bernhard R. Link" <brlink at debian.org>
 Date: Sat, 12 Mar 2011 15:09:47 +0100
 Subject: make local function in cl.c static
 
 ---
- cl.c |   24 ++++++++++++------------
- 1 files changed, 12 insertions(+), 12 deletions(-)
+ cl.c | 24 ++++++++++++------------
+ 1 file changed, 12 insertions(+), 12 deletions(-)
 
 diff --git a/cl.c b/cl.c
 index e929565..9005f1f 100644
@@ -84,6 +83,3 @@ index e929565..9005f1f 100644
  	print_clique(s,g);
  	return TRUE;
  }
--- 
-1.5.6.5
-
diff --git a/debian/patches/0002-build-shared-library.patch b/debian/patches/0002-build-shared-library.patch
index 7a89dd0..969a8ea 100644
--- a/debian/patches/0002-build-shared-library.patch
+++ b/debian/patches/0002-build-shared-library.patch
@@ -1,15 +1,14 @@
-From 55e3d1793c037355b87a4fc5b46b38460213012a Mon Sep 17 00:00:00 2001
-From: Bernhard R. Link <brlink at debian.org>
+From: "Bernhard R. Link" <brlink at debian.org>
 Date: Sat, 12 Mar 2011 16:06:39 +0100
 Subject: build shared library
 
 ---
- Makefile       |   24 ++++++++++++++++++++----
- cliquer.h      |   18 +++++++++---------
- graph.h        |   30 +++++++++++++++---------------
- libcliquer.map |   43 +++++++++++++++++++++++++++++++++++++++++++
- misc.h         |    7 +++++++
- reorder.h      |   28 ++++++++++++++--------------
+ Makefile       | 24 ++++++++++++++++++++----
+ cliquer.h      | 18 +++++++++---------
+ graph.h        | 30 +++++++++++++++---------------
+ libcliquer.map | 43 +++++++++++++++++++++++++++++++++++++++++++
+ misc.h         |  7 +++++++
+ reorder.h      | 28 ++++++++++++++--------------
  6 files changed, 108 insertions(+), 42 deletions(-)
  create mode 100644 libcliquer.map
 
@@ -265,6 +264,3 @@ index 5c06d31..1d3b4e1 100644
 +PUBLIC int *reorder_by_reverse(graph_t *g, boolean weighted);
  
  #endif /* !CLIQUER_REORDER_H */
--- 
-1.5.6.5
-
diff --git a/debian/patches/0003-rename-cl-binary-to-cliquer.patch b/debian/patches/0003-rename-cl-binary-to-cliquer.patch
index 37d9f41..574c9f3 100644
--- a/debian/patches/0003-rename-cl-binary-to-cliquer.patch
+++ b/debian/patches/0003-rename-cl-binary-to-cliquer.patch
@@ -1,11 +1,10 @@
-From ba9976cd6e00f831e6bb104b275ae63998a6a6d0 Mon Sep 17 00:00:00 2001
-From: Bernhard R. Link <brlink at debian.org>
+From: "Bernhard R. Link" <brlink at debian.org>
 Date: Sat, 12 Mar 2011 16:16:39 +0100
 Subject: rename cl binary to cliquer
 
 ---
- Makefile |    8 ++++----
- 1 files changed, 4 insertions(+), 4 deletions(-)
+ Makefile | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
 
 diff --git a/Makefile b/Makefile
 index da7fb79..8620a22 100644
@@ -47,6 +46,3 @@ index da7fb79..8620a22 100644
  
  backup:
  	mkdir "`date "+backup-%Y-%m-%d-%H-%M"`" 2>/dev/null || true
--- 
-1.5.6.5
-
diff --git a/debian/patches/0004-more-usual-flags-usage.patch b/debian/patches/0004-more-usual-flags-usage.patch
index 5d50e5a..cbd8c60 100644
--- a/debian/patches/0004-more-usual-flags-usage.patch
+++ b/debian/patches/0004-more-usual-flags-usage.patch
@@ -1,12 +1,11 @@
-From 0ee4a33d27ab261ae343338a6ca3f3c0d732e908 Mon Sep 17 00:00:00 2001
-From: Bernhard R. Link <brlink at debian.org>
+From: "Bernhard R. Link" <brlink at debian.org>
 Date: Sat, 12 Mar 2011 16:22:41 +0100
 Subject: more usual flags usage
 
 Always give CFLAGS to the linker, always CPPFLAGS to the compiler.
 ---
- Makefile |   15 ++++++++++-----
- 1 files changed, 10 insertions(+), 5 deletions(-)
+ Makefile | 15 ++++++++++-----
+ 1 file changed, 10 insertions(+), 5 deletions(-)
 
 diff --git a/Makefile b/Makefile
 index 8620a22..89ebbe8 100644
@@ -52,6 +51,3 @@ index 8620a22..89ebbe8 100644
  
  clean:
  	rm -f *.o *~ cliquer testcases *.so*
--- 
-1.5.6.5
-
diff --git a/debian/patches/0005-add-install-target.patch b/debian/patches/0005-add-install-target.patch
index ae464c3..b17f959 100644
--- a/debian/patches/0005-add-install-target.patch
+++ b/debian/patches/0005-add-install-target.patch
@@ -1,11 +1,10 @@
-From d62c750da74ed839b57719fdeb340ecf7bccec9f Mon Sep 17 00:00:00 2001
-From: Bernhard R. Link <brlink at debian.org>
+From: "Bernhard R. Link" <brlink at debian.org>
 Date: Sat, 12 Mar 2011 17:11:13 +0100
 Subject: add install target
 
 ---
- Makefile |   23 ++++++++++++++++++++---
- 1 files changed, 20 insertions(+), 3 deletions(-)
+ Makefile | 23 ++++++++++++++++++++---
+ 1 file changed, 20 insertions(+), 3 deletions(-)
 
 diff --git a/Makefile b/Makefile
 index 89ebbe8..b60e992 100644
@@ -55,6 +54,3 @@ index 89ebbe8..b60e992 100644
 +	# users should #include <cliquer/cliquer.h>
 +	$(INSTALL_DATA) cliquer.h set.h graph.h misc.h reorder.h \
 +		cliquerconf.h $(DESTDIR)$(prefix)/include/cliquer/
--- 
-1.5.6.5
-

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



More information about the debian-science-commits mailing list