Bug#691675: unblock: libskk/1.0.0-1 ibus-skk/1.4.1-2
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Please unblock package libskk/1.0.0-1 and ibus-skk/1.4.1-2
I am requesting unblock on behalf of the maintainer. (We discussed)
These packages are maintained by Daiki who is DM and the upstream. In
retrospect, this upload of libskk/1.0.0-1 should have been made in the
form of 0.0.12-4. (0.0.12-3 was uploaded by me before the freeze).
The libskk transition from 0.0.12-3 to 1.0.0-1 seems big but there is no
API change and fix several critical porting issues and minor bugs. He
included his patch used in my libskk 0.0.12-3 Debian upload to the
upstream source tree fixing ARM/MIPS bug #674471. He fixed another RC
level bug causing segmentation fault in BSD systems. This may fix our
kFreeBSD port too. (No bug reported on Debian yet.)
https://github.com/ueno/libskk/issues/18
https://github.com/ueno/libskk/commit/a95245abe22eda52255daf3925d587907ca6f925
The upstream patches between 0.0.12 and 1.0.0 is attached here. (Some are
testing code changes.)
ibus-skk transition from 1.4.1-2 to 1.4.1-2 fixes #686472 which just
add missed documentation in Debian packaging. (This is not RC bug but
very safe fix. Since this ensures rebuild against new libskk/1.0.0-1
to make us feel safer although no API has changed.)
Here is some back ground. Daiki (DM) is one of the leading upstream
coder of the GNOME ibus input method code. He is the primary upstream
coder of skk related modules for ibus too. But He is new to Debian and
I handed these packages to him as DM very recently.
Daiki assured me with API stability of these changes when contacted
on these. (I was worried about these may block my ibus package
transition to testing. Now I know it is OK without the unblock of thee.
But fixing segfaults is nice thing to have.)
(include/attach the debdiff against the package in testing)
* The upstream patch set between 0.0.12 and 1.0.0 is attached here for
libskk/1.0.0-1.
* Debdiff: ibus-skk_1.4.1-2.debdiff attached.
unblock libskk/1.0.0-1
unblock ibus-skk/1.4.1-2
-- System Information:
Debian Release: wheezy/sid
APT prefers unstable
APT policy: (500, 'unstable'), (500, 'testing'), (10, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 3.5-trunk-amd64 (SMP w/8 CPU cores)
Locale: LANG=en_US.utf8, LC_CTYPE=en_US.utf8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
>From bdbf9319ec8720fb128cb0c5c97aaa65268473d2 Mon Sep 17 00:00:00 2001
From: Daiki Ueno <ueno@unixuser.org>
Date: Mon, 16 Apr 2012 16:07:37 +0900
Subject: [PATCH 01/13] Make some map files optional.
---
libskk/map-file.vala | 32 ++++++++++++++++----------------
libskk/rom-kana.vala | 2 +-
libskk/rule.vala | 41 +++++++++++++++++++++++++++++++++--------
3 files changed, 50 insertions(+), 25 deletions(-)
diff --git a/libskk/map-file.vala b/libskk/map-file.vala
index 4482671..b1272c9 100644
--- a/libskk/map-file.vala
+++ b/libskk/map-file.vala
@@ -34,19 +34,13 @@ namespace Skk {
}
}
- void load (string rule,
+ void load (RuleMetadata metadata,
string type,
string name,
Set<string> included) throws RuleParseError
{
- var metadata = Rule.find_rule (rule);
- if (metadata == null) {
- throw new RuleParseError.FAILED ("can't find rule %s", rule);
- }
- var filename = Path.build_filename (metadata.base_dir,
- type,
- name + ".json");
- if (!FileUtils.test (filename, FileTest.EXISTS)) {
+ var filename = metadata.locate_map_file (type, name);
+ if (filename == null) {
throw new RuleParseError.FAILED ("no such file %s", filename);
}
@@ -80,15 +74,21 @@ namespace Skk {
throw new RuleParseError.FAILED (
"found circular include of %s", parent);
}
+ string parent_rule, parent_name;
var index = parent.index_of ("/");
if (index < 0) {
- load (rule, type, parent, included);
+ parent_rule = metadata.name;
+ parent_name = parent;
} else {
- load (parent[0:index],
- type,
- parent[index + 1:parent.length],
- included);
+ parent_rule = parent[0:index];
+ parent_name = parent[index + 1:parent.length];
+ }
+ var parent_metadata = Rule.find_rule (parent_rule);
+ if (parent_metadata == null) {
+ throw new RuleParseError.FAILED ("can't find rule %s",
+ parent_rule);
}
+ load (parent_metadata, type, parent_name, included);
included.add (parent);
}
}
@@ -116,12 +116,12 @@ namespace Skk {
}
}
- internal MapFile (string rule,
+ internal MapFile (RuleMetadata metadata,
string type,
string name) throws RuleParseError
{
Set<string> included = new HashSet<string> ();
- load (rule, type, name, included);
+ load (metadata, type, name, included);
}
internal bool has_map (string name) {
diff --git a/libskk/rom-kana.vala b/libskk/rom-kana.vala
index f37759d..a30a797 100644
--- a/libskk/rom-kana.vala
+++ b/libskk/rom-kana.vala
@@ -192,7 +192,7 @@ namespace Skk {
public RomKanaConverter () {
try {
- _rule = new RomKanaMapFile ("default");
+ _rule = new RomKanaMapFile (Rule.find_rule ("default"));
current_node = _rule.root_node;
} catch (RuleParseError e) {
warning ("can't find default rom-kana rule: %s",
diff --git a/libskk/rule.vala b/libskk/rule.vala
index 9932b72..a21bada 100644
--- a/libskk/rule.vala
+++ b/libskk/rule.vala
@@ -21,9 +21,9 @@ namespace Skk {
class KeymapMapFile : MapFile {
internal Keymap keymap;
- internal KeymapMapFile (string name, string mode) throws RuleParseError
+ internal KeymapMapFile (RuleMetadata metadata, string mode) throws RuleParseError
{
- base (name, "keymap", mode);
+ base (metadata, "keymap", mode);
if (has_map ("keymap")) {
var map = get ("keymap");
keymap = new Keymap ();
@@ -79,8 +79,8 @@ namespace Skk {
return node;
}
- public RomKanaMapFile (string name) throws RuleParseError {
- base (name, "rom-kana", "default");
+ public RomKanaMapFile (RuleMetadata metadata) throws RuleParseError {
+ base (metadata, "rom-kana", "default");
if (has_map ("rom-kana")) {
root_node = parse_rule (get ("rom-kana"));
} else {
@@ -121,6 +121,22 @@ namespace Skk {
* Name of key event filter.
*/
string filter;
+
+ /**
+ * Return the path of the map file.
+ *
+ * @param type type of the map file
+ * @param name name of the map file
+ *
+ * @return the absolute path of the map file
+ */
+ public string? locate_map_file (string type, string name) {
+ var filename = Path.build_filename (base_dir, type, name + ".json");
+ if (FileUtils.test (filename, FileTest.EXISTS)) {
+ return filename;
+ }
+ return null;
+ }
}
/**
@@ -134,7 +150,7 @@ namespace Skk {
internal KeymapMapFile[] keymaps = new KeymapMapFile[InputMode.LAST];
internal RomKanaMapFile rom_kana;
- static const Entry<InputMode,string>[] keymap_entries = {
+ static const Entry<InputMode,string>[] keymap_names = {
{ InputMode.HIRAGANA, "hiragana" },
{ InputMode.KATAKANA, "katakana" },
{ InputMode.HANKAKU_KATAKANA, "hankaku-katakana" },
@@ -236,11 +252,19 @@ namespace Skk {
}
this.metadata = metadata;
- foreach (var entry in keymap_entries) {
- keymaps[entry.key] = new KeymapMapFile (name, entry.value);
+ var default_metadata = find_rule ("default");
+ foreach (var entry in keymap_names) {
+ var _metadata = metadata;
+ if (metadata.locate_map_file ("keymap", entry.value) == null) {
+ _metadata = default_metadata;
+ }
+ keymaps[entry.key] = new KeymapMapFile (_metadata, entry.value);
}
- rom_kana = new RomKanaMapFile (name);
+ if (metadata.locate_map_file ("rom-kana", "default") == null) {
+ _metadata = default_metadata;
+ }
+ rom_kana = new RomKanaMapFile (_metadata);
}
~Rule () {
@@ -270,6 +294,7 @@ namespace Skk {
if (FileUtils.test (metadata_filename, FileTest.EXISTS)) {
try {
var metadata = load_metadata (metadata_filename);
+ metadata.name = name;
rule_cache.set (name, metadata);
return metadata;
} catch (RuleParseError e) {
--
1.7.10.4
>From 8930d2b8da0c421058aea245cde10057e08a0529 Mon Sep 17 00:00:00 2001
From: Daiki Ueno <ueno@unixuser.org>
Date: Mon, 16 Apr 2012 16:09:55 +0900
Subject: [PATCH 02/13] Update README.
---
README | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/README b/README
index ef31b37..b0d6452 100644
--- a/README
+++ b/README
@@ -2,15 +2,15 @@ libskk -- a library to deal with Japanese kana-to-kanji conversion method
Features:
-* Support basic features of SKK including new word registration into
- dictionary, completion, numeric conversion, abbrev mode, kuten
- input, hankaku-katakana input, Lisp expression evaluation (concat
- only), and re-conversion.
+* Support basic features of SKK including: new word registration,
+ completion, numeric conversion, abbrev mode, kuten input,
+ hankaku-katakana input, Lisp expression evaluation (concat only),
+ and re-conversion.
-* Support various typing rules including romaji-to-kana, AZIK,
+* Support various typing rules including: romaji-to-kana, AZIK,
TUT-Code, and NICOLA.
-* Support various dictionary types including file dictionary (such as
+* Support various dictionary types including: file dictionary (such as
SKK-JISYO.[SML]), user dictionary, skkserv, and CDB format
dictionary.
@@ -22,6 +22,7 @@ Features:
Documentation:
* file:tests/context.c for basic usage
+* file:rules/README.rules for keymap and romaji-to-kana table customization
* http://du-a.org/docs/libskk/libskk/ for Vala binding reference
* http://du-a.org/docs/gtk-doc/libskk/html/ for C binding reference
--
1.7.10.4
>From fbbea6190782da447caddc903cbc31a0d8676f38 Mon Sep 17 00:00:00 2001
From: Daiki Ueno <ueno@unixuser.org>
Date: Fri, 25 May 2012 11:19:43 +0900
Subject: [PATCH 03/13] cdb: make sure that integer does not stride across
4-byte alignments
Fixes Debian bug#674471.
---
libskk/cdb-dict.vala | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/libskk/cdb-dict.vala b/libskk/cdb-dict.vala
index a5a49fa..db2c99b 100644
--- a/libskk/cdb-dict.vala
+++ b/libskk/cdb-dict.vala
@@ -51,7 +51,10 @@ namespace Skk {
}
static uint32 read_uint32 (uint8 *p) {
- return uint32.from_little_endian (*((uint32 *) p));
+ // Make sure that Q does not stride across 4-byte
+ // alignment on ARM (Debian bug#674471).
+ uint8 q[4] = (uint8[]) p;
+ return uint32.from_little_endian (*((uint32 *) q));
}
/**
--
1.7.10.4
>From 653c13fe954cfa8271d26b9f0978884eaf22a7b4 Mon Sep 17 00:00:00 2001
From: Daiki Ueno <ueno@unixuser.org>
Date: Tue, 29 May 2012 18:36:18 +0900
Subject: [PATCH 04/13] Fix kana-kan test.
---
tests/kana-kan.c | 17 ++++++++++++++---
1 file changed, 14 insertions(+), 3 deletions(-)
diff --git a/tests/kana-kan.c b/tests/kana-kan.c
index 00d5618..5264c7f 100644
--- a/tests/kana-kan.c
+++ b/tests/kana-kan.c
@@ -3,11 +3,22 @@
static void
kana_kan (void)
{
- SkkKanaKanDict *dict = skk_kana_kan_dict_new ("juman.dic");
- SkkKanaKanScoreMap *map = skk_kana_kan_score_map_new ("mk.model", dict);
- SkkKanaKanConverter *converter = skk_kana_kan_converter_new (dict, map);
+ SkkKanaKanDict *dict;
+ SkkKanaKanScoreMap *map;
+ SkkKanaKanConverter *converter;
+ GError *error;
gchar *output;
+ error = NULL;
+ dict = skk_kana_kan_dict_new ("juman.dic", &error);
+ g_assert_no_error (error);
+
+ error = NULL;
+ map = skk_kana_kan_score_map_new ("mk.model", dict, &error);
+ g_assert_no_error (error);
+
+ converter = skk_kana_kan_converter_new (dict, map);
+
output = skk_kana_kan_converter_convert (converter, "かなかんじへんかんのれい");
printf ("%s\n", output);
g_free (output);
--
1.7.10.4
>From 49855a94c2ab7044569780d58a064ce571e25e9d Mon Sep 17 00:00:00 2001
From: Daiki Ueno <ueno@unixuser.org>
Date: Wed, 30 May 2012 11:45:55 +0900
Subject: [PATCH 05/13] kana-kan: fix edge score computation
---
libskk/kana-kan.vala | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libskk/kana-kan.vala b/libskk/kana-kan.vala
index cee7e6f..d3a7d76 100644
--- a/libskk/kana-kan.vala
+++ b/libskk/kana-kan.vala
@@ -127,7 +127,7 @@ namespace Skk {
}
internal double get_edge_score (KanaKanNode prev_node, KanaKanNode node) {
- var feature = "S%s\tS%s".printf (prev_node.word, node.pron);
+ var feature = "S%s\tS%s".printf (prev_node.word, node.word);
return get_score (feature);
}
}
--
1.7.10.4
>From cf65fb2a67bb8b5916d349870d23f542cd9758c4 Mon Sep 17 00:00:00 2001
From: Daiki Ueno <ueno@unixuser.org>
Date: Tue, 12 Jun 2012 11:49:05 +0900
Subject: [PATCH 06/13] Update required Vala version to 0.14.0 (Issue#17).
---
configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index eb69e34..ea030f2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -84,7 +84,7 @@ AC_SUBST(LIBSKK_LIBS)
GOBJECT_INTROSPECTION_CHECK([0.9.0])
-AM_PROG_VALAC([0.12.0])
+AM_PROG_VALAC([0.14.0])
AC_SUBST(VALAC)
AC_SUBST(VALAFLAGS)
--
1.7.10.4
>From a95245abe22eda52255daf3925d587907ca6f925 Mon Sep 17 00:00:00 2001
From: Daiki Ueno <ueno@unixuser.org>
Date: Fri, 15 Jun 2012 12:06:00 +0900
Subject: [PATCH 07/13] libskk: avoid unwanted ulong -> uint cast
---
libskk/rule.vala | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/libskk/rule.vala b/libskk/rule.vala
index a21bada..b99008b 100644
--- a/libskk/rule.vala
+++ b/libskk/rule.vala
@@ -162,8 +162,10 @@ namespace Skk {
KeyEventFilter? filter;
- static Map<string,Type> filter_types =
- new HashMap<string,Type> ();
+ // Make the value type boxed to avoid unwanted ulong -> uint cast:
+ // https://bugzilla.gnome.org/show_bug.cgi?id=660621
+ static Map<string,Type?> filter_types =
+ new HashMap<string,Type?> ();
static construct {
rules_path = Util.build_data_path ("rules");
--
1.7.10.4
>From ae6f19be24ded108da62b946e75cb86ee09d3533 Mon Sep 17 00:00:00 2001
From: Daiki Ueno <ueno@unixuser.org>
Date: Mon, 2 Jul 2012 11:06:55 +0900
Subject: [PATCH 08/13] Fix valadoc errors.
---
docs/Makefile.am | 1 +
libskk/candidate-list.vala | 2 +-
libskk/context.vala | 2 +-
3 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/docs/Makefile.am b/docs/Makefile.am
index d96c7e3..5ff74e1 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -38,6 +38,7 @@ $(libskkgtkdoc_DATA): libskk-gtk-doc
valadoc_flags = \
--force \
--package-version $(PACKAGE_VERSION) \
+ -D VALA_0_16 \
$(NULL)
# libskk documentation
diff --git a/libskk/candidate-list.vala b/libskk/candidate-list.vala
index 4308c46..f4198d4 100644
--- a/libskk/candidate-list.vala
+++ b/libskk/candidate-list.vala
@@ -129,7 +129,7 @@ namespace Skk {
/**
* Select a candidate in the current page.
*
- * @param index cursor position in the page to select
+ * @param index_in_page cursor position in the page to select
*
* @return `true` if a candidate is selected, `false` otherwise
*/
diff --git a/libskk/context.vala b/libskk/context.vala
index 932db14..71576bd 100644
--- a/libskk/context.vala
+++ b/libskk/context.vala
@@ -550,7 +550,7 @@ namespace Skk {
* This is replaced with {@link poll_output}.
*
* @return an output string
- * @deprecated 0.0.6
+ * Deprecated: 0.0.6
*/
public string get_output () {
return poll_output ();
--
1.7.10.4
>From e335c01e02eabe803730a02ec95fcfcf9690c040 Mon Sep 17 00:00:00 2001
From: Daiki Ueno <ueno@unixuser.org>
Date: Mon, 2 Jul 2012 10:54:45 +0900
Subject: [PATCH 09/13] Bump version to 0.0.13.
---
NEWS | 8 ++++++++
configure.ac | 2 +-
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/NEWS b/NEWS
index 1260d45..60783cd 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,11 @@
+Noteworthy changes in version 0.0.13 (2012-07-02)
+------------------------------------------------
+
+ * Fix segfault on 64-bit FreeBSD (Issue#18).
+ * Update required Vala version from 0.12.0 to 0.14.0 (Issue#17).
+ * Fix CDB dictionary integer alignment issue on ARM (Debian bug#674471).
+ * Map files that simply include "default" are now optional.
+
Noteworthy changes in version 0.0.12 (2012-03-29)
------------------------------------------------
diff --git a/configure.ac b/configure.ac
index ea030f2..a7afa51 100644
--- a/configure.ac
+++ b/configure.ac
@@ -17,7 +17,7 @@
AC_PREREQ(2.63)
AC_CONFIG_MACRO_DIR([m4])
-AC_INIT([libskk], [0.0.12], [ueno@unixuser.org])
+AC_INIT([libskk], [0.0.13], [ueno@unixuser.org])
SKK_API_VERSION=1.0
SKK_API_MAJOR_VERSION=1
--
1.7.10.4
>From 69a57ce83218344a6d067c38e080d744c0fd6ba7 Mon Sep 17 00:00:00 2001
From: Daiki Ueno <ueno@unixuser.org>
Date: Tue, 31 Jul 2012 14:17:18 +0900
Subject: [PATCH 10/13] Include common.h from context test (Issue#19).
---
tests/context.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/tests/context.c b/tests/context.c
index 1cd6b31..d4b583b 100644
--- a/tests/context.c
+++ b/tests/context.c
@@ -1,4 +1,5 @@
#include <libskk/libskk.h>
+#include "common.h"
static void
dictionary (void)
--
1.7.10.4
>From 0b362f579897667db92ac6d3a3dea55f7c3cd787 Mon Sep 17 00:00:00 2001
From: Daiki Ueno <ueno@unixuser.org>
Date: Thu, 23 Aug 2012 17:49:38 +0900
Subject: [PATCH 11/13] context: clear output and preedit on reset
---
libskk/context.vala | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/libskk/context.vala b/libskk/context.vala
index 71576bd..1d2f562 100644
--- a/libskk/context.vala
+++ b/libskk/context.vala
@@ -539,11 +539,20 @@ namespace Skk {
pop_state ();
state_stack.peek_head ().cancel_okuri ();
}
- // to restore surrounding text after focus change
+
var state = state_stack.peek_head ();
- state.output_surrounding_text ();
+
+ // will clear state.candidates but not state.output
state.reset ();
+
+ // need to manually assign it because
+ // _candidates.candidates may point to a State object different
+ // from state, when dict edit
((ProxyCandidateList) _candidates).candidates = state.candidates;
+
+ // clear output and preedit
+ clear_output ();
+ preedit = "";
}
/**
--
1.7.10.4
>From 3f84867ded4288e0ab16ae0cee73d638ac419cca Mon Sep 17 00:00:00 2001
From: Daiki Ueno <ueno@unixuser.org>
Date: Sat, 25 Aug 2012 11:12:34 +0900
Subject: [PATCH 12/13] user-dict: create parent directory if not exist
(Debian bug#685745).
---
libskk/user-dict.vala | 2 ++
1 file changed, 2 insertions(+)
diff --git a/libskk/user-dict.vala b/libskk/user-dict.vala
index 4648e58..6059818 100644
--- a/libskk/user-dict.vala
+++ b/libskk/user-dict.vala
@@ -195,6 +195,8 @@ namespace Skk {
entries.clear ();
var contents = converter.encode (builder.str);
+ DirUtils.create_with_parents (Path.get_dirname (file.get_path ()),
+ 448);
#if VALA_0_16
file.replace_contents (contents.data,
etag,
--
1.7.10.4
>From 112257a2879abe51d2fb298426d82f5a915e9f3c Mon Sep 17 00:00:00 2001
From: Daiki Ueno <ueno@unixuser.org>
Date: Mon, 27 Aug 2012 11:35:35 +0900
Subject: [PATCH 13/13] Bump version to 1.0.0.
---
NEWS | 7 +++++++
configure.ac | 2 +-
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/NEWS b/NEWS
index 60783cd..92548a3 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,10 @@
+Noteworthy changes in version 1.0.0 (2012-08-27)
+------------------------------------------------
+
+ * Make sure to create parent directory of user-dict (Debian bug#685745).
+ * Clear output and preedit on context reset.
+ * Fix header include in tests (Issue#19).
+
Noteworthy changes in version 0.0.13 (2012-07-02)
------------------------------------------------
diff --git a/configure.ac b/configure.ac
index a7afa51..e8bb222 100644
--- a/configure.ac
+++ b/configure.ac
@@ -17,7 +17,7 @@
AC_PREREQ(2.63)
AC_CONFIG_MACRO_DIR([m4])
-AC_INIT([libskk], [0.0.13], [ueno@unixuser.org])
+AC_INIT([libskk], [1.0.0], [ueno@unixuser.org])
SKK_API_VERSION=1.0
SKK_API_MAJOR_VERSION=1
--
1.7.10.4
diff -Nru ibus-skk-1.4.1/debian/changelog ibus-skk-1.4.1/debian/changelog
--- ibus-skk-1.4.1/debian/changelog 2012-04-07 18:44:27.000000000 +0900
+++ ibus-skk-1.4.1/debian/changelog 2012-09-11 04:08:53.000000000 +0900
@@ -1,3 +1,9 @@
+ibus-skk (1.4.1-2) unstable; urgency=low
+
+ * Include more docs in binary package (Closes: #686472)
+
+ -- Daiki Ueno <ueno@unixuser.org> Tue, 11 Sep 2012 04:08:52 +0900
+
ibus-skk (1.4.1-1) unstable; urgency=low
* New upstream release
diff -Nru ibus-skk-1.4.1/debian/ibus-skk.docs ibus-skk-1.4.1/debian/ibus-skk.docs
--- ibus-skk-1.4.1/debian/ibus-skk.docs 2011-07-03 19:06:45.000000000 +0900
+++ ibus-skk-1.4.1/debian/ibus-skk.docs 2012-09-11 04:07:56.000000000 +0900
@@ -1,2 +1,4 @@
AUTHORS
README
+NEWS
+THANKS
Reply to: