[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[hyphen] 08/29: Imported Debian patch 2.3.1-3



This is an automated email from the git hooks/post-receive script.

rene pushed a commit to branch master
in repository hyphen.

commit 259d8f41e163767b27823c74b01345b733a69ed7
Author: Rene Engelhard <rene@debian.org>
Date:   Sun Apr 6 23:44:05 2008 +0200

    Imported Debian patch 2.3.1-3
---
 debian/changelog                      |  8 ++++++++
 debian/patches/00list                 |  1 +
 debian/patches/02_encds_static.dpatch | 19 +++++++++++++++++++
 3 files changed, 28 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 87b8a09..23f330f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+hyphen (2.3.1-3) unstable; urgency=low
+
+  * make encds[] struct static. According to #debian-devel it should
+    suffice to make it here for now until the next OOo upload which will also
+    do it (closes: #474581)
+
+ -- Rene Engelhard <rene@debian.org>  Sun, 06 Apr 2008 23:44:05 +0200
+
 hyphen (2.3.1-2) unstable; urgency=low
 
   * fix typo in openoffice.org-hyphenation-en-us' description
diff --git a/debian/patches/00list b/debian/patches/00list
index ef553c8..84f05ac 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -1 +1,2 @@
 01_hyphen_tex_from_TeXLive
+02_encds_static
diff --git a/debian/patches/02_encds_static.dpatch b/debian/patches/02_encds_static.dpatch
new file mode 100644
index 0000000..760fde0
--- /dev/null
+++ b/debian/patches/02_encds_static.dpatch
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 02_encds_static.dpatch by Rene Engelhard <rene@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+@DPATCH@
+diff -urNad hyphen-2.3.1~/csutil.c hyphen-2.3.1/csutil.c
+--- hyphen-2.3.1~/csutil.c	2003-06-01 02:04:00.000000000 +0200
++++ hyphen-2.3.1/csutil.c	2008-04-06 23:43:46.000000000 +0200
+@@ -3493,7 +3493,7 @@
+ };
+ 
+ 
+-struct enc_entry encds[] = {
++static struct enc_entry encds[] = {
+ {"ISO8859-1",iso1_tbl},
+ {"ISO8859-2",iso2_tbl},
+ {"ISO8859-3",iso3_tbl},

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/hyphen.git


Reply to: