./packages/openofficeorg/3.2.1/unstable r2068: succesful -> successful in regcomp
------------------------------------------------------------
revno: 2068
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Wed 2010-08-18 13:42:28 +0200
message:
succesful -> successful in regcomp
added:
patches/regcomp-fix-spelling.diff
modified:
changelog
patches/series
=== modified file 'changelog'
--- a/changelog 2010-08-18 10:14:11 +0000
+++ b/changelog 2010-08-18 11:42:28 +0000
@@ -3,6 +3,8 @@
* debian/patches/reduce-height-on-dialogs-for-netbooks.diff: add
patch from ooo-build-3-2-1 branch to reduce the PDF export and Recovery
dialogs to fit on Netbooks (closes: #531930)
+ * debian/patches/regcomp-fix-spelling.diff: succesful -> successful
+ (closes: #593440)
* merge from Ubuntu (thanks Loic Minier):
- Pass the same -v to "dh_makeshlibs --" (for dpkg-gensymbols) as to
"dh_gencontrol --" (for dpkg-gencontrol); some symbols are missing from
@@ -10,7 +12,7 @@
source-version which can't be satisfied as ure uses another versioning
scheme
- -- Rene Engelhard <rene@debian.org> Wed, 18 Aug 2010 12:12:15 +0200
+ -- Rene Engelhard <rene@debian.org> Wed, 18 Aug 2010 13:40:30 +0200
openoffice.org (1:3.2.1-5) unstable; urgency=medium
=== added file 'patches/regcomp-fix-spelling.diff'
--- a/patches/regcomp-fix-spelling.diff 1970-01-01 00:00:00 +0000
+++ b/patches/regcomp-fix-spelling.diff 2010-08-18 11:42:28 +0000
@@ -0,0 +1,39 @@
+diff --git a/patches/dev300/apply b/patches/dev300/apply
+index 4283ba1..6dc9d1e 100644
+--- openoffice.org-3.2.1/ooo-build-3-2-1-4/patches/dev300/apply
++++ openoffice.org-3.2.1/ooo-build-3-2-1-4/patches/dev300/apply
+@@ -3070,6 +3070,9 @@ lockfile-dont-do-dns-lookup.diff, n#389257, jholesov
+ # TODO file up-stream
+ lockfile-less-symbols.diff, jholesov
+
++# succesful -> successful
++regcomp-fix-spelling.diff, i#113958, rengelha
++
+ [ InternalMesaHeaders ]
+ internal-mesa-headers-config_office.diff, fridrich
+ internal-mesa-headers-slideshow.diff, fridrich
+--- /dev/null 2010-08-16 13:41:41.277183513 +0200
++++ openoffice.org-3.2.1/ooo-build-3-2-1-4/patches/dev300/regcomp-fix-spelling.diff 2010-08-18 13:36:21.000000000 +0200
+@@ -0,0 +1,22 @@
++diff --git a/cpputools/source/registercomponent/registercomponent.cxx
++b/cpputools/source/registercomponent/registercomponent.cxx
++--- cpputools/source/registercomponent/registercomponent.cxx
+++++ cpputools/source/registercomponent/registercomponent.cxx
++@@ -584,7 +584,7 @@
++
++ if ( ! _bSilent )
++ {
++- fprintf(stderr, "register component '%s' in registry '%s' succesful!\n", sUrl.getStr(), _sRegName.getStr());
+++ fprintf(stderr, "register component '%s' in registry '%s' successful!\n", sUrl.getStr(), _sRegName.getStr());
++ }
++
++ }
++@@ -613,7 +613,7 @@
++ if (bRet)
++ {
++ if ( ! _bSilent )
++- fprintf(stderr, "revoke component '%s' from registry '%s' succesful!\n", sUrl.getStr(), _sRegName.getStr());
+++ fprintf(stderr, "revoke component '%s' from registry '%s' successful!\n", sUrl.getStr(), _sRegName.getStr());
++ }
++ else
++ {
=== modified file 'patches/series'
--- a/patches/series 2010-08-18 10:14:11 +0000
+++ b/patches/series 2010-08-18 11:42:28 +0000
@@ -6,3 +6,4 @@
fix-i113084.diff
fix-i113461.diff
reduce-height-on-dialogs-for-netbooks.diff
+regcomp-fix-spelling.diff
Reply to: