[Forensics-changes] [tableau-parm] 01/01: Imported Debian patch 0.2.0-4
Joao Eriberto Mota Filho
eriberto at moszumanska.debian.org
Thu Nov 19 23:59:55 UTC 2015
This is an automated email from the git hooks/post-receive script.
eriberto pushed a commit to branch debian
in repository tableau-parm.
commit 7674e93695ef298c13f1f9738f9f464dbc2ce718
Author: Joao Eriberto Mota Filho <eriberto at debian.org>
Date: Wed Nov 18 16:47:07 2015 -0200
Imported Debian patch 0.2.0-4
---
debian/changelog | 13 +++++++++++++
.../patches/{fix-string-error => 10_fix-string-error.patch} | 0
debian/patches/{fix-makefile => 20_fix-makefile.patch} | 6 +++++-
.../{fix-spelling-error => 30_fix-spelling-error.patch} | 0
debian/patches/series | 6 +++---
debian/watch | 2 +-
6 files changed, 22 insertions(+), 5 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index f3af9d9..c405728 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+tableau-parm (0.2.0-4) unstable; urgency=medium
+
+ * Team upload.
+ * debian/patches/:
+ - fix-string-error: renamed to 10_fix-string-error.patch.
+ - fix-makefile:
+ ~ Renamed to 20_fix-makefile.patch.
+ ~ fixed a FTBFS when using ld --as-needed. Thanks to
+ Logan Rosen <logan at ubuntu.com> (Closes: #805428, LP: #832758)
+ - fix-spelling-error: renamed to 30_fix-spelling-error.patch.
+
+ -- Joao Eriberto Mota Filho <eriberto at debian.org> Wed, 18 Nov 2015 16:47:07 -0200
+
tableau-parm (0.2.0-3) unstable; urgency=medium
* Team upload.
diff --git a/debian/patches/fix-string-error b/debian/patches/10_fix-string-error.patch
similarity index 100%
rename from debian/patches/fix-string-error
rename to debian/patches/10_fix-string-error.patch
diff --git a/debian/patches/fix-makefile b/debian/patches/20_fix-makefile.patch
similarity index 86%
rename from debian/patches/fix-makefile
rename to debian/patches/20_fix-makefile.patch
index 5e3222d..4a42bc8 100644
--- a/debian/patches/fix-makefile
+++ b/debian/patches/20_fix-makefile.patch
@@ -5,6 +5,10 @@ Last-Update: 2009-11-05
Description: add flags to allow the GCC hardening.
Author: Joao Eriberto Mota Filho <eriberto at debian.org>
Last-Update: 2014-11-17
+
+Description: fix FTBFS with ld --as-needed. (Closes: #805428, LP: #832758)
+Author: Logan Rosen <logan at ubuntu.com>
+Last-Update: 2015-11-18
Index: tableau-parm/Makefile
===================================================================
--- tableau-parm.orig/Makefile 2009-11-01 23:35:53.171749364 +0100
@@ -27,7 +31,7 @@ Index: tableau-parm/Makefile
build/bin/tableau-parm: build/bin src/tableau-parm.c Makefile
- $(CC) $(OPTS) -o $@ -I/usr/local/include -L/usr/local/lib -lsgutils src/tableau-parm.c
-+ $(CC) $(CFLAGS) $(LDFLAGS) $(CPPFLAGS) $(OPTS) -o $@ -I/usr/include -L/usr/lib -lsgutils2 src/tableau-parm.c
++ $(CC) $(CFLAGS) $(LDFLAGS) $(CPPFLAGS) $(OPTS) -o $@ -I/usr/include -L/usr/lib src/tableau-parm.c -lsgutils2
build/doc/man/man1/tableau-parm.1.gz: doc/man/man1/tableau-parm.1.gz
mkdir -p build/doc/man/man1
diff --git a/debian/patches/fix-spelling-error b/debian/patches/30_fix-spelling-error.patch
similarity index 100%
rename from debian/patches/fix-spelling-error
rename to debian/patches/30_fix-spelling-error.patch
diff --git a/debian/patches/series b/debian/patches/series
index fef5e15..8fa46fd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,3 @@
-fix-string-error
-fix-makefile
-fix-spelling-error
+10_fix-string-error.patch
+20_fix-makefile.patch
+30_fix-spelling-error.patch
diff --git a/debian/watch b/debian/watch
index 7565d43..e607c11 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,3 @@
version=3
http://projects.sentinelchicken.org/tableau-parm/download/ .*/(?:downloads|files)/tableau-parm(?:-src)?-(\d\S+)\.tar\.(?:bz2|gz|xz)
-https://code.google.com/p/tableau-parm/downloads/list .*name=tableau-parm(?:-src)?-(\d\S+)\.tar\.(?:bz2|gz|xz).*
\ No newline at end of file
+https://code.google.com/p/tableau-parm/downloads/list .*name=tableau-parm(?:-src)?-(\d\S+)\.tar\.(?:bz2|gz|xz).*
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/forensics/tableau-parm.git
More information about the forensics-changes
mailing list