--- ustr-1.0.4.orig/debian/watch
+++ ustr-1.0.4/debian/watch
@@ -0,0 +1,6 @@
+version=3
+# uscan can't handle redirection, so a workround using downloadurlmangle...
+# http://ftp.and.org/ustr/latest/
+#   => http://ftp.and.org/ustr/1.0.4/ustr-1.0.4.tar.gz
+opts=downloadurlmangle=s|/latest/ustr-(\d+(?:\.\d+)*)|/$1/ustr-$1| \
+    http://www.and.org/ustr/latest/ ustr-(\d+(?:\.\d+)*)\.tar\.gz
--- ustr-1.0.4.orig/debian/libustr-1.0-1.install
+++ ustr-1.0.4/debian/libustr-1.0-1.install
@@ -0,0 +1 @@
+debian/tmp/usr/lib/*/libustr-1.0.so.*
--- ustr-1.0.4.orig/debian/compat
+++ ustr-1.0.4/debian/compat
@@ -0,0 +1 @@
+5
--- ustr-1.0.4.orig/debian/libustr-doc.install
+++ ustr-1.0.4/debian/libustr-doc.install
@@ -0,0 +1 @@
+debian/tmp/usr/share/doc/libustr-doc
--- ustr-1.0.4.orig/debian/libustr-1.0-1.symbols
+++ ustr-1.0.4/debian/libustr-1.0-1.symbols
@@ -0,0 +1,539 @@
+libustr-1.0.so.1 libustr-1.0-1 #MINVER#
+ USTR_1.0.1@USTR_1.0.1 1.0.4
+ USTR_1.0.2@USTR_1.0.2 1.0.4
+ USTR_1.0.3@USTR_1.0.3 1.0.4
+ USTR_1.0.4@USTR_1.0.4 1.0.4
+ USTR_1.0@USTR_1.0 1.0.4
+ ustr_add@USTR_1.0 1.0.4
+ ustr_add_b_uint16@USTR_1.0 1.0.4
+ ustr_add_b_uint32@USTR_1.0 1.0.4
+ ustr_add_b_uint64@USTR_1.0 1.0.4
+ ustr_add_buf@USTR_1.0 1.0.4
+ ustr_add_cstr@USTR_1.0 1.0.4
+ ustr_add_fmt@USTR_1.0 1.0.4
+ ustr_add_fmt_lim@USTR_1.0 1.0.4
+ ustr_add_rep_chr@USTR_1.0 1.0.4
+ ustr_add_subustr@USTR_1.0 1.0.4
+ ustr_add_undef@USTR_1.0 1.0.4
+ ustr_add_vfmt@USTR_1.0 1.0.4
+ ustr_add_vfmt_lim@USTR_1.0 1.0.4
+ ustr_alloc@USTR_1.0 1.0.4
+ ustr_assert_valid@USTR_1.0 1.0.4
+ ustr_assert_valid_subustr@USTR_1.0 1.0.4
+ ustr_cmp@USTR_1.0 1.0.4
+ ustr_cmp_buf@USTR_1.0 1.0.4
+ ustr_cmp_buf_eq@USTR_1.0 1.0.4
+ ustr_cmp_case@USTR_1.0 1.0.4
+ ustr_cmp_case_buf@USTR_1.0 1.0.4
+ ustr_cmp_case_buf_eq@USTR_1.0 1.0.4
+ ustr_cmp_case_cstr@USTR_1.0 1.0.4
+ ustr_cmp_case_cstr_eq@USTR_1.0 1.0.4
+ ustr_cmp_case_eq@USTR_1.0 1.0.4
+ ustr_cmp_case_prefix_buf_eq@USTR_1.0 1.0.4
+ ustr_cmp_case_prefix_cstr_eq@USTR_1.0 1.0.4
+ ustr_cmp_case_prefix_eq@USTR_1.0 1.0.4
+ ustr_cmp_case_prefix_subustr_eq@USTR_1.0.2 1.0.4
+ ustr_cmp_case_subustr@USTR_1.0 1.0.4
+ ustr_cmp_case_subustr_eq@USTR_1.0 1.0.4
+ ustr_cmp_case_suffix_buf_eq@USTR_1.0 1.0.4
+ ustr_cmp_case_suffix_cstr_eq@USTR_1.0 1.0.4
+ ustr_cmp_case_suffix_eq@USTR_1.0 1.0.4
+ ustr_cmp_case_suffix_subustr_eq@USTR_1.0.2 1.0.4
+ ustr_cmp_cstr@USTR_1.0 1.0.4
+ ustr_cmp_cstr_eq@USTR_1.0 1.0.4
+ ustr_cmp_eq@USTR_1.0 1.0.4
+ ustr_cmp_fast@USTR_1.0 1.0.4
+ ustr_cmp_fast_buf@USTR_1.0 1.0.4
+ ustr_cmp_fast_cstr@USTR_1.0 1.0.4
+ ustr_cmp_fast_subustr@USTR_1.0 1.0.4
+ ustr_cmp_prefix_buf_eq@USTR_1.0 1.0.4
+ ustr_cmp_prefix_cstr_eq@USTR_1.0 1.0.4
+ ustr_cmp_prefix_eq@USTR_1.0 1.0.4
+ ustr_cmp_prefix_subustr_eq@USTR_1.0.2 1.0.4
+ ustr_cmp_subustr@USTR_1.0 1.0.4
+ ustr_cmp_subustr_eq@USTR_1.0 1.0.4
+ ustr_cmp_suffix_buf_eq@USTR_1.0 1.0.4
+ ustr_cmp_suffix_cstr_eq@USTR_1.0 1.0.4
+ ustr_cmp_suffix_eq@USTR_1.0 1.0.4
+ ustr_cmp_suffix_subustr_eq@USTR_1.0.2 1.0.4
+ ustr_cntl_opt@USTR_1.0.1 1.0.4
+ ustr_conf@USTR_1.0.2 1.0.4
+ ustr_cspn_chr_fwd@USTR_1.0 1.0.4
+ ustr_cspn_chr_rev@USTR_1.0 1.0.4
+ ustr_cspn_chrs_fwd@USTR_1.0 1.0.4
+ ustr_cspn_chrs_rev@USTR_1.0 1.0.4
+ ustr_cspn_cstr_fwd@USTR_1.0 1.0.4
+ ustr_cspn_cstr_rev@USTR_1.0 1.0.4
+ ustr_cspn_fwd@USTR_1.0 1.0.4
+ ustr_cspn_rev@USTR_1.0 1.0.4
+ ustr_cstr@USTR_1.0 1.0.4
+ ustr_del@USTR_1.0 1.0.4
+ ustr_del_subustr@USTR_1.0 1.0.4
+ ustr_dup@USTR_1.0 1.0.4
+ ustr_dup_buf@USTR_1.0 1.0.4
+ ustr_dup_cstr@USTR_1.0 1.0.4
+ ustr_dup_empty@USTR_1.0 1.0.4
+ ustr_dup_fmt@USTR_1.0 1.0.4
+ ustr_dup_fmt_lim@USTR_1.0 1.0.4
+ ustr_dup_rep_chr@USTR_1.0 1.0.4
+ ustr_dup_subustr@USTR_1.0 1.0.4
+ ustr_dup_undef@USTR_1.0 1.0.4
+ ustr_dup_vfmt@USTR_1.0 1.0.4
+ ustr_dup_vfmt_lim@USTR_1.0 1.0.4
+ ustr_dupx@USTR_1.0 1.0.4
+ ustr_dupx_buf@USTR_1.0 1.0.4
+ ustr_dupx_cstr@USTR_1.0 1.0.4
+ ustr_dupx_empty@USTR_1.0 1.0.4
+ ustr_dupx_fmt@USTR_1.0 1.0.4
+ ustr_dupx_fmt_lim@USTR_1.0 1.0.4
+ ustr_dupx_rep_chr@USTR_1.0 1.0.4
+ ustr_dupx_subustr@USTR_1.0 1.0.4
+ ustr_dupx_undef@USTR_1.0 1.0.4
+ ustr_dupx_vfmt@USTR_1.0 1.0.4
+ ustr_dupx_vfmt_lim@USTR_1.0 1.0.4
+ ustr_enomem@USTR_1.0 1.0.4
+ ustr_exact@USTR_1.0 1.0.4
+ ustr_fixed@USTR_1.0 1.0.4
+ ustr_free@USTR_1.0 1.0.4
+ ustr_init_alloc@USTR_1.0 1.0.4
+ ustr_init_fixed@USTR_1.0 1.0.4
+ ustr_init_size@USTR_1.0 1.0.4
+ ustr_ins@USTR_1.0.1 1.0.4
+ ustr_ins_buf@USTR_1.0.1 1.0.4
+ ustr_ins_cstr@USTR_1.0.1 1.0.4
+ ustr_ins_fmt@USTR_1.0.1 1.0.4
+ ustr_ins_fmt_lim@USTR_1.0.1 1.0.4
+ ustr_ins_rep_chr@USTR_1.0.1 1.0.4
+ ustr_ins_subustr@USTR_1.0.1 1.0.4
+ ustr_ins_undef@USTR_1.0.1 1.0.4
+ ustr_ins_vfmt@USTR_1.0.1 1.0.4
+ ustr_ins_vfmt_lim@USTR_1.0.1 1.0.4
+ ustr_io_get@USTR_1.0 1.0.4
+ ustr_io_getdelim@USTR_1.0 1.0.4
+ ustr_io_getfile@USTR_1.0 1.0.4
+ ustr_io_getfilename@USTR_1.0 1.0.4
+ ustr_io_getline@USTR_1.0 1.0.4
+ ustr_io_put@USTR_1.0 1.0.4
+ ustr_io_putfile@USTR_1.0 1.0.4
+ ustr_io_putfileline@USTR_1.0 1.0.4
+ ustr_io_putfilename@USTR_1.0 1.0.4
+ ustr_io_putline@USTR_1.0 1.0.4
+ ustr_len@USTR_1.0 1.0.4
+ ustr_limited@USTR_1.0 1.0.4
+ ustr_owner@USTR_1.0 1.0.4
+ ustr_parse_b_uint16@USTR_1.0 1.0.4
+ ustr_parse_b_uint32@USTR_1.0 1.0.4
+ ustr_parse_b_uint64@USTR_1.0 1.0.4
+ ustr_parse_int@USTR_1.0 1.0.4
+ ustr_parse_intmax@USTR_1.0 1.0.4
+ ustr_parse_long@USTR_1.0 1.0.4
+ ustr_parse_short@USTR_1.0 1.0.4
+ ustr_parse_uint@USTR_1.0 1.0.4
+ ustr_parse_uintmax@USTR_1.0 1.0.4
+ ustr_parse_uintmaxx@USTR_1.0 1.0.4
+ ustr_parse_ulong@USTR_1.0 1.0.4
+ ustr_parse_ulongx@USTR_1.0 1.0.4
+ ustr_parse_ushort@USTR_1.0 1.0.4
+ ustr_pool_clear@USTR_1.0 1.0.4
+ ustr_pool_free@USTR_1.0 1.0.4
+ ustr_pool_ll_cntl@USTR_1.0.2 1.0.4
+ ustr_pool_ll_make@USTR_1.0.2 1.0.4
+ ustr_pool_make_pool@USTR_1.0 1.0.4
+ ustr_pool_make_subpool@USTR_1.0 1.0.4
+ ustr_realloc@USTR_1.0 1.0.4
+ ustr_replace@USTR_1.0 1.0.4
+ ustr_replace_buf@USTR_1.0 1.0.4
+ ustr_replace_cstr@USTR_1.0 1.0.4
+ ustr_replace_rep_chr@USTR_1.0.1 1.0.4
+ ustr_ro@USTR_1.0 1.0.4
+ ustr_sc_concat@USTR_1.0.4 1.0.4
+ ustr_sc_concatx@USTR_1.0.4 1.0.4
+ ustr_sc_del@USTR_1.0 1.0.4
+ ustr_sc_dup@USTR_1.0 1.0.4
+ ustr_sc_dupx@USTR_1.0 1.0.4
+ ustr_sc_ensure_owner@USTR_1.0 1.0.4
+ ustr_sc_export@USTR_1.0.2 1.0.4
+ ustr_sc_export_subustr@USTR_1.0.2 1.0.4
+ ustr_sc_free2@USTR_1.0 1.0.4
+ ustr_sc_free@USTR_1.0 1.0.4
+ ustr_sc_free_shared@USTR_1.0 1.0.4
+ ustr_sc_join@USTR_1.0.4 1.0.4
+ ustr_sc_joinx@USTR_1.0.4 1.0.4
+ ustr_sc_ltrim@USTR_1.0.3 1.0.4
+ ustr_sc_ltrim_chrs@USTR_1.0.3 1.0.4
+ ustr_sc_ltrim_cstr@USTR_1.0.3 1.0.4
+ ustr_sc_reverse@USTR_1.0 1.0.4
+ ustr_sc_rtrim@USTR_1.0.3 1.0.4
+ ustr_sc_rtrim_chrs@USTR_1.0.3 1.0.4
+ ustr_sc_rtrim_cstr@USTR_1.0.3 1.0.4
+ ustr_sc_sub@USTR_1.0 1.0.4
+ ustr_sc_sub_buf@USTR_1.0 1.0.4
+ ustr_sc_sub_cstr@USTR_1.0 1.0.4
+ ustr_sc_sub_fmt@USTR_1.0 1.0.4
+ ustr_sc_sub_fmt_lim@USTR_1.0 1.0.4
+ ustr_sc_sub_rep_chr@USTR_1.0 1.0.4
+ ustr_sc_sub_subustr@USTR_1.0 1.0.4
+ ustr_sc_sub_undef@USTR_1.0 1.0.4
+ ustr_sc_sub_vfmt@USTR_1.0 1.0.4
+ ustr_sc_sub_vfmt_lim@USTR_1.0 1.0.4
+ ustr_sc_tolower@USTR_1.0 1.0.4
+ ustr_sc_toupper@USTR_1.0 1.0.4
+ ustr_sc_trim@USTR_1.0.3 1.0.4
+ ustr_sc_trim_chrs@USTR_1.0.3 1.0.4
+ ustr_sc_trim_cstr@USTR_1.0.3 1.0.4
+ ustr_sc_utf8_reverse@USTR_1.0 1.0.4
+ ustr_sc_vconcat@USTR_1.0.4 1.0.4
+ ustr_sc_vconcatx@USTR_1.0.4 1.0.4
+ ustr_sc_vjoin@USTR_1.0.4 1.0.4
+ ustr_sc_vjoinx@USTR_1.0.4 1.0.4
+ ustr_sc_wstr@USTR_1.0 1.0.4
+ ustr_set@USTR_1.0 1.0.4
+ ustr_set_buf@USTR_1.0 1.0.4
+ ustr_set_cstr@USTR_1.0 1.0.4
+ ustr_set_empty@USTR_1.0 1.0.4
+ ustr_set_fmt@USTR_1.0 1.0.4
+ ustr_set_fmt_lim@USTR_1.0 1.0.4
+ ustr_set_rep_chr@USTR_1.0 1.0.4
+ ustr_set_subustr@USTR_1.0 1.0.4
+ ustr_set_undef@USTR_1.0 1.0.4
+ ustr_set_vfmt@USTR_1.0 1.0.4
+ ustr_set_vfmt_lim@USTR_1.0 1.0.4
+ ustr_setf_enomem_clr@USTR_1.0 1.0.4
+ ustr_setf_enomem_err@USTR_1.0 1.0.4
+ ustr_setf_owner@USTR_1.0 1.0.4
+ ustr_setf_share@USTR_1.0 1.0.4
+ ustr_shared@USTR_1.0 1.0.4
+ ustr_size@USTR_1.0 1.0.4
+ ustr_size_alloc@USTR_1.0 1.0.4
+ ustr_size_overhead@USTR_1.0 1.0.4
+ ustr_sized@USTR_1.0 1.0.4
+ ustr_split@USTR_1.0 1.0.4
+ ustr_split_buf@USTR_1.0 1.0.4
+ ustr_split_cstr@USTR_1.0 1.0.4
+ ustr_split_spn@USTR_1.0.1 1.0.4
+ ustr_split_spn_chrs@USTR_1.0.1 1.0.4
+ ustr_split_spn_cstr@USTR_1.0.1 1.0.4
+ ustr_spn_chr_fwd@USTR_1.0 1.0.4
+ ustr_spn_chr_rev@USTR_1.0 1.0.4
+ ustr_spn_chrs_fwd@USTR_1.0 1.0.4
+ ustr_spn_chrs_rev@USTR_1.0 1.0.4
+ ustr_spn_cstr_fwd@USTR_1.0 1.0.4
+ ustr_spn_cstr_rev@USTR_1.0 1.0.4
+ ustr_spn_fwd@USTR_1.0 1.0.4
+ ustr_spn_rev@USTR_1.0 1.0.4
+ ustr_srch_buf_fwd@USTR_1.0 1.0.4
+ ustr_srch_buf_rev@USTR_1.0 1.0.4
+ ustr_srch_case_buf_fwd@USTR_1.0.2 1.0.4
+ ustr_srch_case_buf_rev@USTR_1.0.2 1.0.4
+ ustr_srch_case_chr_fwd@USTR_1.0.2 1.0.4
+ ustr_srch_case_chr_rev@USTR_1.0.2 1.0.4
+ ustr_srch_case_cstr_fwd@USTR_1.0.2 1.0.4
+ ustr_srch_case_cstr_rev@USTR_1.0.2 1.0.4
+ ustr_srch_case_fwd@USTR_1.0.2 1.0.4
+ ustr_srch_case_rep_chr_fwd@USTR_1.0.2 1.0.4
+ ustr_srch_case_rep_chr_rev@USTR_1.0.2 1.0.4
+ ustr_srch_case_rev@USTR_1.0.2 1.0.4
+ ustr_srch_case_subustr_fwd@USTR_1.0.2 1.0.4
+ ustr_srch_case_subustr_rev@USTR_1.0.2 1.0.4
+ ustr_srch_chr_fwd@USTR_1.0 1.0.4
+ ustr_srch_chr_rev@USTR_1.0 1.0.4
+ ustr_srch_cstr_fwd@USTR_1.0 1.0.4
+ ustr_srch_cstr_rev@USTR_1.0 1.0.4
+ ustr_srch_fwd@USTR_1.0 1.0.4
+ ustr_srch_rep_chr_fwd@USTR_1.0.1 1.0.4
+ ustr_srch_rep_chr_rev@USTR_1.0.1 1.0.4
+ ustr_srch_rev@USTR_1.0 1.0.4
+ ustr_srch_subustr_fwd@USTR_1.0 1.0.4
+ ustr_srch_subustr_rev@USTR_1.0 1.0.4
+ ustr_sub@USTR_1.0 1.0.4
+ ustr_sub_buf@USTR_1.0 1.0.4
+ ustr_sub_cstr@USTR_1.0 1.0.4
+ ustr_sub_fmt@USTR_1.0 1.0.4
+ ustr_sub_fmt_lim@USTR_1.0 1.0.4
+ ustr_sub_rep_chr@USTR_1.0 1.0.4
+ ustr_sub_subustr@USTR_1.0 1.0.4
+ ustr_sub_undef@USTR_1.0 1.0.4
+ ustr_sub_vfmt@USTR_1.0 1.0.4
+ ustr_sub_vfmt_lim@USTR_1.0 1.0.4
+ ustr_utf8_bytes2chars@USTR_1.0 1.0.4
+ ustr_utf8_chars2bytes@USTR_1.0 1.0.4
+ ustr_utf8_cspn_chrs_fwd@USTR_1.0 1.0.4
+ ustr_utf8_cspn_chrs_rev@USTR_1.0 1.0.4
+ ustr_utf8_cspn_cstr_fwd@USTR_1.0 1.0.4
+ ustr_utf8_cspn_cstr_rev@USTR_1.0 1.0.4
+ ustr_utf8_cspn_fwd@USTR_1.0 1.0.4
+ ustr_utf8_cspn_rev@USTR_1.0 1.0.4
+ ustr_utf8_len@USTR_1.0 1.0.4
+ ustr_utf8_spn_chrs_fwd@USTR_1.0 1.0.4
+ ustr_utf8_spn_chrs_rev@USTR_1.0 1.0.4
+ ustr_utf8_spn_cstr_fwd@USTR_1.0 1.0.4
+ ustr_utf8_spn_cstr_rev@USTR_1.0 1.0.4
+ ustr_utf8_spn_fwd@USTR_1.0 1.0.4
+ ustr_utf8_spn_rev@USTR_1.0 1.0.4
+ ustr_utf8_valid@USTR_1.0 1.0.4
+ ustr_utf8_width@USTR_1.0 1.0.4
+ ustr_wstr@USTR_1.0 1.0.4
+ ustr_xi__embed_val_get@USTR_1.0 1.0.4
+ ustr_xi__pow2@USTR_1.0 1.0.4
+ ustr_xi__ref_get@USTR_1.0 1.0.4
+ ustrp_add@USTR_1.0 1.0.4
+ ustrp_add_b_uint16@USTR_1.0 1.0.4
+ ustrp_add_b_uint32@USTR_1.0 1.0.4
+ ustrp_add_b_uint64@USTR_1.0 1.0.4
+ ustrp_add_buf@USTR_1.0 1.0.4
+ ustrp_add_cstr@USTR_1.0 1.0.4
+ ustrp_add_fmt@USTR_1.0 1.0.4
+ ustrp_add_fmt_lim@USTR_1.0 1.0.4
+ ustrp_add_rep_chr@USTR_1.0 1.0.4
+ ustrp_add_subustrp@USTR_1.0 1.0.4
+ ustrp_add_undef@USTR_1.0 1.0.4
+ ustrp_add_vfmt@USTR_1.0 1.0.4
+ ustrp_add_vfmt_lim@USTR_1.0 1.0.4
+ ustrp_alloc@USTR_1.0 1.0.4
+ ustrp_assert_valid@USTR_1.0 1.0.4
+ ustrp_assert_valid_subustrp@USTR_1.0 1.0.4
+ ustrp_cmp@USTR_1.0 1.0.4
+ ustrp_cmp_buf@USTR_1.0 1.0.4
+ ustrp_cmp_buf_eq@USTR_1.0 1.0.4
+ ustrp_cmp_case@USTR_1.0 1.0.4
+ ustrp_cmp_case_buf@USTR_1.0 1.0.4
+ ustrp_cmp_case_buf_eq@USTR_1.0 1.0.4
+ ustrp_cmp_case_cstr@USTR_1.0 1.0.4
+ ustrp_cmp_case_cstr_eq@USTR_1.0 1.0.4
+ ustrp_cmp_case_eq@USTR_1.0 1.0.4
+ ustrp_cmp_case_prefix_buf_eq@USTR_1.0 1.0.4
+ ustrp_cmp_case_prefix_cstr_eq@USTR_1.0 1.0.4
+ ustrp_cmp_case_prefix_eq@USTR_1.0 1.0.4
+ ustrp_cmp_case_prefix_subustrp_eq@USTR_1.0.2 1.0.4
+ ustrp_cmp_case_subustrp@USTR_1.0 1.0.4
+ ustrp_cmp_case_subustrp_eq@USTR_1.0 1.0.4
+ ustrp_cmp_case_suffix_buf_eq@USTR_1.0 1.0.4
+ ustrp_cmp_case_suffix_cstr_eq@USTR_1.0 1.0.4
+ ustrp_cmp_case_suffix_eq@USTR_1.0 1.0.4
+ ustrp_cmp_case_suffix_subustrp_eq@USTR_1.0.2 1.0.4
+ ustrp_cmp_cstr@USTR_1.0 1.0.4
+ ustrp_cmp_cstr_eq@USTR_1.0 1.0.4
+ ustrp_cmp_eq@USTR_1.0 1.0.4
+ ustrp_cmp_fast@USTR_1.0 1.0.4
+ ustrp_cmp_fast_buf@USTR_1.0 1.0.4
+ ustrp_cmp_fast_cstr@USTR_1.0 1.0.4
+ ustrp_cmp_fast_subustrp@USTR_1.0 1.0.4
+ ustrp_cmp_prefix_buf_eq@USTR_1.0 1.0.4
+ ustrp_cmp_prefix_cstr_eq@USTR_1.0 1.0.4
+ ustrp_cmp_prefix_eq@USTR_1.0 1.0.4
+ ustrp_cmp_prefix_subustrp_eq@USTR_1.0.2 1.0.4
+ ustrp_cmp_subustrp@USTR_1.0 1.0.4
+ ustrp_cmp_subustrp_eq@USTR_1.0 1.0.4
+ ustrp_cmp_suffix_buf_eq@USTR_1.0 1.0.4
+ ustrp_cmp_suffix_cstr_eq@USTR_1.0 1.0.4
+ ustrp_cmp_suffix_eq@USTR_1.0 1.0.4
+ ustrp_cmp_suffix_subustrp_eq@USTR_1.0.2 1.0.4
+ ustrp_conf@USTR_1.0.2 1.0.4
+ ustrp_cspn_chr_fwd@USTR_1.0 1.0.4
+ ustrp_cspn_chr_rev@USTR_1.0 1.0.4
+ ustrp_cspn_chrs_fwd@USTR_1.0 1.0.4
+ ustrp_cspn_chrs_rev@USTR_1.0 1.0.4
+ ustrp_cspn_cstr_fwd@USTR_1.0 1.0.4
+ ustrp_cspn_cstr_rev@USTR_1.0 1.0.4
+ ustrp_cspn_fwd@USTR_1.0 1.0.4
+ ustrp_cspn_rev@USTR_1.0 1.0.4
+ ustrp_cstr@USTR_1.0 1.0.4
+ ustrp_del@USTR_1.0 1.0.4
+ ustrp_del_subustrp@USTR_1.0 1.0.4
+ ustrp_dup@USTR_1.0 1.0.4
+ ustrp_dup_buf@USTR_1.0 1.0.4
+ ustrp_dup_cstr@USTR_1.0 1.0.4
+ ustrp_dup_empty@USTR_1.0 1.0.4
+ ustrp_dup_fmt@USTR_1.0 1.0.4
+ ustrp_dup_fmt_lim@USTR_1.0 1.0.4
+ ustrp_dup_rep_chr@USTR_1.0 1.0.4
+ ustrp_dup_subustrp@USTR_1.0 1.0.4
+ ustrp_dup_undef@USTR_1.0 1.0.4
+ ustrp_dup_vfmt@USTR_1.0 1.0.4
+ ustrp_dup_vfmt_lim@USTR_1.0 1.0.4
+ ustrp_dupx@USTR_1.0 1.0.4
+ ustrp_dupx_buf@USTR_1.0 1.0.4
+ ustrp_dupx_cstr@USTR_1.0 1.0.4
+ ustrp_dupx_empty@USTR_1.0 1.0.4
+ ustrp_dupx_fmt@USTR_1.0 1.0.4
+ ustrp_dupx_fmt_lim@USTR_1.0 1.0.4
+ ustrp_dupx_rep_chr@USTR_1.0 1.0.4
+ ustrp_dupx_subustrp@USTR_1.0 1.0.4
+ ustrp_dupx_undef@USTR_1.0 1.0.4
+ ustrp_dupx_vfmt@USTR_1.0 1.0.4
+ ustrp_dupx_vfmt_lim@USTR_1.0 1.0.4
+ ustrp_enomem@USTR_1.0 1.0.4
+ ustrp_exact@USTR_1.0 1.0.4
+ ustrp_fixed@USTR_1.0 1.0.4
+ ustrp_free@USTR_1.0 1.0.4
+ ustrp_init_alloc@USTR_1.0 1.0.4
+ ustrp_init_fixed@USTR_1.0 1.0.4
+ ustrp_ins@USTR_1.0.1 1.0.4
+ ustrp_ins_buf@USTR_1.0.1 1.0.4
+ ustrp_ins_cstr@USTR_1.0.1 1.0.4
+ ustrp_ins_fmt@USTR_1.0.1 1.0.4
+ ustrp_ins_fmt_lim@USTR_1.0.1 1.0.4
+ ustrp_ins_rep_chr@USTR_1.0.1 1.0.4
+ ustrp_ins_subustrp@USTR_1.0.1 1.0.4
+ ustrp_ins_undef@USTR_1.0.1 1.0.4
+ ustrp_ins_vfmt@USTR_1.0.1 1.0.4
+ ustrp_ins_vfmt_lim@USTR_1.0.1 1.0.4
+ ustrp_io_get@USTR_1.0 1.0.4
+ ustrp_io_getdelim@USTR_1.0 1.0.4
+ ustrp_io_getfile@USTR_1.0 1.0.4
+ ustrp_io_getfilename@USTR_1.0 1.0.4
+ ustrp_io_getline@USTR_1.0 1.0.4
+ ustrp_io_put@USTR_1.0 1.0.4
+ ustrp_io_putfile@USTR_1.0 1.0.4
+ ustrp_io_putfileline@USTR_1.0 1.0.4
+ ustrp_io_putfilename@USTR_1.0 1.0.4
+ ustrp_io_putline@USTR_1.0 1.0.4
+ ustrp_len@USTR_1.0 1.0.4
+ ustrp_limited@USTR_1.0 1.0.4
+ ustrp_owner@USTR_1.0 1.0.4
+ ustrp_parse_b_uint16@USTR_1.0 1.0.4
+ ustrp_parse_b_uint32@USTR_1.0 1.0.4
+ ustrp_parse_b_uint64@USTR_1.0 1.0.4
+ ustrp_parse_int@USTR_1.0 1.0.4
+ ustrp_parse_intmax@USTR_1.0 1.0.4
+ ustrp_parse_long@USTR_1.0 1.0.4
+ ustrp_parse_short@USTR_1.0 1.0.4
+ ustrp_parse_uint@USTR_1.0 1.0.4
+ ustrp_parse_uintmax@USTR_1.0 1.0.4
+ ustrp_parse_uintmaxx@USTR_1.0 1.0.4
+ ustrp_parse_ulong@USTR_1.0 1.0.4
+ ustrp_parse_ulongx@USTR_1.0 1.0.4
+ ustrp_parse_ushort@USTR_1.0 1.0.4
+ ustrp_realloc@USTR_1.0 1.0.4
+ ustrp_replace@USTR_1.0 1.0.4
+ ustrp_replace_buf@USTR_1.0 1.0.4
+ ustrp_replace_cstr@USTR_1.0 1.0.4
+ ustrp_replace_rep_chr@USTR_1.0.1 1.0.4
+ ustrp_ro@USTR_1.0 1.0.4
+ ustrp_sc_concat@USTR_1.0.4 1.0.4
+ ustrp_sc_concatx@USTR_1.0.4 1.0.4
+ ustrp_sc_del@USTR_1.0 1.0.4
+ ustrp_sc_dup@USTR_1.0 1.0.4
+ ustrp_sc_dupx@USTR_1.0 1.0.4
+ ustrp_sc_ensure_owner@USTR_1.0 1.0.4
+ ustrp_sc_export@USTR_1.0.2 1.0.4
+ ustrp_sc_export_subustrp@USTR_1.0.2 1.0.4
+ ustrp_sc_free2@USTR_1.0 1.0.4
+ ustrp_sc_free@USTR_1.0 1.0.4
+ ustrp_sc_free_shared@USTR_1.0 1.0.4
+ ustrp_sc_join@USTR_1.0.4 1.0.4
+ ustrp_sc_joinx@USTR_1.0.4 1.0.4
+ ustrp_sc_ltrim@USTR_1.0.3 1.0.4
+ ustrp_sc_ltrim_chrs@USTR_1.0.3 1.0.4
+ ustrp_sc_ltrim_cstr@USTR_1.0.3 1.0.4
+ ustrp_sc_reverse@USTR_1.0 1.0.4
+ ustrp_sc_rtrim@USTR_1.0.3 1.0.4
+ ustrp_sc_rtrim_chrs@USTR_1.0.3 1.0.4
+ ustrp_sc_rtrim_cstr@USTR_1.0.3 1.0.4
+ ustrp_sc_sub@USTR_1.0 1.0.4
+ ustrp_sc_sub_buf@USTR_1.0 1.0.4
+ ustrp_sc_sub_cstr@USTR_1.0 1.0.4
+ ustrp_sc_sub_fmt@USTR_1.0 1.0.4
+ ustrp_sc_sub_fmt_lim@USTR_1.0 1.0.4
+ ustrp_sc_sub_rep_chr@USTR_1.0 1.0.4
+ ustrp_sc_sub_subustrp@USTR_1.0 1.0.4
+ ustrp_sc_sub_undef@USTR_1.0 1.0.4
+ ustrp_sc_sub_vfmt@USTR_1.0 1.0.4
+ ustrp_sc_sub_vfmt_lim@USTR_1.0 1.0.4
+ ustrp_sc_tolower@USTR_1.0 1.0.4
+ ustrp_sc_toupper@USTR_1.0 1.0.4
+ ustrp_sc_trim@USTR_1.0.3 1.0.4
+ ustrp_sc_trim_chrs@USTR_1.0.3 1.0.4
+ ustrp_sc_trim_cstr@USTR_1.0.3 1.0.4
+ ustrp_sc_utf8_reverse@USTR_1.0 1.0.4
+ ustrp_sc_vconcat@USTR_1.0.4 1.0.4
+ ustrp_sc_vconcatx@USTR_1.0.4 1.0.4
+ ustrp_sc_vjoin@USTR_1.0.4 1.0.4
+ ustrp_sc_vjoinx@USTR_1.0.4 1.0.4
+ ustrp_sc_wstr@USTR_1.0 1.0.4
+ ustrp_set@USTR_1.0 1.0.4
+ ustrp_set_buf@USTR_1.0 1.0.4
+ ustrp_set_cstr@USTR_1.0 1.0.4
+ ustrp_set_empty@USTR_1.0 1.0.4
+ ustrp_set_fmt@USTR_1.0 1.0.4
+ ustrp_set_fmt_lim@USTR_1.0 1.0.4
+ ustrp_set_rep_chr@USTR_1.0 1.0.4
+ ustrp_set_subustrp@USTR_1.0 1.0.4
+ ustrp_set_undef@USTR_1.0 1.0.4
+ ustrp_set_vfmt@USTR_1.0 1.0.4
+ ustrp_set_vfmt_lim@USTR_1.0 1.0.4
+ ustrp_setf_enomem_clr@USTR_1.0 1.0.4
+ ustrp_setf_enomem_err@USTR_1.0 1.0.4
+ ustrp_setf_owner@USTR_1.0 1.0.4
+ ustrp_setf_share@USTR_1.0 1.0.4
+ ustrp_shared@USTR_1.0 1.0.4
+ ustrp_size@USTR_1.0 1.0.4
+ ustrp_size_alloc@USTR_1.0 1.0.4
+ ustrp_size_overhead@USTR_1.0 1.0.4
+ ustrp_sized@USTR_1.0 1.0.4
+ ustrp_split@USTR_1.0 1.0.4
+ ustrp_split_buf@USTR_1.0 1.0.4
+ ustrp_split_cstr@USTR_1.0 1.0.4
+ ustrp_split_spn@USTR_1.0.1 1.0.4
+ ustrp_split_spn_chrs@USTR_1.0.1 1.0.4
+ ustrp_split_spn_cstr@USTR_1.0.1 1.0.4
+ ustrp_spn_chr_fwd@USTR_1.0 1.0.4
+ ustrp_spn_chr_rev@USTR_1.0 1.0.4
+ ustrp_spn_chrs_fwd@USTR_1.0 1.0.4
+ ustrp_spn_chrs_rev@USTR_1.0 1.0.4
+ ustrp_spn_cstr_fwd@USTR_1.0 1.0.4
+ ustrp_spn_cstr_rev@USTR_1.0 1.0.4
+ ustrp_spn_fwd@USTR_1.0 1.0.4
+ ustrp_spn_rev@USTR_1.0 1.0.4
+ ustrp_srch_buf_fwd@USTR_1.0 1.0.4
+ ustrp_srch_buf_rev@USTR_1.0 1.0.4
+ ustrp_srch_case_buf_fwd@USTR_1.0.2 1.0.4
+ ustrp_srch_case_buf_rev@USTR_1.0.2 1.0.4
+ ustrp_srch_case_chr_fwd@USTR_1.0.2 1.0.4
+ ustrp_srch_case_chr_rev@USTR_1.0.2 1.0.4
+ ustrp_srch_case_cstr_fwd@USTR_1.0.2 1.0.4
+ ustrp_srch_case_cstr_rev@USTR_1.0.2 1.0.4
+ ustrp_srch_case_fwd@USTR_1.0.2 1.0.4
+ ustrp_srch_case_rep_chr_fwd@USTR_1.0.2 1.0.4
+ ustrp_srch_case_rep_chr_rev@USTR_1.0.2 1.0.4
+ ustrp_srch_case_rev@USTR_1.0.2 1.0.4
+ ustrp_srch_case_subustrp_fwd@USTR_1.0.2 1.0.4
+ ustrp_srch_case_subustrp_rev@USTR_1.0.2 1.0.4
+ ustrp_srch_chr_fwd@USTR_1.0 1.0.4
+ ustrp_srch_chr_rev@USTR_1.0 1.0.4
+ ustrp_srch_cstr_fwd@USTR_1.0 1.0.4
+ ustrp_srch_cstr_rev@USTR_1.0 1.0.4
+ ustrp_srch_fwd@USTR_1.0 1.0.4
+ ustrp_srch_rep_chr_fwd@USTR_1.0.1 1.0.4
+ ustrp_srch_rep_chr_rev@USTR_1.0.1 1.0.4
+ ustrp_srch_rev@USTR_1.0 1.0.4
+ ustrp_srch_subustrp_fwd@USTR_1.0 1.0.4
+ ustrp_srch_subustrp_rev@USTR_1.0 1.0.4
+ ustrp_sub@USTR_1.0 1.0.4
+ ustrp_sub_buf@USTR_1.0 1.0.4
+ ustrp_sub_cstr@USTR_1.0 1.0.4
+ ustrp_sub_fmt@USTR_1.0 1.0.4
+ ustrp_sub_fmt_lim@USTR_1.0 1.0.4
+ ustrp_sub_rep_chr@USTR_1.0 1.0.4
+ ustrp_sub_subustrp@USTR_1.0 1.0.4
+ ustrp_sub_undef@USTR_1.0 1.0.4
+ ustrp_sub_vfmt@USTR_1.0 1.0.4
+ ustrp_sub_vfmt_lim@USTR_1.0 1.0.4
+ ustrp_utf8_bytes2chars@USTR_1.0 1.0.4
+ ustrp_utf8_chars2bytes@USTR_1.0 1.0.4
+ ustrp_utf8_cspn_chrs_fwd@USTR_1.0 1.0.4
+ ustrp_utf8_cspn_chrs_rev@USTR_1.0 1.0.4
+ ustrp_utf8_cspn_cstr_fwd@USTR_1.0 1.0.4
+ ustrp_utf8_cspn_cstr_rev@USTR_1.0 1.0.4
+ ustrp_utf8_cspn_fwd@USTR_1.0 1.0.4
+ ustrp_utf8_cspn_rev@USTR_1.0 1.0.4
+ ustrp_utf8_len@USTR_1.0 1.0.4
+ ustrp_utf8_spn_chrs_fwd@USTR_1.0 1.0.4
+ ustrp_utf8_spn_chrs_rev@USTR_1.0 1.0.4
+ ustrp_utf8_spn_cstr_fwd@USTR_1.0 1.0.4
+ ustrp_utf8_spn_cstr_rev@USTR_1.0 1.0.4
+ ustrp_utf8_spn_fwd@USTR_1.0 1.0.4
+ ustrp_utf8_spn_rev@USTR_1.0 1.0.4
+ ustrp_utf8_valid@USTR_1.0 1.0.4
+ ustrp_utf8_width@USTR_1.0 1.0.4
+ ustrp_wstr@USTR_1.0 1.0.4
--- ustr-1.0.4.orig/debian/README.source
+++ ustr-1.0.4/debian/README.source
@@ -0,0 +1,19 @@
+Building ustr for Debian
+------------------------
+
+The ustr source package uses quilt to apply and remove its patches.
+Please refer to /usr/share/doc/quilt/README.source for information about
+how to use quilt for source packages.
+
+The quilt series is generated from the Git repository, using TopGit itself.
+This process is documented in /usr/share/doc/topgit/HOWTO-tg2quilt.gz .
+
+The ustr packages uses the branch layout described in the aforementioned
+document. The following branches are used in addition:
+
+    pristine-tar: used by pristine-tar(1)
+
+    build: used for tracking the quilt series (see a bug #500656)
+	and the package is build on this branch
+
+ -- Vaclav Ovsik <vaclav.ovsik@i.cz>  Sun, 30 Aug 2009 21:07:30 +0200
--- ustr-1.0.4.orig/debian/copyright
+++ ustr-1.0.4/debian/copyright
@@ -0,0 +1,108 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: ustr (µstr - Micro String API - for C)
+Upstream-Contact: James Antill <james@and.org>
+Source: http://www.and.org/ustr/
+
+Files: *
+Copyright: 2007 James Antill <james@and.org>
+License: LGPL-2+ or BSD-2-clause or MIT
+Comment: upstream file LICENSE contains:
+ This code is multi Licensed under all/any one of:
+ .
+ LGPLv2+                  - http://www.and.org/ustr/LICENSE_LGPL
+ New Style BSD (2 clause) - http://www.and.org/ustr/LICENSE_BSD
+ MIT                      - http://www.and.org/ustr/LICENSE_MIT
+ .
+ ...if that isn't enough for you, please send an email to me. The point
+ is for the license to not matter.
+
+Files: debian/*
+Copyright: 2012 Vaclav Ovsik <vaclav.ovsik@i.cz>
+License: GPL-2+
+ This program is free software; you can redistribute it
+ and/or modify it under the terms of the GNU General Public
+ License as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later
+ version.
+ .
+ This program is distributed in the hope that it will be
+ useful, but WITHOUT ANY WARRANTY; without even the implied
+ warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ PURPOSE.  See the GNU General Public License for more
+ details.
+ .
+ You should have received a copy of the GNU General Public
+ License along with this package; if not, write to the Free
+ Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ Boston, MA  02110-1301 USA
+ .
+ On Debian systems, the full text of the GNU General Public
+ License version 2 can be found in the file
+ `/usr/share/common-licenses/GPL-2'.
+
+License: LGPL-2+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later version.
+ .
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ Lesser General Public License for more details.
+ .
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free
+ Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ Boston, MA  02110-1301 USA
+ .
+ On Debian systems, the full text of the GNU Lesser General Public
+ License version 2.1 can be found in the file
+ `/usr/share/common-licenses/LGPL-2.1'.
+
+License: BSD-2-clause
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+ .
+    1. Redistributions of source code must retain the above copyright notice,
+       this list of conditions and the following disclaimer.
+    2. Redistributions in binary form must reproduce the above copyright
+       notice, this list of conditions and the following disclaimer in the
+       documentation and/or other materials provided with the distribution.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE FREEBSD PROJECT ``AS IS'' AND ANY EXPRESS OR
+ IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+ EVENT SHALL THE FREEBSD PROJECT OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ .
+ The views and conclusions contained in the software and documentation are
+ those of the authors and should not be interpreted as representing official
+ policies, either expressed or implied, of the FreeBSD Project.
+
+License: MIT
+ Permission is hereby granted, free of charge, to any person
+ obtaining a copy of this software and associated documentation
+ files (the "Software"), to deal in the Software without
+ restriction, including without limitation the rights to use,
+ copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the
+ Software is furnished to do so, subject to the following
+ conditions:
+ .
+ The above copyright notice and this permission notice shall be
+ included in all copies or substantial portions of the Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ OTHER DEALINGS IN THE SOFTWARE.
--- ustr-1.0.4.orig/debian/changelog
+++ ustr-1.0.4/debian/changelog
@@ -0,0 +1,71 @@
+ustr (1.0.4-3.7.201403121026) ucs4-0-0-0; urgency=low
+
+  * UCS auto build. No patches were applied to the original source package
+
+ -- Univention builddaemon <buildd@univention.de>  Wed, 12 Mar 2014 10:26:35 +0100
+
+ustr (1.0.4-3) unstable; urgency=low
+
+  * Changed debian/watch, upstream ftp is no longer available
+  * Changed Standards-Version to 3.9.3
+  * Support Multi-Arch for shared library. Closes: #676155
+  * Changed debian/copyright to machine-readable format
+  * Hardening: append CPPFLAGS to CFLAGS
+  * Added patch fixes/man-spelling, to fix spelling errors in man-pages
+    reported newly by the lintian
+  * Added debian/source/format with 1.0 version number
+
+ -- Vaclav Ovsik <vaclav.ovsik@i.cz>  Wed, 30 May 2012 09:48:12 +0200
+
+ustr (1.0.4-2) unstable; urgency=low
+
+  * Extended package descriptions in debian/control
+  * Fixed section fields in debian/control
+  * Changed Standards-Version to 3.8.3
+  * Added debian/libustr-1.0-1.symbols
+  * Used TopGit and Quilt to manage patches, added README.source
+  * Added patch fixes/nonlinux, removes conditional compilation directives
+    `#ifdef __linux__', so the build process can succeed on non linux
+    (Debian GNU/kFreeBSD). Closes: #536890
+
+ -- Vaclav Ovsik <vaclav.ovsik@i.cz>  Sat, 29 Aug 2009 23:40:00 +0200
+
+ustr (1.0.4-1) unstable; urgency=low
+
+  * New Upstream Version
+  * Dropped patches that were incorporated upstream:
+    - struct-size-assert-arm.patch
+    - tst-64bit-mmap-fix.patch
+    - ustr-import-bashism-fix.patch
+  * man-cleanup.patch, debian.patch: updated for latest release.
+
+ -- Vaclav Ovsik <vaclav.ovsik@i.cz>  Fri, 07 Mar 2008 08:32:35 +0100
+
+ustr (1.0.3-3) unstable; urgency=low
+
+  * the source package rearranged, changes to upstream are represented
+    as separated patches in debian/patches only (quilt used)
+  * the patch tst-64bit-mmap-fix fixes bug in the test of mmap()
+    return value in a 64bit test, which prevents successful package build
+    for architecture S390. Closes: #466839
+  * the patch struct-size-assert-arm commets out a line with assertion for
+    sizeof struct Ustr, which is padded to 32-bit boundary on ARM
+    architecture and assertion fails.
+
+ -- Vaclav Ovsik <vaclav.ovsik@i.cz>  Mon, 03 Mar 2008 15:22:14 +0100
+
+ustr (1.0.3-2) unstable; urgency=low
+
+  * ustr-import: removed bashism - function definitions using
+    the keyword `function'. Closes: #465005
+  * ustr.3, ustr_const.3, ustr_import.1: removed undefined macros
+    (.NH, .HY, .Vb, .Ve). The lintian warned about it.
+
+ -- Vaclav Ovsik <vaclav.ovsik@i.cz>  Mon, 11 Feb 2008 13:13:13 +0100
+
+ustr (1.0.3-1) unstable; urgency=low
+
+  * Initial release.
+  * Closes: #447269:  ITP: ustr -- Micro string library
+
+ -- Vaclav Ovsik <vaclav.ovsik@i.cz>  Wed, 16 Jan 2008 08:50:12 +0100
--- ustr-1.0.4.orig/debian/libustr-doc.doc-base
+++ ustr-1.0.4/debian/libustr-doc.doc-base
@@ -0,0 +1,10 @@
+Document: ustr
+Title: Ustr String Library
+Author: James Antill <james@and.org>
+Abstract: This is a documentation for developers using ustr.
+ It includes ustr API overview.
+Section: Programming
+
+Format: HTML
+Index: /usr/share/doc/libustr-doc/html/index.html
+Files: /usr/share/doc/libustr-doc/html/*.html
--- ustr-1.0.4.orig/debian/libustr-dev.install
+++ ustr-1.0.4/debian/libustr-dev.install
@@ -0,0 +1,9 @@
+debian/tmp/usr/bin/*
+debian/tmp/usr/include/*
+debian/tmp/usr/lib/*/libustr-debug.a
+debian/tmp/usr/lib/*/libustr.a
+debian/tmp/usr/lib/*/libustr.so
+debian/tmp/usr/lib/*/pkgconfig/ustr-debug.pc
+debian/tmp/usr/lib/*/pkgconfig/ustr.pc
+debian/tmp/usr/share/libustr-dev
+debian/tmp/usr/share/man
--- ustr-1.0.4.orig/debian/control
+++ ustr-1.0.4/debian/control
@@ -0,0 +1,66 @@
+Source: ustr
+Section: libs
+Priority: optional
+Maintainer: Vaclav Ovsik <vaclav.ovsik@i.cz>
+Build-Depends: debhelper (>= 8.1.3), cdbs (>=0.4.93~), quilt
+Standards-Version: 3.9.3
+Homepage: http://www.and.org/ustr/
+Vcs-Git: git://git.debian.org/~zito-guest/pkg-ustr.git
+Vcs-Browser: http://git.debian.org/?p=users/zito-guest/pkg-ustr.git
+
+Package: libustr-1.0-1
+Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: Micro string library: shared library
+ ustr (Micro string library) is a string API for C. It has tiny overhead over
+ just plain strdup(), is much safer, is easier to use, is faster for many
+ operations, can be used with read-only or automatically allocated data. You
+ don't even need to link to the library to use it (so there are no
+ dependencies).
+ .
+ This package contains the shared library for ustr.
+
+Package: libustr-1.0-1-dbg
+Architecture: any
+Multi-Arch: same
+Section: debug
+Priority: extra
+Depends: libustr-1.0-1 (= ${binary:Version}), ${misc:Depends}
+Description: Micro string library: debugging symbols
+ ustr (Micro string library) is a string API for C. It has tiny overhead over
+ just plain strdup(), is much safer, is easier to use, is faster for many
+ operations, can be used with read-only or automatically allocated data. You
+ don't even need to link to the library to use it (so there are no
+ dependencies).
+ .
+ This package contains debugging symbols.
+
+Package: libustr-dev
+Architecture: any
+Section: libdevel
+Depends: libustr-1.0-1 (= ${binary:Version}), libc6-dev, ${misc:Depends}
+Description: Micro string library: development stuff
+ ustr (Micro string library) is a string API for C. It has tiny overhead over
+ just plain strdup(), is much safer, is easier to use, is faster for many
+ operations, can be used with read-only or automatically allocated data. You
+ don't even need to link to the library to use it (so there are no
+ dependencies).
+ .
+ This package contains header files and static libraries needed to
+ compile applications or shared objects that use ustr.
+
+Package: libustr-doc
+Architecture: all
+Section: doc
+Suggests: libustr-dev
+Depends: ${misc:Depends}
+Description: Micro string library: documentation
+ ustr (Micro string library) is a string API for C. It has tiny overhead over
+ just plain strdup(), is much safer, is easier to use, is faster for many
+ operations, can be used with read-only or automatically allocated data. You
+ don't even need to link to the library to use it (so there are no
+ dependencies).
+ .
+ This package provides HTML documentation and examples.
--- ustr-1.0.4.orig/debian/rules
+++ ustr-1.0.4/debian/rules
@@ -0,0 +1,17 @@
+#!/usr/bin/make -f
+
+QUILT_PATCH_DIR	= debian/patches
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/makefile.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
+-include /usr/share/topgit/tg2quilt.mk
+
+DEB_MAKE_CLEAN_TARGET   = distclean
+DEB_MAKE_BUILD_TARGET   = all-shared HIDE=
+DEB_MAKE_INSTALL_TARGET = install DESTDIR=$(CURDIR)/debian/tmp/
+DEB_MAKE_CHECK_TARGET   = check
+DEB_MAKE_EXTRA_ARGS	+= libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH)
+
+# to use the CPPFLAGS (hardening flags)
+CFLAGS += $(CPPFLAGS)
--- ustr-1.0.4.orig/debian/patches/series
+++ ustr-1.0.4/debian/patches/series
@@ -0,0 +1,5 @@
+debian/locations.diff -p1
+debian/reentrant.diff -p1
+fixes/man-cleanup.diff -p1
+fixes/man-spelling.diff -p1
+fixes/nonlinux.diff -p1
--- ustr-1.0.4.orig/debian/patches/debian/reentrant.diff
+++ ustr-1.0.4/debian/patches/debian/reentrant.diff
@@ -0,0 +1,27 @@
+From: Vaclav Ovsik <vaclav.ovsik@i.cz>
+Subject: [PATCH] debian/reentrant
+
+CFLAG -D_REENTRANT as Debian policy requires, although needless
+probably.
+
+Signed-off-by: Vaclav Ovsik <vaclav.ovsik@i.cz>
+
+---
+ Makefile |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index 7a0f317..0fab319 100644
+--- a/Makefile
++++ b/Makefile
+@@ -55,7 +55,7 @@ CFLG_TST_O  = -DUSTR_DEBUG=0 $(CFLG_TST)
+ CFLG_TST_CO = -DUSTR_DEBUG=0 $(CFLG_TST_C)
+ 
+ # fread64/etc.
+-CFLG_LIB = -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
++CFLG_LIB = -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_REENTRANT
+ 
+ CFLG_LIB_OPT = $(CFLG_LIB) -DNDEBUG
+ CFLG_LIB_DBG = $(CFLG_LIB)
+-- 
+tg: (7c093d8..) debian/reentrant (depends on: master)
--- ustr-1.0.4.orig/debian/patches/debian/locations.diff
+++ ustr-1.0.4/debian/patches/debian/locations.diff
@@ -0,0 +1,58 @@
+From: Vaclav Ovsik <vaclav.ovsik@i.cz>
+Subject: [PATCH] debian/locations
+
+Make file locations Debian compatible
+
+Signed-off-by: Vaclav Ovsik <vaclav.ovsik@i.cz>
+
+---
+ Makefile |   13 ++++++++-----
+ 1 file changed, 8 insertions(+), 5 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 7a0f317..9b4a9dc 100644
+--- a/Makefile
++++ b/Makefile
+@@ -15,10 +15,10 @@ libdir=$(prefix)/lib
+ libexecdir=$(prefix)/libexec
+ bindir=$(prefix)/bin
+ includedir=$(prefix)/include
+-SHRDIR=$(datadir)/ustr-$(VERS_FULL)
+-DOCSHRDIR=$(datadir)/doc/ustr-devel-$(VERS_FULL)
+-EXAMDIR=$(SHRDIR)/examples
+-mandir=$(datadir)/doc/man
++SHRDIR=$(datadir)/libustr-dev
++DOCSHRDIR=$(datadir)/doc/libustr-doc
++EXAMDIR=$(DOCSHRDIR)/examples
++mandir=$(datadir)/man
+ MBINDIR=$(libexecdir)/ustr-$(VERS_FULL)
+ 
+ ###############################################################################
+@@ -62,7 +62,8 @@ CFLG_LIB_DBG = $(CFLG_LIB)
+ 
+ DOCS = README-DEVELOPERS TODO \
+        Documentation/strdup\ vs.\ ustr.gnumeric \
+-       Documentation/index.html \
++
++DOCSHTML = Documentation/index.html \
+        Documentation/functions.html \
+        Documentation/constants.html \
+        Documentation/design.html \
+@@ -382,6 +383,7 @@ install: all-shared ustr.pc ustr-debug.pc
+ 		install -d $(DESTDIR)$(includedir)
+ 		install -d $(DESTDIR)$(SHRDIR)
+ 		install -d $(DESTDIR)$(DOCSHRDIR)
++		install -d $(DESTDIR)$(DOCSHRDIR)/html
+ 		install -d $(DESTDIR)$(EXAMDIR)
+ 		install -d $(DESTDIR)$(mandir)/man1
+ 		install -d $(DESTDIR)$(mandir)/man3
+@@ -403,6 +405,7 @@ install: all-shared ustr.pc ustr-debug.pc
+ 		install -pm 644 -t $(DESTDIR)$(SHRDIR) $(SRC_SRCS)
+ 		install -pm 644 -t $(DESTDIR)$(SHRDIR) $(XSRC_SRCS)
+ 		install -pm 644 -t $(DESTDIR)$(DOCSHRDIR) $(DOCS)
++		install -pm 644 -t $(DESTDIR)$(DOCSHRDIR)/html $(DOCSHTML)
+ 		install -pm 644 -t $(DESTDIR)$(EXAMDIR) $(EXAMPLES)
+ 		install -pm 644 -t $(DESTDIR)$(mandir)/man1 $(MAN_PAGES_1)
+ 		install -pm 644 -t $(DESTDIR)$(mandir)/man3 $(MAN_PAGES_3)
+-- 
+tg: (7c093d8..) debian/locations (depends on: master)
--- ustr-1.0.4.orig/debian/patches/fixes/nonlinux.diff
+++ ustr-1.0.4/debian/patches/fixes/nonlinux.diff
@@ -0,0 +1,84 @@
+From: Vaclav Ovsik <vaclav.ovsik@i.cz>
+Subject: [PATCH] fixes/nonlinux
+
+Removes conditional compilation directives `#ifdef __linux__',
+so the build process can succeed on non linux (Debian GNU/kFreeBSD).
+Solves the bug http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=536890
+
+Signed-off-by: Vaclav Ovsik <vaclav.ovsik@i.cz>
+
+---
+ T/ctst_11_io.c    |    4 ----
+ T/ctst_3_medium.c |    2 --
+ T/ctst_99_64bit.c |    4 ----
+ 3 files changed, 10 deletions(-)
+
+diff --git a/T/ctst_11_io.c b/T/ctst_11_io.c
+index 5b8e32e..201e2e6 100644
+--- a/T/ctst_11_io.c
++++ b/T/ctst_11_io.c
+@@ -274,14 +274,10 @@ int tst(void)
+ 
+   errno = 0;
+   ASSERT(!ustr_io_putfilename(&s2, "doesn't exist.txt", "rb"));
+-#ifdef __linux__
+   ASSERT(errno == ENOENT);
+-#endif
+   errno = 0;
+   ASSERT(!ustr_io_putfilename(&s2, "./doesn't exist/foo.txt", "rb"));
+-#ifdef __linux__
+   ASSERT(errno == ENOENT);
+-#endif
+   ASSERT(ustr_cmp_buf_eq(s2, ustrp_cstr(sp1), ustrp_len(sp1)));
+ 
+ #ifdef ENOSPC
+diff --git a/T/ctst_3_medium.c b/T/ctst_3_medium.c
+index d32414f..0d3d02f 100644
+--- a/T/ctst_3_medium.c
++++ b/T/ctst_3_medium.c
+@@ -184,7 +184,6 @@ int tst(void)
+   ASSERT( ustr_setf_share(s2));
+   ASSERT( ustr_setf_owner(s2));
+   ASSERT( ustr_add(&s2, USTR("")));
+-#ifdef __linux__
+   {
+     wchar_t *wt = (wchar_t *)"\xFF\xFF\xFF\xFF";
+   /* test multi-byte conversion failure */
+@@ -196,7 +195,6 @@ int tst(void)
+   ASSERT(!ustr_sc_sub_fmt(&s2, 1, 2, "%ls", wt));
+   }
+ #endif
+-#endif
+   ustr_sc_free2(&s2, ustr_dupx(1, 0, 0, 0, s2));
+   
+   ASSERT(!ustr_exact(s2));
+diff --git a/T/ctst_99_64bit.c b/T/ctst_99_64bit.c
+index aa084b6..8b15d58 100644
+--- a/T/ctst_99_64bit.c
++++ b/T/ctst_99_64bit.c
+@@ -2,15 +2,12 @@
+ 
+ static const char *rf = __FILE__;
+ 
+-#ifdef __linux__
+ #include <unistd.h>
+ #include <sys/types.h>
+ #include <sys/mman.h>
+-#endif
+ 
+ static int big_tst(size_t fsz, size_t usz, int hack, int tst_add)
+ {
+-#ifdef __linux__
+   int fd = -1;
+   void *ptr = NULL;
+   Ustr *s3 = NULL;
+@@ -83,7 +80,6 @@ static int big_tst(size_t fsz, size_t usz, int hack, int tst_add)
+   close(fd);
+  fail_mkstemp:
+   return (EXIT_FAILED_OK);
+-#endif
+ }
+ 
+ int tst(void)
+-- 
+tg: (b148fb7..) fixes/nonlinux (depends on: upstream)
--- ustr-1.0.4.orig/debian/patches/fixes/man-spelling.diff
+++ ustr-1.0.4/debian/patches/fixes/man-spelling.diff
@@ -0,0 +1,152 @@
+From: Vaclav Ovsik <vaclav.ovsik@i.cz>
+Subject: [PATCH] fixes/man-spelling
+
+Fixes spelling errors found by lintian.
+
+Signed-off-by: Vaclav Ovsik <vaclav.ovsik@i.cz>
+
+---
+ Documentation/ustr-import.1 |    6 +++---
+ Documentation/ustr.3        |   22 +++++++++++-----------
+ Documentation/ustr_const.3  |    2 +-
+ 3 files changed, 15 insertions(+), 15 deletions(-)
+
+diff --git a/Documentation/ustr-import.1 b/Documentation/ustr-import.1
+index 153c48f..f8555ab 100644
+--- a/Documentation/ustr-import.1
++++ b/Documentation/ustr-import.1
+@@ -9,16 +9,16 @@ ustr\-import \- ustr string library import tool
+ .sp
+ .ti
+ .SH "DESCRIPTION"
+- This tool lets you use the Ustr string library without incuring dependancies on the library itself, so API/ABI compatability is 100% (nothing changes unless you do it) and installing your application doesn't require the library to be pre\-installed\&.
++ This tool lets you use the Ustr string library without incuring dependencies on the library itself, so API/ABI compatibility is 100% (nothing changes unless you do it) and installing your application doesn't require the library to be pre\-installed\&.
+ .SH "OPTIONS"
+ 
+ .TP
+ \-\-32
+-If you installed with multilib, this runs the 32 bit varient (and installs the variable multilib build code as ustr\-conf.h)\&.
++If you installed with multilib, this runs the 32 bit variant (and installs the variable multilib build code as ustr\-conf.h)\&.
+ 
+ .TP
+ \-\-64
+-If you installed with multilib, this runs the 64 bit varient (and installs the variable multilib build code as ustr\-conf.h)\&.
++If you installed with multilib, this runs the 64 bit variant (and installs the variable multilib build code as ustr\-conf.h)\&.
+ 
+ .TP
+ \-d
+diff --git a/Documentation/ustr.3 b/Documentation/ustr.3
+index 88acab9..81675d6 100644
+--- a/Documentation/ustr.3
++++ b/Documentation/ustr.3
+@@ -6556,7 +6556,7 @@ Type\fB[3]\fR: char
+ \fBNote:\fR
+ 
+ .br
+-  The searching starts from the end of the string, and so the offset is the offset from the end. However the position of a byte is always relative to the begining, so to do a loop you need to take the position from the length.
++  The searching starts from the end of the string, and so the offset is the offset from the end. However the position of a byte is always relative to the beginning, so to do a loop you need to take the position from the length.
+ 
+ .ti -2
+ .br
+@@ -6629,7 +6629,7 @@ Type\fB[4]\fR: size_t
+ \fBNote:\fR
+ 
+ .br
+-  The searching starts from the end of the string, and so the offset is the offset from the end. However the position of a byte is always relative to the begining, so to do a loop you need to take the position from the length.
++  The searching starts from the end of the string, and so the offset is the offset from the end. However the position of a byte is always relative to the beginning, so to do a loop you need to take the position from the length.
+ 
+ .ti -2
+ .br
+@@ -6692,7 +6692,7 @@ Type\fB[3]\fR: const struct Ustr *
+ \fBNote:\fR
+ 
+ .br
+-  The searching starts from the end of the string, and so the offset is the offset from the end. However the position of a byte is always relative to the begining, so to do a loop you need to take the position from the length.
++  The searching starts from the end of the string, and so the offset is the offset from the end. However the position of a byte is always relative to the beginning, so to do a loop you need to take the position from the length.
+ 
+ .ti -2
+ .br
+@@ -6755,7 +6755,7 @@ Type\fB[3]\fR: const char *
+ \fBNote:\fR
+ 
+ .br
+-  The searching starts from the end of the string, and so the offset is the offset from the end. However the position of a byte is always relative to the begining, so to do a loop you need to take the position from the length.
++  The searching starts from the end of the string, and so the offset is the offset from the end. However the position of a byte is always relative to the beginning, so to do a loop you need to take the position from the length.
+ 
+ .ti -2
+ .br
+@@ -6838,7 +6838,7 @@ Type\fB[5]\fR: size_t
+ \fBNote:\fR
+ 
+ .br
+-  The searching starts from the end of the string, and so the offset is the offset from the end. However the position of a byte is always relative to the begining, so to do a loop you need to take the position from the length.
++  The searching starts from the end of the string, and so the offset is the offset from the end. However the position of a byte is always relative to the beginning, so to do a loop you need to take the position from the length.
+ 
+ .ti -2
+ .br
+@@ -8248,12 +8248,12 @@ Type\fB[3]\fR: size_t
+ \fBExplanation:\fR
+ 
+ .br
+-  This function is the opposite of ustr_io_get(), taking bytes from the beginning of the Ustr and writting them to the file.
++  This function is the opposite of ustr_io_get(), taking bytes from the beginning of the Ustr and writing them to the file.
+ .sp
+ \fBNote:\fR
+ 
+ .br
+-  Deleting bytes from the begining of a Ustr string is the most inefficient thing to do, so it is recommended to use ustr_io_putfile().
++  Deleting bytes from the beginning of a Ustr string is the most inefficient thing to do, so it is recommended to use ustr_io_putfile().
+ 
+ .ti -2
+ .br
+@@ -8282,7 +8282,7 @@ Type\fB[3]\fR: size_t
+ \fBExplanation:\fR
+ 
+ .br
+-  This function works like calling ustr_io_put(), and then writting a '\\n' to the file.
++  This function works like calling ustr_io_put(), and then writing a '\\n' to the file.
+ .sp
+ \fBNote:\fR
+ 
+@@ -8404,7 +8404,7 @@ Type\fB[3]\fR: size_t
+ \fBNote:\fR
+ 
+ .br
+-  You can think of the operation as two seperate tasks, one which makes the current data in the Ustr undefined and the second which adds undefined data to the ustr to accomodate the desired length.
++  You can think of the operation as two separate tasks, one which makes the current data in the Ustr undefined and the second which adds undefined data to the ustr to accommodate the desired length.
+ 
+ .ti -2
+ .br
+@@ -10160,7 +10160,7 @@ Type\fB[3]\fR: size_t
+ \fBExplanation:\fR
+ 
+ .br
+-  This function deletes the bytes at the begining of the Ustr (Parameter[1]) that are in the span (Parameter[2]) of the specificed length (parameter[2]).
++  This function deletes the bytes at the beginning of the Ustr (Parameter[1]) that are in the span (Parameter[2]) of the specificed length (parameter[2]).
+ 
+ .ti -2
+ .br
+@@ -10314,7 +10314,7 @@ Type\fB[3]\fR: size_t
+ \fBExplanation:\fR
+ 
+ .br
+-  This function deletes the bytes at the begining or end of the Ustr (Parameter[1]) that are in the span (Parameter[2]) of the specificed length (parameter[2]).
++  This function deletes the bytes at the beginning or end of the Ustr (Parameter[1]) that are in the span (Parameter[2]) of the specificed length (parameter[2]).
+ .sp
+ \fBNote:\fR
+ 
+diff --git a/Documentation/ustr_const.3 b/Documentation/ustr_const.3
+index 18d6b8b..599c625 100644
+--- a/Documentation/ustr_const.3
++++ b/Documentation/ustr_const.3
+@@ -393,7 +393,7 @@ ustr_const \- ustr string library constants
+ \fBExplanation:\fR
+ 
+ .br
+-  This flag allows the parsing (and ignoring) of the seperator character, at arbitrary pointers in the number, so "1234" and "1_234" would both parse the same (assuming "_" is the seperator).
++  This flag allows the parsing (and ignoring) of the separator character, at arbitrary pointers in the number, so "1234" and "1_234" would both parse the same (assuming "_" is the separator).
+ 
+ .br
+ \fBConstant: \fR USTR_FLAG_PARSE_NUM_OVERFLOW
+-- 
+tg: (09206e5..) fixes/man-spelling (depends on: fixes/man-cleanup)
--- ustr-1.0.4.orig/debian/patches/fixes/man-cleanup.diff
+++ ustr-1.0.4/debian/patches/fixes/man-cleanup.diff
@@ -0,0 +1,169 @@
+From: Vaclav Ovsik <vaclav.ovsik@i.cz>
+Subject: [PATCH] fixes/man-cleanup
+
+The patch cleans up man pages (removes undefined macros).
+
+Signed-off-by: Vaclav Ovsik <vaclav.ovsik@i.cz>
+
+---
+ Documentation/txt2man.pl |   18 ++++++++++++------
+ Documentation/ustr.3     |   19 -------------------
+ 2 files changed, 12 insertions(+), 25 deletions(-)
+
+diff --git a/Documentation/txt2man.pl b/Documentation/txt2man.pl
+index 017d0a2..2078997 100755
+--- a/Documentation/txt2man.pl
++++ b/Documentation/txt2man.pl
+@@ -169,6 +169,7 @@ sub conv_A_refs
+ sub convert()
+   {
+     my $in_pre_tag = "";
++    my $in_pre = 0;
+     my $in_const = 0;
+ 
+     while (<IN>)
+@@ -231,23 +232,28 @@ sub convert()
+ 	    if (/\.\.\.$/)
+ 	      {
+ 		conv_A_refs(1, 1, 0);
+-		$_ = ".Ve\n$_.Vb 4\n";
+-		$in_pre_tag = "\n.Ve";
++#		$_ = ".Ve\n$_.Vb 4\n";
++#		$in_pre_tag = "\n.Ve";
++		$in_pre_tag = "";
++		$in_pre = 1;
+ 	      }
+ 	    else
+ 	      {
+ 		conv_A_refs(1, 1, 0);
+-		$_ = ".Ve\n$_";
++#		$_ = ".Ve\n$_";
+ 		$in_pre_tag = "";
++		$in_pre = 0;
+ 	      }
+ 	  }
+ 	elsif (/\.\.\.$/)
+ 	  {
+ 	    conv_A_refs(1, 1, 0);
+-	    $_ = "$_\n.Vb 4";
+-	    $in_pre_tag = "\n.Ve";
++#	    $_ = "$_\n.Vb 4";
++#	    $in_pre_tag = "\n.Ve";
++	    $in_pre_tag = "";
++	    $in_pre = 1;
+ 	  }
+-	elsif (!$in_pre_tag)
++	elsif (!$in_pre)
+ 	  {
+ 	    if (!/^$/)
+ 	      {
+diff --git a/Documentation/ustr.3 b/Documentation/ustr.3
+index a8301b5..88acab9 100644
+--- a/Documentation/ustr.3
++++ b/Documentation/ustr.3
+@@ -1317,24 +1317,18 @@ Type\fB[2]\fR: const char[]
+ .br
+   This macro function simplifies the creation of read\-only Ustr string's. And is normally used like...
+ 
+-.Vb 4
+   USTR1(\\x4, "abcd")
+ 
+-.Ve
+  ...it is worth pointing out that running with debugging turned on
+  (USTR_CONF_USE_ASSERT) will complain if the length isn't encoded correctly, as in...
+ 
+-.Vb 4
+   USTR1(\\x3, "abcd")
+ 
+-.Ve
+  ...here ustr_assert_valid() will fail, which is called before most functions do
+  anything in debugging mode. Note also that extra debugging (USTR_CONF_USE_EOS_MARK) will still catch cases like...
+ 
+-.Vb 4
+   USTR1(\\x3, "abc\\0d")
+ 
+-.Ve
+  ...at least using debugging is esp. important if you are putting UTF\-8
+  characters into the strings.
+ .sp
+@@ -1731,7 +1725,6 @@ Type\fB[1]\fR: size_t
+ 
+ .br
+   char buf[USTR_SIZE_FIXED(4)];
+-.Ve
+  ...to give you exactly 4 bytes as a maximum, this is esp. useful if you want
+  a limited (ustr_limited() == USTR_TRUE) Ustr string.
+ 
+@@ -1810,11 +1803,9 @@ Type\fB[3]\fR: size_t
+ .br
+   This does mean that the first argument must be the correct size, as far as sizeof() is concerned, as in...
+ 
+-.Vb 4
+  char buf_sz[1024];
+  Ustr *s1 = USTR_SC_INIT_AUTO(buf_sz, USTR_FALSE, 0);
+ 
+-.Ve
+  ...so passing pointers to memory from malloc() will probably just return NULL.
+ 
+ 
+@@ -1852,11 +1843,9 @@ Type\fB[3]\fR: size_t
+ .br
+   This does mean that the first argument must be the correct size, as far as sizeof() is concerned, as in...
+ 
+-.Vb 4
+  char buf_sz[1024] = USTR_BEG_FIXED2 "abcd";
+  Ustr *s1 = USTR_SC_INIT_AUTO_OSTR(buf_sz, USTR_FALSE, "abcd");
+ 
+-.Ve
+  ...so passing pointers to memory from malloc() will probably just return NULL.
+ 
+ 
+@@ -9031,11 +9020,9 @@ Type\fB[6]\fR: size_t lim
+   This function replaces a repeating sequence of characters with another repeating sequence of characters. 
+   For example...
+ 
+-.Vb 4
+   Ustr *data = ustr_dup_cstr("xxxBxxCxDxxx");
+   ustr_replace_rep_chr(&data,'x',2,'y',1, 0)
+ 
+-.Ve
+  ...would change data to be "yxByCxDyx".
+ 
+ 
+@@ -9092,16 +9079,13 @@ Type\fB[6]\fR: unsigned int
+ .br
+   Parameter[5] is a a pointer to a Ustr where the return value will be placed. Passing a USTR_NULL to this parameter will cause the string to be allocated and \fBMUST\fR be freed \fBmanually\fR. If, however, you pass in a non\-null Ustr to this parameter, each call to ustr_split_buf() will free what is in this pointer and place the new token there (when USTR_NULL is returned, nothing needs to be free'd).  For example, given...
+ 
+-.Vb 4
+   Ustr *data = ...;
+   Ustr *tok = USTR_NULL;
+   const char *sep = ",";
+   size_t off = 0;
+   unsigned int flags = USTR_FLAGS_SPLIT_DEF;
+ 
+-.Ve
+  ...there are two options...
+-.Vb 4
+ 
+   while ((tok = ustr_split_buf(data, &off, sep, strlen(sep), tok, flags)))
+   {
+@@ -9110,9 +9094,7 @@ Type\fB[6]\fR: unsigned int
+   }
+   /* tok is now NULL again after the loop */
+ 
+-.Ve
+  ...or...
+-.Vb 4
+ 
+   while ((tok = ustr_split_buf(data, &off, sep, strlen(sep), USTR_NULL, flags)))
+   {
+@@ -9121,7 +9103,6 @@ Type\fB[6]\fR: unsigned int
+       ustr_free(tok); /* have to free to avoid mem leaks */
+   }
+ 
+-.Ve
+  ...the former of which being the safer option.
+ 
+ .sp
+-- 
+tg: (b148fb7..) fixes/man-cleanup (depends on: upstream)
--- ustr-1.0.4.orig/debian/source/format
+++ ustr-1.0.4/debian/source/format
@@ -0,0 +1 @@
+1.0
