summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff.email>2022-01-08 16:44:37 +0100
committerJörg Frings-Fürst <debian@jff.email>2022-01-08 16:44:37 +0100
commitd7c947086c89444bf144ff9b5790c4f365ba54c5 (patch)
tree4c54106bd376e8d0979167dc4fcd732d8cbe1640
parent536578bff1f6306165531d6f31036fc68c74a4c3 (diff)
Work on patches
-rw-r--r--debian/changelog8
-rw-r--r--debian/patches/0700-multiarch-libc.patch2
2 files changed, 8 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index bb65baa2..e22ee59c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,14 @@ libunistring (1.0-1) UNRELEASED; urgency=medium
* Declare compliance with Debian Policy 4.6.0.1 (No changes needed).
* Refresh debian/libunistring2.symbols.
* debian/copyright:
- - Refresh uploader coypright years.
+ - Refresh uploader copyright years.
- Add 2022 to myself.
+ * debian/patches:
+ - Refresh 0700-multiarch-libc.patch.
+ - In series comment out:
+ + 0005-fix_build_musl.patch
+ + 0705-gcc-9.patch
+ + 0010-AC_INIT.patch
-- Jörg Frings-Fürst <debian@jff.email> Sat, 08 Jan 2022 11:55:00 +0100
diff --git a/debian/patches/0700-multiarch-libc.patch b/debian/patches/0700-multiarch-libc.patch
index 1686bcb2..95ec0d06 100644
--- a/debian/patches/0700-multiarch-libc.patch
+++ b/debian/patches/0700-multiarch-libc.patch
@@ -5,7 +5,7 @@ Index: trunk/lib/Makefile.am
===================================================================
--- trunk.orig/lib/Makefile.am
+++ trunk/lib/Makefile.am
-@@ -101,30 +101,15 @@ unistring/stdint.h : $(STDINT_H) stdint.
+@@ -103,30 +103,15 @@ unistring/stdint.h : $(STDINT_H) stdint.
echo '#if __GLIBC__ >= 2'; \
echo '#include <stdint.h>'; \
echo '#else'; \