9 files changed, 30 insertions, 18 deletions
diff --git a/debian/changelog b/debian/changelog
index 7b49bc1..5c9d6f2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,13 @@
-libonig (5.9.6-2) UNRELEASED; urgency=medium
+libonig (6.0.0-1) UNRELEASED; urgency=medium
 
+  * New upstream release.
   * debian/control:
-    - Remove dpkg from libonig2-dbg Pre-Depends because redundance 
+    - Remove dpkg from libonig2-dbg Pre-Depends because redundance
       with ${misc:Pre-Depends}.
     - Replace homepage to the new loacation.
+    - to match with the doname rename paxkages from liboing2 to libonig3.
+  * debian/rules:
+    - Rename liboing2 to libonig3.
   * debian/watch:
     - Move to github.
   * debian/copyright:
diff --git a/debian/control b/debian/control
index 9f22dcc..ced1dd1 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ Homepage: https://github.com/kkos/oniguruma
 Vcs-Git: git://anonscm.debian.org/collab-maint/libonig.git
 Vcs-Browser: http://anonscm.debian.org/cgit/collab-maint/libonig.git
 
-Package: libonig2
+Package: libonig3
 Priority: optional
 Architecture: any
 Multi-Arch: same
@@ -25,13 +25,13 @@ Description: regular expressions library
  Different character encoding for every regular expression object can
  be specified.
 
-Package: libonig2-dbg
+Package: libonig3-dbg
 Section: debug
 Architecture: any
 Multi-Arch: same
 Depends:
  ${misc:Depends},
- libonig2 (= ${binary:Version})
+ libonig3 (= ${binary:Version})
 Pre-Depends:
  ${misc:Pre-Depends}
 Description: regular expressions library — debugging symbols
@@ -48,7 +48,7 @@ Priority: optional
 Architecture: any
 Depends:
  ${misc:Depends},
- libonig2 (= ${binary:Version})
+ libonig3 (= ${binary:Version})
 Description: regular expressions library — development files
  Oniguruma is a library for working with regular expressions.
  .
diff --git a/debian/libonig2-dbg.maintscript b/debian/libonig2-dbg.maintscript
deleted file mode 100644
index 3e20b43..0000000
--- a/debian/libonig2-dbg.maintscript
+++ /dev/null
@@ -1 +0,0 @@
-symlink_to_dir /usr/share/doc/libonig2-dbg /usr/share/doc/libonig2 5.9.6-1~
diff --git a/debian/libonig2-dbg.dirs b/debian/libonig3-dbg.dirs
index 7276ecd..7276ecd 100644
--- a/debian/libonig2-dbg.dirs
+++ b/debian/libonig3-dbg.dirs
diff --git a/debian/libonig3-dbg.maintscript b/debian/libonig3-dbg.maintscript
new file mode 100644
index 0000000..1a08329
--- /dev/null
+++ b/debian/libonig3-dbg.maintscript
@@ -0,0 +1 @@
+symlink_to_dir /usr/share/doc/libonig3-dbg /usr/share/doc/libonig3 5.9.6-1~
diff --git a/debian/libonig2.install b/debian/libonig3.install
index 3ddde58..3ddde58 100644
--- a/debian/libonig2.install
+++ b/debian/libonig3.install
diff --git a/debian/patches/series b/debian/patches/series
index 65b9c28..9b1db6f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-001-changes_build_sys.diff
+#001-changes_build_sys.diff
diff --git a/debian/rules b/debian/rules
index ba2d2db..c02455d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,12 +20,12 @@ override_dh_installman:
 	dh_installman -plibonig-dev -A debian/onig-config.1
 
 override_dh_strip:
-	dh_strip --dbg-package=libonig2-dbg
+	dh_strip --dbg-package=libonig3-dbg
 
 override_dh_install:
 	dh_install --fail-missing -X.la -X.a
 
 override_dh_makeshlibs:
 	dh_makeshlibs
-	dpkg-gensymbols -v$(VERSION) -plibonig2
+	dpkg-gensymbols -v$(VERSION) -plibonig3
 
diff --git a/debian/symbols b/debian/symbols
index 650008f..4da59ca 100644
--- a/debian/symbols
+++ b/debian/symbols
@@ -1,4 +1,4 @@
-libonig.so.2 libonig2 #MINVER#
+libonig.so.3 libonig3 #MINVER#
  OnigAsciiLowerMap@Base 5.9.5
  OnigDefaultCaseFoldFlag@Base 5.9.5
  OnigDefaultSyntax@Base 5.9.5
@@ -46,11 +46,15 @@ libonig.so.2 libonig2 #MINVER#
  OnigSyntaxPosixBasic@Base 5.9.5
  OnigSyntaxPosixExtended@Base 5.9.5
  OnigSyntaxRuby@Base 5.9.5
+ OnigUnicodeFolds1@Base 6.0.0
+ OnigUnicodeFolds2@Base 6.0.0
+ OnigUnicodeFolds3@Base 6.0.0
+ euc_jp_lookup_property_name@Base 6.0.0
  onig_add_end_call@Base 5.9.6
  onig_bbuf_init@Base 5.9.5
  onig_capture_tree_traverse@Base 5.9.5
- onig_chain_link_add@Base 5.9.5
- onig_chain_reduce@Base 5.9.5
+ onig_codes_byte_at@Base 6.0.0
+ onig_codes_cmp@Base 6.0.0
  onig_compile@Base 5.9.5
  onig_copy_encoding@Base 5.9.5
  onig_copy_syntax@Base 5.9.5
@@ -61,8 +65,6 @@ libonig.so.2 libonig2 #MINVER#
  onig_foreach_name@Base 5.9.5
  onig_free@Base 5.9.5
  onig_free_body@Base 5.9.5
- onig_free_node_list@Base 5.9.5
- onig_free_shared_cclass_table@Base 5.9.5
  onig_get_capture_tree@Base 5.9.5
  onig_get_case_fold_flag@Base 5.9.5
  onig_get_default_case_fold_flag@Base 5.9.5
@@ -75,6 +77,8 @@ libonig.so.2 libonig2 #MINVER#
  onig_get_syntax_op@Base 5.9.5
  onig_get_syntax_options@Base 5.9.5
  onig_init@Base 5.9.5
+ onig_initialize@Base 6.0.0
+ onig_initialize_encoding@Base 6.0.0
  onig_is_code_in_cc@Base 5.9.5
  onig_is_code_in_cc_len@Base 5.9.5
  onig_is_in_code_range@Base 5.9.5
@@ -147,6 +151,7 @@ libonig.so.2 libonig2 #MINVER#
  onig_strcpy@Base 5.9.5
  onig_strncmp@Base 5.9.5
  onig_transfer@Base 5.9.5
+ onig_unicode_define_user_property@Base 6.0.0
  onig_version@Base 5.9.5
  onigenc_always_false_is_allowed_reverse_match@Base 5.9.5
  onigenc_always_true_is_allowed_reverse_match@Base 5.9.5
@@ -154,7 +159,6 @@ libonig.so.2 libonig2 #MINVER#
  onigenc_ascii_apply_all_case_fold@Base 5.9.5
  onigenc_ascii_get_case_fold_codes_by_str@Base 5.9.5
  onigenc_ascii_mbc_case_fold@Base 5.9.5
- onigenc_end_unicode@Base 5.9.6
  onigenc_get_case_fold_codes_by_str_with_map@Base 5.9.5
  onigenc_get_default_encoding@Base 5.9.5
  onigenc_get_left_adjust_char_head@Base 5.9.5
@@ -173,8 +177,6 @@ libonig.so.2 libonig2 #MINVER#
  onigenc_mbn_mbc_to_code@Base 5.9.5
  onigenc_minimum_property_name_to_ctype@Base 5.9.5
  onigenc_not_support_get_ctype_code_range@Base 5.9.5
- onigenc_property_list_add_property@Base 5.9.5
- onigenc_property_list_init@Base 5.9.5
  onigenc_set_default_caseconv_table@Base 5.9.5
  onigenc_set_default_encoding@Base 5.9.5
  onigenc_single_byte_code_to_mbc@Base 5.9.5
@@ -212,3 +214,9 @@ libonig.so.2 libonig2 #MINVER#
  regerror@Base 5.9.5
  regexec@Base 5.9.5
  regfree@Base 5.9.5
+ sjis_lookup_property_name@Base 6.0.0
+ unicode_fold1_key@Base 6.0.0
+ unicode_fold2_key@Base 6.0.0
+ unicode_fold3_key@Base 6.0.0
+ unicode_lookup_property_name@Base 6.0.0
+ unicode_unfold_key@Base 6.0.0