From: Denis Briand Date: Wed, 30 Dec 2015 03:45:08 +0000 (+0100) Subject: remove trailing whitespaces and add a patch file on repos' X-Git-Tag: debian/0.6.1-1~5 X-Git-Url: https://git.deb.at/w?a=commitdiff_plain;h=d25a37de5fc5cc767590c7ea61572906e936769e;p=pkg%2Fabook.git remove trailing whitespaces and add a patch file on repos' --- diff --git a/debian/changelog b/debian/changelog index 5f251a4..a2d5219 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,18 +3,18 @@ abook (0.6.1-1) unstable; urgency=medium [ Rhonda D'Vine ] * New upstream release + (Closes: #727245) - + (Closes: #771343) incorporated patches 02_fix-manpage. + + (Closes: #771343) incorporated patches 02_fix-manpage. [ Denis Briand ] * Use dh_autoreconf. * Remove autotools-dev build dependency. - * Remove merged patch 03_datafile-f-switch. - * Provide debugging symbols with a new abook-dbg binary package. - * Add debhelper token into maintainers scripts. - * Rename postinst and postrm files into abook.* - * Switch debian/copyright file to machine readable format. + * Remove merged patch 03_datafile-f-switch. + * Provide debugging symbols with a new abook-dbg binary package. + * Add debhelper token into maintainers scripts. + * Rename postinst and postrm files into abook.* + * Switch debian/copyright file to machine readable format. * Add fix_spelling_error_in_binary.diff patch - to fix error with "occurred" word + to fix error with "occurred" word -- Denis Briand Wed, 30 Dec 2015 03:45:10 +0100 diff --git a/debian/control b/debian/control index 753847c..f58c6f6 100644 --- a/debian/control +++ b/debian/control @@ -15,7 +15,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, debconf (>= 0.5) | debconf-2.0 Enhances: mutt Description: text-based ncurses address book application abook is a text-based ncurses address book application. It provides many - different fields of user info. abook is designed for use with mutt, but + different fields of user info. abook is designed for use with mutt, but can be used independently. Package: abook-dbg diff --git a/debian/patches/fix_spelling_error_in_binary.diff b/debian/patches/fix_spelling_error_in_binary.diff new file mode 100644 index 0000000..1380158 --- /dev/null +++ b/debian/patches/fix_spelling_error_in_binary.diff @@ -0,0 +1,103 @@ +Author: Denis Briand +Description: Fix spelling error in binary: "occured" +===================================================== +--- a/filter.c ++++ b/filter.c +@@ -251,7 +251,7 @@ import_database() + } + + if(i_read_file(filename, i_filters[filter].func )) +- statusline_msg(_("Error occured while opening the file")); ++ statusline_msg(_("Error occurred while opening the file")); + else if(tmp == db_n_items()) + statusline_msg(_("File does not seem to be a valid addressbook")); + +@@ -397,7 +397,7 @@ export_database() + } + + if( e_write_file(filename, e_filters[filter].func, enum_mode)) +- statusline_msg(_("Error occured while exporting")); ++ statusline_msg(_("Error occurred while exporting")); + + refresh_screen(); + free(filename); +--- a/po/abook.pot ++++ b/po/abook.pot +@@ -510,7 +510,7 @@ msgid "Filename: " + msgstr "" + + #: filter.c:252 +-msgid "Error occured while opening the file" ++msgid "Error occurred while opening the file" + msgstr "" + + #: filter.c:254 +@@ -530,7 +530,7 @@ msgid "keybindings:all/selected/cancel|a + msgstr "" + + #: filter.c:398 +-msgid "Error occured while exporting" ++msgid "Error occurred while exporting" + msgstr "" + + #: filter.c:2469 +--- a/po/de.po ++++ b/po/de.po +@@ -534,7 +534,7 @@ msgid "Filename: " + msgstr "Dateiname: " + + #: filter.c:252 +-msgid "Error occured while opening the file" ++msgid "Error occurred while opening the file" + msgstr "Fehler beim Öffnen der Datei" + + #: filter.c:254 +@@ -555,7 +555,7 @@ msgid "keybindings:all/selected/cancel|a + msgstr "asc" + + #: filter.c:398 +-msgid "Error occured while exporting" ++msgid "Error occurred while exporting" + msgstr "Fehler beim Exportieren aufgetreten" + + #: filter.c:2469 +--- a/po/fr.po ++++ b/po/fr.po +@@ -527,7 +527,7 @@ msgid "Filename: " + msgstr "Nom de fichier: " + + #: filter.c:252 +-msgid "Error occured while opening the file" ++msgid "Error occurred while opening the file" + msgstr "Une erreur est survenue à l'ouverture du fichier" + + #: filter.c:254 +@@ -547,7 +547,7 @@ msgid "keybindings:all/selected/cancel|a + msgstr "tsa" + + #: filter.c:398 +-msgid "Error occured while exporting" ++msgid "Error occurred while exporting" + msgstr "Une erreur est survenue lors de l'exportation" + + #: filter.c:2469 +--- a/po/sv.po ++++ b/po/sv.po +@@ -534,7 +534,7 @@ msgid "Filename: " + msgstr "Filnamn:" + + #: filter.c:252 +-msgid "Error occured while opening the file" ++msgid "Error occurred while opening the file" + msgstr "Fel vid öppnandet av filen" + + #: filter.c:254 +@@ -554,7 +554,7 @@ msgid "keybindings:all/selected/cancel|a + msgstr "" + + #: filter.c:398 +-msgid "Error occured while exporting" ++msgid "Error occurred while exporting" + msgstr "Fel vid export" + + #: filter.c:2469