[Python-modules-commits] [cf-python] 08/09: merge patched into master

[Klaus Zimmermann]

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

zklaus-guest pushed a commit to branch master-helper
in repository cf-python.

commit 67a433513b746d359043da5733a9672127b864e4
Merge: 4936151 967fb73
Author: Klaus Zimmermann <klaus_zimmermann at gmx.de>
Date:   Thu Sep 22 15:54:35 2016 +0200

    merge patched into master

 cf/um/umread/c-lib/Makefile                      |  2 +-
 debian/.git-dpm                                  |  4 ++--
 debian/patches/0003-Improve-umread-linking.patch | 16 +++++++++-------
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --cc debian/.git-dpm
index 40c03ca,0000000..daca481
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,8 -1,0 +1,8 @@@
 +# see git-dpm(1) from git-dpm package
- 0c95e47537f4a96c4ac8d445eb5f15f381e15fa8
- 0c95e47537f4a96c4ac8d445eb5f15f381e15fa8
++967fb7315b125732b6904ce2dfb33aa794259e74
++967fb7315b125732b6904ce2dfb33aa794259e74
 +76ee86db590d750a48893644cb9ef6f9d7e3bd46
 +76ee86db590d750a48893644cb9ef6f9d7e3bd46
 +cf-python_1.3.2+dfsg.1.orig.tar.gz
 +7964f7897042f80ed96aa26aec9351e2a98ae918
 +2126058
diff --cc debian/patches/0003-Improve-umread-linking.patch
index 5035bd9,0000000..77f8c00
mode 100644,000000..100644
--- a/debian/patches/0003-Improve-umread-linking.patch
+++ b/debian/patches/0003-Improve-umread-linking.patch
@@@ -1,32 -1,0 +1,34 @@@
- From 0c95e47537f4a96c4ac8d445eb5f15f381e15fa8 Mon Sep 17 00:00:00 2001
++From 967fb7315b125732b6904ce2dfb33aa794259e74 Mon Sep 17 00:00:00 2001
 +From: Klaus Zimmermann <klaus_zimmermann at gmx.de>
- Date: Thu, 22 Sep 2016 15:15:39 +0200
++Date: Thu, 22 Sep 2016 15:54:29 +0200
 +Subject: Improve umread linking.
 +
 +Signed-off-by: Klaus Zimmermann <klaus_zimmermann at gmx.de>
 +---
-  cf/um/umread/c-lib/Makefile | 4 ++--
-  1 file changed, 2 insertions(+), 2 deletions(-)
++ cf/um/umread/c-lib/Makefile | 6 +++---
++ 1 file changed, 3 insertions(+), 3 deletions(-)
 +
 +diff --git a/cf/um/umread/c-lib/Makefile b/cf/um/umread/c-lib/Makefile
- index 98d0685..69e2984 100644
++index 98d0685..5ddbef1 100644
 +--- a/cf/um/umread/c-lib/Makefile
 ++++ b/cf/um/umread/c-lib/Makefile
- @@ -5,7 +5,7 @@ LIBRARY=umfile.so
++@@ -5,8 +5,8 @@ LIBRARY=umfile.so
 + CC=gcc
 + CFLAGS=-Wall -fPIC -g
 + CPP=gcc -E -P
 +-LD=ld
++-LDFLAGS=-shared --build-id
 ++LD=gcc
-  LDFLAGS=-shared --build-id
+++LDFLAGS=-shared
 + OBJS = umfile.o error.o filetype.o \
 + 	malloc.o linklist.o new_structs.o swap.o
++ 
 +@@ -28,7 +28,7 @@ type-dep:
 + 	$(MAKE) -C $(TYPE_DEP_DIR)
 + 
 + $(LIBRARY): $(OBJS) type-dep
 +-	$(LD) $(LDFLAGS) -o $@ $(OBJS) --whole-archive $(TYPE_DEP_LIBRARY_PATH)
 ++	$(LD) $(LDFLAGS) -o $@ $(OBJS) -Wl,--whole-archive $(TYPE_DEP_LIBRARY_PATH) -Wl,--no-whole-archive
 + 
 + %.o: %.c $(HEADERS)
 + 	$(CC) $(CFLAGS) -c $<

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/cf-python.git