summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2017-12-02 10:54:43 +0100
committerJörg Frings-Fürst <debian@jff-webhosting.net>2017-12-02 10:54:43 +0100
commit239dfe8416847d6cee5a6c20366dc9e353e09daf (patch)
treee058f4e092cfaa06fe12cee702871f170ff93771
parentfd167a99e31b7021c78972c09acbf83b2d347c98 (diff)
New upstream release; refresh patches
-rw-r--r--debian/changelog7
-rw-r--r--debian/patches/0700-multiarch-libc.patch6
2 files changed, 11 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index 9be945f2..ab33d043 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libunistring (0.9.8-1) UNRELEASED; urgency=medium
+
+ * New upstream release.
+ - Refresh patches.
+
+ -- 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.
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' \