[SCM] game about viruses invading your computer branch, master, updated. debian/1.0-1.dfsg.1-1-5-gd614a4c
Stephen M. Webb
stephen.webb at bregmasoft.ca
Fri Dec 2 19:41:54 UTC 2011
The following commit has been merged in the master branch:
commit 9ce235916259aba04bf6d9a2657103dcbcd1dc84
Author: Stephen M. Webb <stephen.webb at bregmasoft.ca>
Date: Fri Dec 2 13:11:10 2011 -0500
Fixed FTBFS with ld --as-needed (Closes: #641328) (LP: #832825).
diff --git a/debian/changelog b/debian/changelog
index 5c0026d..103ead8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,10 @@
-viruskiller (1.0-1.dfsg.1-1.1) unstable; urgency=low
+viruskiller (1.0-1.dfsg.1-2) unstable; urgency=low
* Fixed a segfault in pak during packaging build.
* Bump standards to 3.9.2 (no changes needed).
+ * Fixed FTBFS with ld --as-needed (Closes: #641328) (LP: #832825).
- -- Stephen M. Webb <stephen.webb at canonical.com> Fri, 02 Dec 2011 12:54:27 -0500
+ -- Stephen M. Webb <stephen.webb at bregmasoft.ca> Fri, 02 Dec 2011 13:01:57 -0500
viruskiller (1.0-1.dfsg.1-1) unstable; urgency=low
diff --git a/debian/patches/0007-link-as-needed.patch b/debian/patches/0007-link-as-needed.patch
new file mode 100644
index 0000000..933275b
--- /dev/null
+++ b/debian/patches/0007-link-as-needed.patch
@@ -0,0 +1,19 @@
+Description: Fix FTBFS with ld --as-needed.
+Author: Matthias Klose <doko at ubuntu.com>
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/832825
+
+--- a/makefile
++++ b/makefile
+@@ -59,10 +59,10 @@
+
+ # linking the program.
+ $(PROG): $(OBJS)
+- $(CXX) $(LIBS) $(OBJS) -o $(PROG)
++ $(CXX) $(OBJS) $(LIBS) -o $(PROG)
+
+ pak: $(PAKOBJS)
+- $(CXX) $(LIBS) $(PAKOBJS) -o pak
++ $(CXX) $(PAKOBJS) $(LIBS) -o pak
+
+ # cleaning everything that can be automatically recreated with "make".
+ clean:
diff --git a/debian/patches/series b/debian/patches/series
index 5238433..9ae8e9e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@ desktop-file.patch
spelling.patch
link-libz.patch
0006-fix-pak-segfault.patch
+0007-link-as-needed.patch
--
game about viruses invading your computer
More information about the Pkg-games-commits
mailing list