[Pkg-chromium-commit] chromium-browser/chromium-browser.experimental: 680 Remove icu44.patch, applied upstream

[Giuseppe Iuculano]

Branch name: chromium-browser/chromium-browser.experimental
Branch location : bzr+ssh://bzr.debian.org/bzr/pkg-chromium/chromium-browser/chromium-browser.experimental
Browse location: http://bzr.debian.org/loggerhead/pkg-chromium
Revision No: 680
Revision Id: iuculano at debian.org-20101001155137-knre9nub4btz0h5i
Committer: Giuseppe Iuculano <iuculano at debian.org>
Message : Remove icu44.patch, applied upstream


--------------------------------------------------------
  ** Modified :
        - debian/changelog
        - debian/patches/series

  ** Removed :
        - debian/patches/icu44.patch
-------------- next part --------------
=== modified file 'debian/changelog'
--- a/debian/changelog	2010-10-01 13:31:33 +0000
+++ b/debian/changelog	2010-10-01 15:51:37 +0000
@@ -2,8 +2,9 @@
 
   * New dev version
   * Remove system-icu.patch, applied upstream
+  * Remove icu44.patch, applied upstream
 
- -- Giuseppe Iuculano <iuculano at debian.org>  Fri, 01 Oct 2010 15:30:45 +0200
+ -- Giuseppe Iuculano <iuculano at debian.org>  Fri, 01 Oct 2010 17:51:09 +0200
 
 chromium-browser (6.0.472.62~r59676-1) unstable; urgency=low
 

=== removed file 'debian/patches/icu44.patch'
--- a/debian/patches/icu44.patch	2010-07-18 19:59:50 +0000
+++ b/debian/patches/icu44.patch	1970-01-01 00:00:00 +0000
@@ -1,24 +0,0 @@
---- a/src/base/i18n/word_iterator.h
-+++ b/src/base/i18n/word_iterator.h
-@@ -9,6 +9,9 @@
- #include <vector>
- 
- #include "unicode/uchar.h"
-+#if U_ICU_VERSION_MAJOR_NUM == 4 && U_ICU_VERSION_MINOR_NUM >= 4
-+#include "unicode/ubrk.h"
-+#endif
- 
- #include "base/basictypes.h"
- #include "base/string16.h"
-@@ -68,7 +71,11 @@ class WordIterator {
- 
-  private:
-   // ICU iterator.
-+#if U_ICU_VERSION_MAJOR_NUM == 4 && U_ICU_VERSION_MINOR_NUM >= 4
-+  UBreakIterator* iter_;
-+#else
-   void* iter_;
-+#endif
- #if !defined(WCHAR_T_IS_UTF16)
-   std::vector<UChar> chars_;
- #endif

=== modified file 'debian/patches/series'
--- a/debian/patches/series	2010-10-01 13:31:33 +0000
+++ b/debian/patches/series	2010-10-01 15:51:37 +0000
@@ -10,7 +10,6 @@
 prefs.patch
 #protobuf.patch
 glew.patch
-icu44.patch
 armv4.patch
 gecko-mediaplayer.patch
 ffmpeg_arm.patch