commit 5f555545897c5b2fcc3b1269b48b87a9b5738346
Author: Jan Rękorajski <[email protected]>
Date: Tue Mar 2 23:27:25 2021 +0100
- rediff patches
translate-toolkit-langmodel_dir.patch | 9 +++---
translate-toolkit-stoplist.patch | 13 ++++----
unbash.patch | 59 ++++++++++++++++-------------------
3 files changed, 38 insertions(+), 43 deletions(-)
---
diff --git a/translate-toolkit-langmodel_dir.patch
b/translate-toolkit-langmodel_dir.patch
index 36e6446..06119a5 100644
--- a/translate-toolkit-langmodel_dir.patch
+++ b/translate-toolkit-langmodel_dir.patch
@@ -1,8 +1,7 @@
-diff -up translate-toolkit-1.5.0/translate/lang/identify.py.langmodel_dir
translate-toolkit-1.5.0/translate/lang/identify.py
-diff -up translate-toolkit-1.5.0/translate/lang/identify.py.langmodel_dir
translate-toolkit-1.5.0/translate/lang/identify.py
---- translate-toolkit-1.5.0/translate/lang/identify.py.langmodel_dir
2009-11-24 16:33:22.000000000 +0200
-+++ translate-toolkit-1.5.0/translate/lang/identify.py 2009-11-24
16:34:36.000000000 +0200
-@@ -32,7 +32,7 @@ from ngram import NGram
+diff -urNp -x '*.orig' translate-toolkit-2.2.4.org/translate/lang/identify.py
translate-toolkit-2.2.4/translate/lang/identify.py
+--- translate-toolkit-2.2.4.org/translate/lang/identify.py 2017-07-31
15:41:45.000000000 +0200
++++ translate-toolkit-2.2.4/translate/lang/identify.py 2021-03-02
23:26:49.747045758 +0100
+@@ -32,7 +32,7 @@ from translate.storage.base import Trans
class LanguageIdentifier(object):
diff --git a/translate-toolkit-stoplist.patch b/translate-toolkit-stoplist.patch
index d3fb5c0..c58635f 100644
--- a/translate-toolkit-stoplist.patch
+++ b/translate-toolkit-stoplist.patch
@@ -1,6 +1,7 @@
---- translate-toolkit-2.1.0/translate/tools/poterminology.py~ 2017-04-23
18:23:57.000000000 +0300
-+++ translate-toolkit-2.1.0/translate/tools/poterminology.py 2017-04-23
18:24:31.871529381 +0300
-@@ -79,7 +79,7 @@
+diff -urNp -x '*.orig'
translate-toolkit-2.2.4.org/translate/tools/poterminology.py
translate-toolkit-2.2.4/translate/tools/poterminology.py
+--- translate-toolkit-2.2.4.org/translate/tools/poterminology.py
2017-07-31 15:41:45.000000000 +0200
++++ translate-toolkit-2.2.4/translate/tools/poterminology.py 2021-03-02
23:26:49.343713783 +0100
+@@ -78,7 +78,7 @@ class TerminologyExtractor(object):
if stopfile is None:
try:
@@ -9,12 +10,12 @@
except Exception:
pass
self.stopfile = stopfile
-@@ -457,7 +457,7 @@ def main():
+@@ -471,7 +471,7 @@ def main():
parser.add_option("-S", "--stopword-list", type="string",
metavar="STOPFILE", dest="stopfile",
help="read stopword (term exclusion) list from STOPFILE
(default %s)" %
- file_discovery.get_abs_data_filename('stoplist-en'))
+ '/usr/share/translate-toolkit/stoplist-en')
- parser.set_defaults(foldtitle = True, ignorecase = False)
- parser.add_option("-F", "--fold-titlecase", callback=fold_case_option,
+ parser.set_defaults(foldtitle=True, ignorecase=False)
+ parser.add_option(
diff --git a/unbash.patch b/unbash.patch
index cd92050..704ca75 100644
--- a/unbash.patch
+++ b/unbash.patch
@@ -1,12 +1,13 @@
---- translate-toolkit-1.7.0/tools.orig/junitmsgfmt 2010-05-12
16:41:15.000000000 +0200
-+++ translate-toolkit-1.7.0/tools/junitmsgfmt 2010-05-13 19:21:20.617544285
+0200
+diff -urNp -x '*.orig' translate-toolkit-2.2.4.org/tools/junitmsgfmt
translate-toolkit-2.2.4/tools/junitmsgfmt
+--- translate-toolkit-2.2.4.org/tools/junitmsgfmt 2017-07-31
15:41:45.000000000 +0200
++++ translate-toolkit-2.2.4/tools/junitmsgfmt 2021-03-02 23:26:50.197044243
+0100
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
#
# Copyright 2010 Zuza Software Foundation
#
-@@ -25,38 +25,38 @@
+@@ -25,38 +25,38 @@ body=""
failures=0
successes=0
@@ -53,23 +54,19 @@
cat -
echo "</testsuite>"
}
---- translate-toolkit-1.7.0/tools.orig/pocommentclean 2008-10-31
16:58:36.000000000 +0100
-+++ translate-toolkit-1.7.0/tools/pocommentclean 2010-05-13
19:21:20.617544285 +0200
+diff -urNp -x '*.orig' translate-toolkit-2.2.4.org/tools/pocommentclean
translate-toolkit-2.2.4/tools/pocommentclean
+--- translate-toolkit-2.2.4.org/tools/pocommentclean 2017-07-31
15:41:45.000000000 +0200
++++ translate-toolkit-2.2.4/tools/pocommentclean 2021-03-02
23:26:50.197044243 +0100
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
#
# Copyright 2005 Zuza Software Foundation
#
---- translate-toolkit-1.7.0/tools.orig/pocompendium 2008-01-24
12:54:56.000000000 +0100
-+++ translate-toolkit-1.7.0/tools/pocompendium 2010-05-13 19:21:20.621015064
+0200
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/bin/bash
- #
- # Copyright 2004, 2005 Zuza Software Foundation
- #
-@@ -24,7 +24,7 @@
+diff -urNp -x '*.orig' translate-toolkit-2.2.4.org/tools/pocompendium
translate-toolkit-2.2.4/tools/pocompendium
+--- translate-toolkit-2.2.4.org/tools/pocompendium 2017-07-31
15:41:45.000000000 +0200
++++ translate-toolkit-2.2.4/tools/pocompendium 2021-03-02 23:26:50.197044243
+0100
+@@ -23,7 +23,7 @@
# combined and marked fuzzy.
@@ -78,7 +75,7 @@
echo "Usage: `basename $0` [options] output.po <-d
directory(s)|file(s)>"
echo " The first parameter is the output file, standard output if
the output file is '-'."
echo " Any number of directories may be specified for input
files."
-@@ -97,7 +97,7 @@
+@@ -96,7 +96,7 @@ shift
tmp_dir=`mktemp -d tmp.XXXXXXXXXX`
@@ -87,15 +84,10 @@
shift
directories=$*
if [ $# -eq 0 ]; then
---- translate-toolkit-1.7.0/tools.orig/pomigrate2 2009-07-21
21:40:54.000000000 +0200
-+++ translate-toolkit-1.7.0/tools/pomigrate2 2010-05-13 19:21:20.621015064
+0200
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/bin/bash
- #
- # Copyright 2004, 2005 Zuza Software Foundation
- #
-@@ -22,7 +22,7 @@
+diff -urNp -x '*.orig' translate-toolkit-2.2.4.org/tools/pomigrate2
translate-toolkit-2.2.4/tools/pomigrate2
+--- translate-toolkit-2.2.4.org/tools/pomigrate2 2017-07-31
15:41:45.000000000 +0200
++++ translate-toolkit-2.2.4/tools/pomigrate2 2021-03-02 23:26:50.197044243
+0100
+@@ -21,7 +21,7 @@
# pomigrate2 - migrates PO files from an old version using new POT files.
@@ -104,7 +96,7 @@
echo "Usage `basename $0` [options] <product-old> <product-new>
<product-templates>"
echo
echo "Options:"
-@@ -100,7 +100,7 @@
+@@ -99,7 +99,7 @@ templates=$3
echo "** Migrating files... **"
pots=`cd $templates; find . -name "*.pot"`
@@ -113,15 +105,16 @@
echo "No POT templates found in: $templates"
exit 1
fi
---- translate-toolkit-1.7.0/tools.orig/popuretext 2010-01-12
14:02:34.000000000 +0100
-+++ translate-toolkit-1.7.0/tools/popuretext 2010-05-13 19:21:20.621015064
+0200
+diff -urNp -x '*.orig' translate-toolkit-2.2.4.org/tools/popuretext
translate-toolkit-2.2.4/tools/popuretext
+--- translate-toolkit-2.2.4.org/tools/popuretext 2017-07-31
15:41:45.000000000 +0200
++++ translate-toolkit-2.2.4/tools/popuretext 2021-03-02 23:26:50.197044243
+0100
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
#
# Copyright 2005 Zuza Software Foundation
#
-@@ -28,7 +28,7 @@
+@@ -27,7 +27,7 @@ if [ $# -lt 2 ]; then
fi
do_pot=0
@@ -130,16 +123,18 @@
do_pot=1
shift
potdir=$1
---- translate-toolkit-1.7.0/tools.orig/poreencode 2008-01-24
12:54:56.000000000 +0100
-+++ translate-toolkit-1.7.0/tools/poreencode 2010-05-13 19:21:20.621015064
+0200
+diff -urNp -x '*.orig' translate-toolkit-2.2.4.org/tools/poreencode
translate-toolkit-2.2.4/tools/poreencode
+--- translate-toolkit-2.2.4.org/tools/poreencode 2017-07-31
15:41:45.000000000 +0200
++++ translate-toolkit-2.2.4/tools/poreencode 2021-03-02 23:26:50.197044243
+0100
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
#
# Copyright 2004 Zuza Software Foundation
#
---- translate-toolkit-1.7.0/tools.orig/posplit 2007-02-01 11:40:17.000000000
+0100
-+++ translate-toolkit-1.7.0/tools/posplit 2010-05-13 19:21:20.621015064
+0200
+diff -urNp -x '*.orig' translate-toolkit-2.2.4.org/tools/posplit
translate-toolkit-2.2.4/tools/posplit
+--- translate-toolkit-2.2.4.org/tools/posplit 2017-07-31 15:41:45.000000000
+0200
++++ translate-toolkit-2.2.4/tools/posplit 2021-03-02 23:26:50.197044243
+0100
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/translate-toolkit.git/commitdiff/5f555545897c5b2fcc3b1269b48b87a9b5738346
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
