[SCM] Seamless communication between many kinds of Unix branch, debian, updated. b28d0201dd5a70da13965f9f3217b776eaa61abc

Ole Streicher debian at liska.ath.cx
Thu Jul 25 15:35:30 UTC 2013


The following commit has been merged in the debian branch:
commit b28d0201dd5a70da13965f9f3217b776eaa61abc
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Thu Jul 25 17:31:43 2013 +0200

    Fix FTBS on IA64

diff --git a/debian/changelog b/debian/changelog
index 8357551..cd8baf0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xpa (2.1.15-2) unstable; urgency=low
+
+  * Fix FTBS on IA64
+
+ -- Ole Streicher <debian at liska.ath.cx>  Thu, 25 Jul 2013 17:29:25 +0200
+
 xpa (2.1.15-1) unstable; urgency=low
 
   * New upstream version
diff --git a/debian/patches/hardening.patch b/debian/patches/hardening.patch
index e0608b4..e27eef2 100644
--- a/debian/patches/hardening.patch
+++ b/debian/patches/hardening.patch
@@ -16,7 +16,7 @@ Description: Add hardening flags
  		rm -f lib$(PACKAGE).tmp/tcl*.o; \
  		CC='$(CC)' CXX=$(CXX) \
 -		./mklib -o $(PACKAGE) lib$(PACKAGE).tmp/*.o; \
-+		./mklib -ldflags $(LDFLAGS) -o $(PACKAGE) lib$(PACKAGE).tmp/*.o; \
++		./mklib -ldflags "$(LDFLAGS)" -o $(PACKAGE) lib$(PACKAGE).tmp/*.o; \
  		rm -rf lib$(PACKAGE).tmp)
  
  mingw-dll:	$(LIBOBJS)
@@ -25,7 +25,7 @@ Description: Add hardening flags
  		(cd $(PACKAGE)tmp && ar x ../libtclxpa.a); \
  		CC='$(CC)' CXX='$(CXX)' \
 -		./mklib -o tclxpa -L. -lxpa $(PACKAGE)tmp/*.o $(TCL_LIBS); \
-+		./mklib -ldflags $(LDFLAGS) -o tclxpa -L. -lxpa $(PACKAGE)tmp/*.o $(TCL_LIBS); \
++		./mklib -ldflags "$(LDFLAGS)" -o tclxpa -L. -lxpa $(PACKAGE)tmp/*.o $(TCL_LIBS); \
  		rm -rf $(PACKAGE)tmp; )
  
  diff:

-- 
Seamless communication between many kinds of Unix



More information about the debian-science-commits mailing list