[SCM] Image Reduction and Analysis Facility branch, debian, updated. 2ed5153522c1f923da70822b59c44e6544884252

Ole Streicher debian at liska.ath.cx
Sun Jun 2 22:15:17 UTC 2013


The following commit has been merged in the debian branch:
commit 7c2e78c5daa2caedbe857ea7672e6a8cb98c2099
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Sun Jun 2 11:41:59 2013 +0200

    Dont install internal curl headers. This should fix i386 FTBS

diff --git a/debian/patches/voclient.patch b/debian/patches/voclient.patch
index 960d15a..6abe098 100644
--- a/debian/patches/voclient.patch
+++ b/debian/patches/voclient.patch
@@ -292,3 +292,23 @@
  
  
  
+--- a/vendor/voclient/libsamp/libxrpc/Makefile
++++ b/vendor/voclient/libsamp/libxrpc/Makefile
+@@ -50,7 +50,7 @@
+ 
+ install: xrpc
+ 	(cp libxrpc.a ../libsamp.a)
+-	cp -rp $(INCS) ./include/* ../../include
++	cp -rp $(INCS) ./include/x* ../../include
+ 
+ World:
+ everything:
+@@ -70,7 +70,7 @@
+ 	cp $(OBJS) lib/build/
+ 	/usr/bin/ar rv libxrpc.a $?
+ 	(cp libxrpc.a ../libsamp.a)
+-	cp -rp $(INCS) ./include/* ../../include
++	cp -rp $(INCS) ./include/x* ../../include
+ 
+ %.o: %.c $(INCS)
+ 	/usr/bin/gcc -Wall $(CINCS) $(CFLAGS) -c $< -o $@

-- 
Image Reduction and Analysis Facility



More information about the debian-science-commits mailing list