Merge branch 'release/debian/0.9.10-3'debian/0.9.10-3

7 files changed, 29 insertions, 9 deletions

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..c2d8526
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+debian/files
+.pc
diff --git a/debian/changelog b/debian/changelog
index 20efc25..f5f1742 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,26 @@
+libunistring (0.9.10-3) unstable; urgency=medium
+
+  * Update symbols for non-glibc. (Closes: #956635)
+    - thanks to Helmut Grohne <helmut@subdivi.de>.
+  * Declare compliance with Debian Policy 4.5.0 (No changes needed).
+  * Migrate to debhelper-compat 13:
+    - Remove debian/compat.
+    - Bump minimum debhelper-compat version in debian/control to = 13.
+    - New debian/not_installed:
+      + Add usr/share/info/libunistring.info
+      + Add usr/lib/x86_64-linux-gnu/libunistring.la
+  * debian/control:
+    - Add Rules-Requires-Root: no.
+  * debian/copyright:
+    - Add year 2020 to myself.
+
+ -- Jörg Frings-Fürst <debian@jff.email>  Sun, 31 May 2020 15:08:22 +0200
+
 libunistring (0.9.10-2) unstable; urgency=medium
 
   * New patch debian/patches/0705-gcc-9.patch:
     - Fix gcc-9 issue (Closes: #925762, #920824).
-  * Migrate to debhelper 12:
-    - Change debian/compat to 12.
-    - Bump minimum debhelper version in debian/control to >= 12.
+  
   * Declare compliance with Debian Policy 4.4.0 (No changes needed).
   * debian/copyright:
     - Refresh copyright years for debian/* to 2019.
diff --git a/debian/compat b/debian/compat
deleted file mode 100644
index 48082f7..0000000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-12
diff --git a/debian/control b/debian/control
index 5d85596..367933a 100644
--- a/debian/control
+++ b/debian/control
@@ -2,9 +2,10 @@ Source: libunistring
 Priority: optional
 Maintainer: Jörg Frings-Fürst <debian@jff.email>
 Build-Depends:
- debhelper (>= 12)
-Standards-Version: 4.4.0
+ debhelper-compat (= 13)
+Standards-Version: 4.5.0
 Section: libs
+Rules-Requires-Root: no
 Homepage: https://www.gnu.org/software/libunistring/
 Vcs-Git: git://jff.email/opt/git/libunistring.git
 Vcs-Browser: https://jff.email/cgit/libunistring.git
diff --git a/debian/copyright b/debian/copyright
index 7a01cfb..78320b6 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -48,7 +48,7 @@ License: MIT
 
 Files: debian/*
 Copyright: 2009-2011 Andreas Rottmann <rotty@debian.org>
-           2017-2019 Jörg Frings-Fürst <debian@jff.email>
+           2017-2020 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 6067110..3062d8a 100644
--- a/debian/libunistring2.symbols
+++ b/debian/libunistring2.symbols
@@ -144,7 +144,7 @@ libunistring.so.2 libunistring2 #MINVER#
  libunistring_c_tolower@Base 0.9.7
  libunistring_c_toupper@Base 0.9.7
  libunistring_freea@Base 0.9.7
- libunistring_fseterr@Base 0.9.7
+ (arch=gnu-any-any)libunistring_fseterr@Base 0.9.7
  libunistring_gl_locale_name@Base 0.9.7
  libunistring_gl_locale_name_default@Base 0.9.7
  libunistring_gl_locale_name_environ@Base 0.9.7
@@ -158,7 +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
+ (arch=gnu-any-any)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
diff --git a/debian/not-installed b/debian/not-installed
new file mode 100644
index 0000000..b08b312
--- /dev/null
+++ b/debian/not-installed
@@ -0,0 +1,2 @@
+usr/share/info/libunistring.info
+usr/lib/x86_64-linux-gnu/libunistring.la