Merge branch 'release/debian/1.1-1_experimental2'debian/1.1-1_experimental2

3 files changed, 13 insertions, 13 deletions

diff --git a/debian/changelog b/debian/changelog
index b8fbbd80..8e653e64 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+libunistring (1.1-1~experimental2) experimental; urgency=medium
+
+  * debian/control:
+    - Remove libunistring2 (Closes: #1025901).
+    - Remove Replaces & Breaks from libunistring5.
+  * debian/rules:
+    - Use DEB_VERSION_UPSTREAM instead of VERSION.
+
+ -- Jörg Frings-Fürst <debian@jff.email>  Mon, 12 Dec 2022 18:23:56 +0100
+
 libunistring (1.1-1~experimental1) experimental; urgency=medium
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index 8f6ff3b5..c4ab7af5 100644
--- a/debian/control
+++ b/debian/control
@@ -28,8 +28,6 @@ Description: Unicode string library for C - development files
  and HTML format.
 
 Package: libunistring5
-Replaces: libunistring2 (<< 1.1-1~)
-Breaks: libunistring2 (<< 1.1-1~)
 Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
@@ -43,13 +41,3 @@ Description: Unicode string library for C
  expressions).
  .
  This package contains the shared library.
-
-Package: libunistring2
-Architecture: any
-Multi-Arch: same
-Section: oldlibs
-Depends:
- libunistring5 (>= ${source:Version}),
- ${misc:Depends}
-Description: Unicode string library for C [transitional package]
- This is a transitional package. It can safely be removed.
diff --git a/debian/rules b/debian/rules
index 5a0855a7..b34aa21f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,6 +5,8 @@
 # hardening
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
+include /usr/share/dpkg/default.mk
+
 ifneq ($(findstring $(DEB_BUILD_ARCH), mips mipsel),)
 	CFLAGS += -mplt
 endif
@@ -22,4 +24,4 @@ VERSION = $(shell head -n1 debian/changelog | sed -e 's/.*(//;s/-.*).*//;s/\+/\-
 
 override_dh_makeshlibs:
 	dh_makeshlibs
-	dpkg-gensymbols -v$(VERSION) -plibunistring5
+	dpkg-gensymbols -v$(DEB_VERSION_UPSTREAM) -plibunistring5