From 21a0b1d823fec6f2970e37a7d493ba97a632c55d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 11 Dec 2022 19:35:22 +0100 Subject: Fix Architecture & MultiArch for libunistring2 --- debian/changelog | 9 +++++++++ debian/control | 3 +-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index b8fbbd80..9ae20def 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +libunistring (1.1-1~experimental2) UNRELEASED; urgency=medium + + * debian/control: + - libunistring2 (Closes: #1025901): + + Change Architecture to all. + + Remove Multi-Arch: same. + + -- Jörg Frings-Fürst Sun, 11 Dec 2022 19:00:32 +0100 + libunistring (1.1-1~experimental1) experimental; urgency=medium * New upstream release. diff --git a/debian/control b/debian/control index 8f6ff3b5..4f3f7a18 100644 --- a/debian/control +++ b/debian/control @@ -45,8 +45,7 @@ Description: Unicode string library for C This package contains the shared library. Package: libunistring2 -Architecture: any -Multi-Arch: same +Architecture: all Section: oldlibs Depends: libunistring5 (>= ${source:Version}), -- cgit v1.2.3 From 1d7b62209ea19ea676f446d89f67be009efcb953 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Mon, 12 Dec 2022 15:01:05 +0100 Subject: d/rules: Use DEB_VERSION_UPSTREAM instead of VERSION --- debian/changelog | 2 ++ debian/control | 1 + debian/rules | 4 +++- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 9ae20def..31e46049 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,8 @@ libunistring (1.1-1~experimental2) UNRELEASED; urgency=medium - libunistring2 (Closes: #1025901): + Change Architecture to all. + Remove Multi-Arch: same. + * debian/rules: + - Use DEB_VERSION_UPSTREAM instead of VERSION. -- Jörg Frings-Fürst Sun, 11 Dec 2022 19:00:32 +0100 diff --git a/debian/control b/debian/control index 4f3f7a18..3fead0d4 100644 --- a/debian/control +++ b/debian/control @@ -47,6 +47,7 @@ Description: Unicode string library for C Package: libunistring2 Architecture: all Section: oldlibs +Priority: optional Depends: libunistring5 (>= ${source:Version}), ${misc:Depends} 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 -- cgit v1.2.3 From 9417c9af943cfb28c501cca09b0f09e0836f9966 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Mon, 12 Dec 2022 15:10:16 +0100 Subject: d/changelog: Change distribution to experimental, Change date and time --- debian/changelog | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 31e46049..1e577154 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,13 +1,14 @@ -libunistring (1.1-1~experimental2) UNRELEASED; urgency=medium +libunistring (1.1-1~experimental2) experimental; urgency=medium * debian/control: - libunistring2 (Closes: #1025901): + Change Architecture to all. + Remove Multi-Arch: same. + + Add Priority: optional. * debian/rules: - Use DEB_VERSION_UPSTREAM instead of VERSION. - -- Jörg Frings-Fürst Sun, 11 Dec 2022 19:00:32 +0100 + -- Jörg Frings-Fürst Mon, 12 Dec 2022 15:05:41 +0100 libunistring (1.1-1~experimental1) experimental; urgency=medium -- cgit v1.2.3 From 98e14858e1d242e7113dceaeaa2301bfce789860 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Mon, 12 Dec 2022 18:23:46 +0100 Subject: d/control: Remove libunistring2; Remove Replaces & Breaks from libunistring5 --- debian/changelog | 6 ++---- debian/control | 12 ------------ 2 files changed, 2 insertions(+), 16 deletions(-) diff --git a/debian/changelog b/debian/changelog index 1e577154..0b9d6a6d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,8 @@ libunistring (1.1-1~experimental2) experimental; urgency=medium * debian/control: - - libunistring2 (Closes: #1025901): - + Change Architecture to all. - + Remove Multi-Arch: same. - + Add Priority: optional. + - Remove libunistring2 (Closes: #1025901). + - Remove Replaces & Breaks from libunistring5. * debian/rules: - Use DEB_VERSION_UPSTREAM instead of VERSION. diff --git a/debian/control b/debian/control index 3fead0d4..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: all -Section: oldlibs -Priority: optional -Depends: - libunistring5 (>= ${source:Version}), - ${misc:Depends} -Description: Unicode string library for C [transitional package] - This is a transitional package. It can safely be removed. -- cgit v1.2.3 From f2b38304054892891dc053393b26a9c1406b42d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Mon, 12 Dec 2022 18:25:01 +0100 Subject: d/changelog: Change date / time --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 0b9d6a6d..8e653e64 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,7 +6,7 @@ libunistring (1.1-1~experimental2) experimental; urgency=medium * debian/rules: - Use DEB_VERSION_UPSTREAM instead of VERSION. - -- Jörg Frings-Fürst Mon, 12 Dec 2022 15:05:41 +0100 + -- Jörg Frings-Fürst Mon, 12 Dec 2022 18:23:56 +0100 libunistring (1.1-1~experimental1) experimental; urgency=medium -- cgit v1.2.3