[hfst-ospell] 02/02: Imported Debian patch 0.4.0~r4643-1

[Tino Didriksen]

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

tinodidriksen-guest pushed a commit to branch master
in repository hfst-ospell.

commit c57f394b923cffee857608044115b04073b20215
Merge: 3eaec7b 82377ae
Author: Kartik Mistry <kartik at debian.org>
Date:   Tue Feb 2 19:14:36 2016 +0530

    Imported Debian patch 0.4.0~r4643-1

 debian/changelog                               |  2 +-
 debian/patches/hfst-ospell_01_notimestamp.diff | 40 ++++++++++++++++----------
 debian/patches/hyphen-minus.diff               | 17 -----------
 debian/patches/series                          |  2 +-
 office.cpp                                     |  3 +-
 5 files changed, 29 insertions(+), 35 deletions(-)

diff --cc debian/changelog
index d43f064,0000000..3ee2621
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,6 -1,0 +1,6 @@@
- hfst-ospell (0.4.0~r4620-1) experimental; urgency=low
++hfst-ospell (0.4.0~r4643-1) experimental; urgency=low
 +
 +  [ Tino Didriksen ]
 +  * Initial release (closes: #813488)
 +
 + -- Kartik Mistry <kartik at debian.org>  Tue, 02 Feb 2016 19:14:36 +0530
diff --cc debian/patches/hfst-ospell_01_notimestamp.diff
index b00f5ab,0000000..32ed069
mode 100644,000000..100644
--- a/debian/patches/hfst-ospell_01_notimestamp.diff
+++ b/debian/patches/hfst-ospell_01_notimestamp.diff
@@@ -1,51 -1,0 +1,61 @@@
 +Description: Do not timestamp in output.
- --- a/main-cicling.cc
- +++ b/main-cicling.cc
- @@ -54,7 +54,6 @@ bool print_version(void)
++Index: b/main-cicling.cc
++===================================================================
++--- a/main-cicling.cc	(revision 4596)
+++++ b/main-cicling.cc	(working copy)
++@@ -54,7 +54,6 @@
 +     std::cerr <<
 +     "\n" <<
 +     PACKAGE_STRING << std::endl <<
 +-    __DATE__ << " " __TIME__ << std::endl <<
 +     "copyright (C) 2009 University of Helsinki\n";
 +     return true;
 + }
- --- a/main-fsmnlp-2012.cc
- +++ b/main-fsmnlp-2012.cc
- @@ -73,7 +73,6 @@ bool print_version(void)
++Index: b/main-fsmnlp-2012.cc
++===================================================================
++--- a/main-fsmnlp-2012.cc	(revision 4596)
+++++ b/main-fsmnlp-2012.cc	(working copy)
++@@ -73,7 +73,6 @@
 +     std::cerr <<
 +     "\n" <<
 +     PACKAGE_STRING << std::endl <<
 +-    __DATE__ << " " __TIME__ << std::endl <<
 +     "copyright (C) 2009 - 2011 University of Helsinki\n";
 +     return true;
 + }
- --- a/main-norvig.cc
- +++ b/main-norvig.cc
- @@ -54,7 +54,6 @@ bool print_version(void)
++Index: b/main-norvig.cc
++===================================================================
++--- a/main-norvig.cc	(revision 4596)
+++++ b/main-norvig.cc	(working copy)
++@@ -54,7 +54,6 @@
 +     std::cerr <<
 +     "\n" <<
 +     PACKAGE_STRING << std::endl <<
 +-    __DATE__ << " " __TIME__ << std::endl <<
 +     "copyright (C) 2009 University of Helsinki\n";
 +     return true;
 + }
- --- a/main-survey.cc
- +++ b/main-survey.cc
- @@ -95,7 +95,6 @@ print_version(void)
++Index: b/main-survey.cc
++===================================================================
++--- a/main-survey.cc	(revision 4596)
+++++ b/main-survey.cc	(working copy)
++@@ -95,7 +95,6 @@
 +     std::cerr <<
 +     "\n" <<
 +     PACKAGE_STRING << std::endl <<
 +-    __DATE__ << " " __TIME__ << std::endl <<
 +     "copyright (C) 2009 - 2011 University of Helsinki\n";
 +     return true;
 + }
- --- a/main.cc
- +++ b/main.cc
- @@ -151,7 +151,6 @@ bool print_version(void)
++Index: b/main.cc
++===================================================================
++--- a/main.cc	(revision 4596)
+++++ b/main.cc	(working copy)
++@@ -151,7 +151,6 @@
 +     std::cout <<
 +     "\n" <<
 +     PACKAGE_STRING << std::endl <<
 +-    __DATE__ << " " __TIME__ << std::endl <<
 +     "copyright (C) 2009 - 2016 University of Helsinki\n";
 +     return true;
 + }
diff --cc debian/patches/series
index d7b97d3,0000000..1c6a34e
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,1 -1,0 +1,1 @@@
- hyphen-minus.diff
++hfst-ospell_01_notimestamp.diff

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/hfst-ospell.git