summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--debian/changelog7
-rw-r--r--debian/patches/0002-format-security.patch24
-rw-r--r--debian/patches/series1
3 files changed, 7 insertions, 25 deletions
diff --git a/debian/changelog b/debian/changelog
index 5b52c48..806cdf8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+lziprecover (1.14~rc2-1) experimental; urgency=low
+
+ * Merging upstream version 1.14~rc2.
+ * Dropping format-security.patch, not needed anymore.
+
+ -- Daniel Baumann <mail@daniel-baumann.ch> Tue, 26 Mar 2013 09:49:02 +0100
+
lziprecover (1.14~rc1-1) experimental; urgency=low
* Merging upstream version 1.14~rc1.
diff --git a/debian/patches/0002-format-security.patch b/debian/patches/0002-format-security.patch
deleted file mode 100644
index ac9a3c9..0000000
--- a/debian/patches/0002-format-security.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Author: Daniel Baumann <mail@daniel-baumann.ch>
-Description: Using string literal to fix FTBFS with -Werror=format-security.
-
-diff -Naurp lziprecover.orig/main.cc lziprecover/main.cc
---- lziprecover.orig/main.cc
-+++ lziprecover/main.cc
-@@ -418,7 +418,7 @@ int decompress( const int infd, const Pr
- }
- retval = 2; break;
- }
-- if( verbosity >= 2 ) { std::fprintf( stderr, ok_msg ); pp.reset(); }
-+ if( verbosity >= 2 ) { std::fprintf( stderr, "%s", ok_msg ); pp.reset(); }
- }
- }
- catch( std::bad_alloc )
-@@ -427,7 +427,7 @@ int decompress( const int infd, const Pr
- retval = 1;
- }
- catch( Error e ) { pp(); show_error( e.msg, errno ); retval = 1; }
-- if( verbosity == 1 && retval == 0 ) std::fprintf( stderr, ok_msg );
-+ if( verbosity == 1 && retval == 0 ) std::fprintf( stderr, "%s", ok_msg );
- return retval;
- }
-
diff --git a/debian/patches/series b/debian/patches/series
index 86cb98b..58cf314 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
0001-build.patch
-0002-format-security.patch