summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2016-09-20 00:40:40 +0200
committerJörg Frings-Fürst <debian@jff-webhosting.net>2016-09-20 00:40:40 +0200
commit0c10a3fed17a40b269408fc083af0859ac8f525f (patch)
tree597268565dd7032078025a0bb34d79956d453039
parent21c12d4c30aa6b40847ff8a30c73112aa24b586d (diff)
new patches/0130-typos.patch
-rw-r--r--debian/changelog18
-rw-r--r--debian/patches/0125-gcc6.patch6
-rw-r--r--debian/patches/0130-typos.patch18
-rw-r--r--debian/patches/series1
4 files changed, 34 insertions, 9 deletions
diff --git a/debian/changelog b/debian/changelog
index b762614..eb9221e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,24 +1,24 @@
-xbase64 (3.1.2-7) unstable; urgency=low
+xbase64 (3.1.2-7) unstable; urgency=medium
* New debian/patches/0125-gcc6.patch for gcc-6 compatibility
(Closes: #811846).
Thanks to Pino Toscano <pino@debian.org>.
- * debian/rules:
- - Simplify override_dh_auto_configure.
- - Remove override_dh_installdocs to fix FTBFS.
- * debian/copyright:
- - Add year 2016 to debian/*.
- * debian/watch:
- - Bump version to 4 (No changes required).
- * Renumbering debian/patches/*.
* debian/control:
- Change Vcs-* to secure uri.
- Bump Standards-Version to 3.9.8 (no changes required).
- Change debhelper version to >= 10.
- Add missing libxbase64-doc to Depends for libxbase64-[1|bin|dev].
+ * debian/copyright:
+ - Add year 2016 to debian/*.
+ * debian/rules:
+ - Simplify override_dh_auto_configure.
+ - Remove override_dh_installdocs to fix FTBFS.
+ * debian/watch:
+ - Bump version to 4 (No changes required).
* Bump compat level to 10.
* Use dpkg-maintscript-helper dir_to_symlink at debian/*.postinst.
* Remove useless debian/libxbase64-doc.lintian-overrides.
+ * Renumbering debian/patches/*.
* Add symbols files for all architectures.
-- Jörg Frings-Fürst <debian@jff-webhosting.net> Mon, 22 Aug 2016 20:25:38 +0200
diff --git a/debian/patches/0125-gcc6.patch b/debian/patches/0125-gcc6.patch
index e0d0520..aa509af 100644
--- a/debian/patches/0125-gcc6.patch
+++ b/debian/patches/0125-gcc6.patch
@@ -1,3 +1,9 @@
+Description: FTBFS with gcc-6
+Author: Pino Toscano <pino@debian.org>
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=811846
+Last-Update: 2016-09-19
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
Index: trunk/xbase64/xblock.cpp
===================================================================
--- trunk.orig/xbase64/xblock.cpp
diff --git a/debian/patches/0130-typos.patch b/debian/patches/0130-typos.patch
new file mode 100644
index 0000000..cd8e0b0
--- /dev/null
+++ b/debian/patches/0130-typos.patch
@@ -0,0 +1,18 @@
+Description: Typos in source
+Author: Jörg Frings-Fürst <debian@jff-webhosting.net>
+Last-Update: 2016-09-19
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+Index: trunk/bin/dbfutil1.cpp
+===================================================================
+--- trunk.orig/bin/dbfutil1.cpp
++++ trunk/bin/dbfutil1.cpp
+@@ -923,7 +923,7 @@ void MyClass::DebugMenu()
+
+ while( option != 99 ) {
+ std::cout << std::endl << std::endl << "Debug Menu" << std::endl;
+- std::cout << "1 - Dislay DBT Header" << std::endl;
++ std::cout << "1 - Display DBT Header" << std::endl;
+ std::cout << "2 - Find Memo Blocks" << std::endl;
+ std::cout << "3 - Get Memo Blocks" << std::endl;
+ std::cout << "4 - Dump index node chains to file xbase.dmp" << std::endl;
diff --git a/debian/patches/series b/debian/patches/series
index deb9ac5..fd2b12c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,5 @@
0125-gcc6.patch
+0130-typos.patch
0700-ReproducibleBuilds.patch
0100-typo.patch
0001-fixconfig.diff