Merge branch 'feature/upstream' into develop

4 files changed, 19 insertions, 5 deletions

diff --git a/debian/changelog b/debian/changelog
index 453ddab..a25f099 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+libonig (6.7.0-1) UNRELEASED; urgency=medium
+
+  * New upstream release.
+    - Refresh symbols file.
+  * Change to my new email address:
+    - debian/control
+    - debian/copyright
+  * debian/changelog:
+    - Remove trailing whitespaces.
+  * Declare compliance with Debian Policy 4.1.2.0. (No changes needed).
+
+ -- Jörg Frings-Fürst <debian@jff.email>  Thu, 14 Dec 2017 16:55:22 +0100
+
 libonig (6.6.1-1) unstable; urgency=medium
 
   * New upstream release.
@@ -124,14 +137,14 @@ libonig (5.9.6-1) unstable; urgency=medium
   * Refresh debian/symbols.
   * debian/rules:
     - rewrite override_dh_strip.
-    - Add dpkg-gensymbols to generate symbol file(s) 
+    - Add dpkg-gensymbols to generate symbol file(s)
       on every build.
   * debian/copyright:
     Add year 2015 to my entry at debian/*.
   * debian/control:
     - Remove useless Depends ${shlibs:Depends} from libonig2-dbg
       and libonig-dev
-    - Add dpkg and ${misc:Pre-Depends} to Depends of libonig2-dbg 
+    - Add dpkg and ${misc:Pre-Depends} to Depends of libonig2-dbg
       to prevent error on upgrade wheezy to jessie (Closes: #769556).
     - Bump Standards-Version to 3.9.6 (no changes required).
     - Add Vcs-* fields pointed to alioth.
diff --git a/debian/control b/debian/control
index e59bbc4..cd533e7 100644
--- a/debian/control
+++ b/debian/control
@@ -1,10 +1,10 @@
 Source: libonig
 Section: libs
 Priority: extra
-Maintainer: Jörg Frings-Fürst <debian@jff-webhosting.net>
+Maintainer: Jörg Frings-Fürst <debian@jff.email>
 Build-Depends:
  debhelper (>= 10)
-Standards-Version: 4.1.0.0
+Standards-Version: 4.1.2.0
 Homepage: https://github.com/kkos/oniguruma
 Vcs-Git: https://anonscm.debian.org/cgit/collab-maint/libonig.git
 Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/libonig.git
diff --git a/debian/copyright b/debian/copyright
index a57a2e3..1e0ef89 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -30,7 +30,7 @@ License: BSD-2-clause
 
 Files: debian/*
 Copyright: 2006-2008 Max Kellermann <max@duempel.org> 
-           2014-2017 Jörg Frings-Fürst <debian@jff-webhosting.net>
+           2014-2017 Jörg Frings-Fürst <debian@jff.email>
 License: GPL-2+
 
 License: GPL-2+
diff --git a/debian/symbols b/debian/symbols
index dd785d7..7ee9d18 100644
--- a/debian/symbols
+++ b/debian/symbols
@@ -41,6 +41,7 @@ libonig.so.4 libonig4 #MINVER#
  OnigSyntaxGnuRegex@Base 5.9.5
  OnigSyntaxGrep@Base 5.9.5
  OnigSyntaxJava@Base 5.9.5
+ OnigSyntaxOniguruma@Base 6.7.0
  OnigSyntaxPerl@Base 5.9.5
  OnigSyntaxPerl_NG@Base 5.9.5
  OnigSyntaxPosixBasic@Base 5.9.5