From dd1ab771f3cab4cd07d16861277bb4b528a7b1c7 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Sun, 2 Nov 2008 12:39:09 +0000 Subject: [PATCH] Update patches for ion-3rc-20070708. --- debian/changelog | 3 +- debian/patches/00list | 1 - debian/patches/102_fix-string-list-crash.diff | 30 ------------------- debian/patches/201_fix-paths.diff | 6 ++-- 4 files changed, 5 insertions(+), 35 deletions(-) delete mode 100644 debian/patches/102_fix-string-list-crash.diff diff --git a/debian/changelog b/debian/changelog index df34e5d..ae18a80 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,6 @@ -ion3 (20070608-2) UNRELEASED; urgency=low +ion3 (20070708-1) UNRELEASED; urgency=low + * New upstream release * Improved package descriptions and debconf templates as suggested by debian-l10n-english review and by Helge Kreutzmann - closes: #429444, #430695 diff --git a/debian/patches/00list b/debian/patches/00list index 56ccaf0..24d4144 100644 --- a/debian/patches/00list +++ b/debian/patches/00list @@ -1,4 +1,3 @@ -102_fix-string-list-crash.diff 201_fix-paths.diff 202_fix-menus.diff 204_fix-bindings.diff diff --git a/debian/patches/102_fix-string-list-crash.diff b/debian/patches/102_fix-string-list-crash.diff deleted file mode 100644 index 89e31db..0000000 --- a/debian/patches/102_fix-string-list-crash.diff +++ /dev/null @@ -1,30 +0,0 @@ -#! /bin/sh -e -if [ $# -ne 1 ]; then - echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" - exit 1 -fi -case "$1" in - -patch) patch -f --no-backup-if-mismatch -p1 < $0;; - -unpatch) patch -f --no-backup-if-mismatch -R -p1 < $0;; - *) - echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" - exit 1;; -esac - -exit 0 -@DPATCH@ - -# Patch thanks to Nedko Arnaudov - -diff -ru ion-3rc-20070608/ioncore/property.c ion-3rc-20070608.fixed/ioncore/property.c ---- ion-3rc-20070608/ioncore/property.c 2007-06-08 19:56:51.000000000 +0300 -+++ ion-3rc-20070608.fixed/ioncore/property.c 2007-06-18 16:32:11.000000000 +0300 -@@ -213,7 +213,7 @@ - Status st; - - if(!ioncore_g.use_mb){ -- st=XStringListToTextProperty((char **)&ptr, n, &prop); -+ st=XStringListToTextProperty((char **)ptr, n, &prop); - }else{ - st=XmbTextListToTextProperty(ioncore_g.dpy, (char **)ptr, n, - XTextStyle, &prop); diff --git a/debian/patches/201_fix-paths.diff b/debian/patches/201_fix-paths.diff index a335382..f5abe07 100755 --- a/debian/patches/201_fix-paths.diff +++ b/debian/patches/201_fix-paths.diff @@ -89,12 +89,12 @@ diff -Nur ion-3ds-20060519.orig/system.mk ion-3ds-20060519/system.mk #C89_SOURCE=-ansi --#POSIX_SOURCE=-D_POSIX_SOURCE -+POSIX_SOURCE=-D_POSIX_SOURCE -D_POSIX_C_SOURCE=200112 +-#POSIX_SOURCE=-D_POSIX_C_SOURCE=200112L ++POSIX_SOURCE=-D_POSIX_C_SOURCE=200112L # Most systems -#XOPEN_SOURCE=-D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED -+XOPEN_SOURCE=$(POSIX_SOURCE) -D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED ++XOPEN_SOURCE=-D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED # SunOS, (Irix) #XOPEN_SOURCE=-D__EXTENSIONS__ -- 2.39.2