Merge branch 'feature/upstream' into develop

5 files changed, 34 insertions, 15 deletions

diff --git a/debian/changelog b/debian/changelog
index 9be945f2..827de05c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+libunistring (0.9.8-1) UNRELEASED; urgency=medium
+
+  * New upstream release.
+    - Refresh patches.
+    - Refresh symbols file.
+  * Change to my new mail address.
+  * debian/copyright:
+    - Refresh copyright years to 2017.
+  * 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>  Sat, 02 Dec 2017 10:31:01 +0100
+
 libunistring (0.9.7-2) unstable; urgency=medium
 
   * Upload to unstable.
@@ -25,7 +39,7 @@ libunistring (0.9.7-1) experimental; urgency=medium
   * Bump compat to 10:
     - Change debian/compat to 10.
     - Change debhelper version at debian/control to >= 10.
-    - Drop dh-autoreconf from both build-depends and dh --with arguments 
+    - Drop dh-autoreconf from both build-depends and dh --with arguments
       because this is all defaults when using dh compat 10.
   * Add symbols file.
   * New README.source to explain the branching model used.
@@ -90,7 +104,7 @@ libunistring (0.9.3-5) unstable; urgency=low
   * Standards-Version 3.9.2 (no changes).
   * Convert package to multiarch (closes: #646068):
     - Bumped build-depends versions for cdbs and debhelper.
-    - Extend configure flags to install libraries into 
+    - Extend configure flags to install libraries into
       multi-arch library directory.
     - Adapted debian/libunistring0.install.
     - Mark libunistring0 as "Multi-Arch: same".
@@ -99,10 +113,10 @@ libunistring (0.9.3-5) unstable; urgency=low
     - Removed useless .dirs files.
     - debian/compat bumped to 8 (compat level 9 not needed as we don't use
       the "dh" script).
-  * debian/copyright: 
+  * debian/copyright:
     - Bumped DEP5 revision in format URL to 202.
     - Fixed various issues pointed out by lintian.
-  
+
  -- Andreas Rottmann <rotty@debian.org>  Wed, 26 Oct 2011 23:23:59 +0200
 
 libunistring (0.9.3-4) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 82927dee..86246034 100644
--- a/debian/control
+++ b/debian/control
@@ -1,9 +1,9 @@
 Source: libunistring
 Priority: optional
-Maintainer: Jörg Frings-Fürst <debian@jff-webhosting.net>
-Build-Depends: 
+Maintainer: Jörg Frings-Fürst <debian@jff.email>
+Build-Depends:
  debhelper (>= 10),
-Standards-Version: 4.0.0
+Standards-Version: 4.1.2.0
 Section: libs
 Homepage: http://www.gnu.org/software/libunistring/
 Vcs-Git: https://anonscm.debian.org/git/collab-maint/libunistring.git
diff --git a/debian/copyright b/debian/copyright
index 512570cd..d32eee7f 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,11 +4,11 @@ Upstream-Contact: Bruno Haible <bruno@clisp.org>
 Source: http://ftp.gnu.org/gnu/libunistring/
 
 Files: *
-Copyright: 1995-2016 Free Software Foundation, Inc.
+Copyright: 1995-2017 Free Software Foundation, Inc.
 License: LGPL-3+ or GPL-2+
 
 Files: gnulib-m4/* m4/*.m4
-Copyright: 1995-2016 Free Software Foundation, Inc.
+Copyright: 1995-2017 Free Software Foundation, Inc.
 License: FreeSoftware
  This file is free software; the Free Software Foundation
  gives unlimited permission to copy and/or distribute it,
@@ -25,15 +25,15 @@ License: GPL-2+ with distribution exception
  the same distribution terms as the rest of that program.
 
 Files: doc/*
-Copyright: 2001-2009 Free Software Foundation, Inc.
+Copyright: 2001-2017 Free Software Foundation, Inc.
 License: GPL-3+ or GFDL-1.2+
 
 Files: tests/* woe32dll/* autogen.sh
-Copyright: 1990-2016 Free Software Foundation, Inc.
+Copyright: 1990-2017 Free Software Foundation, Inc.
 License: GPL-3+
 
 Files: build-aux/*
-Copyright: 1995-2014 Free Software Foundation, Inc.
+Copyright: 1995-2017 Free Software Foundation, Inc.
 License: GPL-2+
 
 Files: build-aux/texi2html
@@ -48,7 +48,7 @@ License: MIT
 
 Files: debian/*
 Copyright: 2009-2011 Andreas Rottmann <rotty@debian.org>
-           2017      Jörg Frings-Fürst <debian@jff-webhosting.net>
+           2017      Jörg Frings-Fürst <debian@jff.email>
 License: GPL-3+
 
 License: LGPL-3+
diff --git a/debian/libunistring2.symbols b/debian/libunistring2.symbols
index 11ac254c..7a8be32e 100644
--- a/debian/libunistring2.symbols
+++ b/debian/libunistring2.symbols
@@ -158,6 +158,7 @@ libunistring.so.2 libunistring2 #MINVER#
  libunistring_gl_uninorm_decompose_merge_sort_inplace@Base 0.9.7
  libunistring_glthread_once_singlethreaded@Base 0.9.7
  libunistring_glthread_recursive_lock_init_multithreaded@Base 0.9.7
+ libunistring_glthread_rwlock_init_for_glibc@Base 0.9.8
  libunistring_hard_locale@Base 0.9.7
  libunistring_iconveh_close@Base 0.9.7
  libunistring_iconveh_open@Base 0.9.7
@@ -208,6 +209,7 @@ libunistring.so.2 libunistring2 #MINVER#
  libunistring_unilbrk_is_utf8_encoding@Base 0.9.7
  libunistring_unilbrk_table@Base 0.9.7
  libunistring_unilbrkprop@Base 0.9.7
+ libunistring_uniwbrk_prop_index@Base 0.9.8
  libunistring_uniwbrk_table@Base 0.9.7
  libunistring_xmax@Base 0.9.7
  libunistring_xsum3@Base 0.9.7
@@ -520,6 +522,7 @@ libunistring.so.2 libunistring2 #MINVER#
  uc_general_category_long_name@Base 0.9.7
  uc_general_category_name@Base 0.9.7
  uc_general_category_or@Base 0.9.7
+ uc_grapheme_breaks@Base 0.9.8
  uc_graphemeclusterbreak_property@Base 0.9.7
  uc_is_alnum@Base 0.9.7
  uc_is_alpha@Base 0.9.7
diff --git a/debian/patches/0700-multiarch-libc.patch b/debian/patches/0700-multiarch-libc.patch
index a732d420..1686bcb2 100644
--- a/debian/patches/0700-multiarch-libc.patch
+++ b/debian/patches/0700-multiarch-libc.patch
@@ -5,14 +5,14 @@ Index: trunk/lib/Makefile.am
 ===================================================================
 --- trunk.orig/lib/Makefile.am
 +++ trunk/lib/Makefile.am
-@@ -100,28 +100,13 @@ unistring/stdint.h : $(STDINT_H) stdint.
+@@ -101,30 +101,15 @@ unistring/stdint.h : $(STDINT_H) stdint.
  	  echo '#if __GLIBC__ >= 2'; \
  	  echo '#include <stdint.h>'; \
  	  echo '#else'; \
 -	  if test -f /usr/include/stdint.h; then \
 -	    HAVE_STDINT_H='1'; \
 -	  else \
--	    HAVE_STDINT_H='defined __MINGW32__ || defined __HAIKU__'; \
+-	    HAVE_STDINT_H='defined __MINGW32__ || defined __HAIKU__ || ((__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 5)) && !defined __NetBSD__)'; \
 -	  fi; \
 -	  if test -f /usr/include/inttypes.h; then \
 -	    HAVE_INTTYPES_H='1'; \
@@ -24,6 +24,8 @@ Index: trunk/lib/Makefile.am
 -	  else \
 -	    HAVE_SYS_INTTYPES_H='0'; \
 -	  fi; \
+ 	  sed_escape_ampersands='s/&/\\&/g'; \
+ 	  HAVE_STDINT_H=`echo "$$HAVE_STDINT_H" | sed -e "$$sed_escape_ampersands"`; \
 -	  sed -e 's/@''HAVE_STDINT_H''@/'"$$HAVE_STDINT_H"'/g' \
 +	  sed -e 's/@''HAVE_STDINT_H''@/$(or @HAVE_STDINT_H@,0)/g' \
  	      -e 's|@''INCLUDE_NEXT''@|include|g' \