Merge lp:~ubuntu-branches/ubuntu/lucid/m17n-lib/lucid-201002122315 into lp:ubuntu/lucid/m17n-lib

[James Westby]

[James Westby (james-w)]

The package history in the archive and the history in the bzr branch differ. As the archive is authoritative the history of lp:ubuntu/lucid/m17n-lib now reflects that and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/lucid/m17n-lib/lucid-201002122315. A merge should be performed if necessary.

Unmerged revisions

12. By Steve Langasek on 2010-01-28

Merging shared upstream rev into target branch.

=== modified file 'debian/changelog'
--- debian/changelog	2010-01-10 20:58:16 +0000
+++ debian/changelog	2010-02-12 23:20:30 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 m17n-lib (1.5.5-1) unstable; urgency=low
 
   * New upstream release 1.5.5.
@@ -189,3 +190,187 @@
 
  -- Hidetaka Iwai <[e-mail]>  Mon, 19 Apr 2004 20:46:54 +0900
 
+=======
+m17n-lib (1.5.4-1ubuntu1) karmic; urgency=low
+
+  * Build-depend on libgd2-noxpm-dev, not libgd2-xpm-dev; there's no reason
+    we need xpm support here, so go for the more generic build.
+
+ -- Steve Langasek <[e-mail]>  Thu, 27 Aug 2009 10:57:41 +0000
+
+m17n-lib (1.5.4-1build1) karmic; urgency=low
+
+  * Rebuild against new libdatrie.
+
+ -- Daniel Holbach <[e-mail]>  Mon, 04 May 2009 09:28:01 +0200
+
+m17n-lib (1.5.4-1) unstable; urgency=low
+
+  * New upstream release 1.5.4.
+  * Do not add the *.la files to the -dev package. (Closes: 510330)
+  * Update Standards-Version to Debian Policy 3.8.1. (No changes)
+  * debian/control:
+      - inherit Section from source package.
+      - the -dbg package moved to the debug section.
+  * debian/copyright:
+      - add the string "Copyright" as instructed by Lintian.
+      - update the copyright dates.
+  * debian/rules:
+      - BUGFIX: add the required "\" to the multi-line configure call.
+      - BUGFIX: remove space between "-Wl," and "--as-needed".
+      - replace dh_clean -k with dh_prep.
+      - add "-Wl,-z,defs".
+      - dynamically discover the version and major number.
+
+ -- Harshula Jayasuriya <[e-mail]>  Thu, 09 Apr 2009 22:03:37 +1000
+
+m17n-lib (1.5.2-1) unstable; urgency=low
+
+  * New upstream release 1.5.2.
+  * Update Standards-Version to Debian Policy 3.8.0. (No changes)
+  * Fixed upstream, removed: debian/patches/40_makefile_link_with_libs.dpatch.
+
+ -- Harshula Jayasuriya <[e-mail]>  Tue, 22 Jul 2008 00:32:53 +1000
+
+m17n-lib (1.5.1-1) unstable; urgency=low
+
+  * New upstream release 1.5.1. (Closes: #434041)
+  * debian/control: changed to Section: utils.
+  * debian/{copyright,rules}: updated.
+  * Updated to debhelper 7.
+  * Enable patch fix_loadable_modules_path.
+
+ -- Harshula Jayasuriya <[e-mail]>  Mon, 23 Jun 2008 23:02:47 +1000
+
+m17n-lib (1.3.4-2) unstable; urgency=high
+
+  * libm17n-dev Depends on libxml2-dev and libthai-dev. (Closes: #473957)
+
+ -- Harshula Jayasuriya <[e-mail]>  Fri, 04 Apr 2008 23:15:32 +1100
+
+m17n-lib (1.3.4-1) unstable; urgency=low
+
+  * New upstream release 1.3.4. (Closes: #376077)
+  * New Maintainer.
+  * Update Standards-Version to Debian Policy 3.7.3. (No changes)
+  * Update debian/{compat,control,copyright,rules}.
+  * Add debian/{docs,watch}.
+  * Remove debian/libm17n-0.dirs.
+  * Disable patches fix_no_family, fix_loadable_modules_path.
+  * Add patch debian/patches/40_makefile_link_with_libs.dpatch.
+
+ -- Harshula Jayasuriya <[e-mail]>  Mon, 10 Mar 2008 00:21:19 +1100
+
+m17n-lib (1.3.1-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Hardlink dlopen to use .so.0-files - not too nice, but works for now, and
+    reduces severity of bug #325528 to "only" important. Closes: #325528
+
+ -- Andreas Barth <[e-mail]>  Fri,  1 Dec 2006 14:15:15 +0000
+
+m17n-lib (1.3.1-1) unstable; urgency=low
+
+  * New upstream release.
+  * Previous NMU acknowledged (Closes: #348806, #325528, #347002).
+  * Changed to make use of dpatch.
+  * Added a new package for debugging; libm17n-0-dbg.
+  * Moved libmimx* to /usr/lib/m17n-lib subdirectory.
+
+ -- Hidetaka Iwai <[e-mail]>  Mon, 13 Feb 2006 23:03:40 +0900
+
+m17n-lib (1.2.0-5.1) unstable; urgency=low
+
+  * Non-Maintainer Upload.
+  * Handle fonts with no "family"; patch from Brendan O'Dea.
+    (Closes: #325528)
+  * Replace xlibs-dev build-dependency with explicit build-dependencies on
+    the required libraries. (Closes: #347002)
+
+ -- Steinar H. Gunderson <[e-mail]>  Thu, 19 Jan 2006 02:09:17 +0100
+
+m17n-lib (1.2.0-5) unstable; urgency=high
+
+  * debian/control: Added build-dependencies on libgd2-xpm-dev.  This
+  change will not affect the ABI compatibility  (closes: #325520).
+  * Adapted to debian policy 3.6.2.
+
+ -- Hidetaka Iwai <[e-mail]>  Tue, 30 Aug 2005 03:56:10 +0900
+
+m17n-lib (1.2.0-4) unstable; urgency=high
+
+  * Applied tha patch which fixes FTBFS on Hurd due to PATH_MAX.  
+  Thank to Michael Banck <[e-mail]> (closes: #314528).
+
+ -- Hidetaka Iwai <[e-mail]>  Sat, 25 Jun 2005 00:39:02 +0900
+
+m17n-lib (1.2.0-3) unstable; urgency=low
+
+  * debian/control: Added build-dependencies on libfontconfig1-dev.  This
+  change will not affect the ABI compatibility.
+
+ -- Hidetaka Iwai <[e-mail]>  Mon, 13 Jun 2005 03:44:41 +0900
+
+m17n-lib (1.2.0-2) unstable; urgency=low
+
+  * debian/rules, debian/libm17n-dev.install: Fixed to install
+  /usr/lib/pkgconfig/* (closes: #298409).
+
+ -- Hidetaka Iwai <[e-mail]>  Sun,  3 Apr 2005 07:23:50 +0900
+
+m17n-lib (1.2.0-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Hidetaka Iwai <[e-mail]>  Tue, 28 Dec 2004 21:22:48 +0900
+
+m17n-lib (1.1.0+0.0.cvs20041208-1) unstable; urgency=low
+
+  * CVS update(trunk)
+  * Upstream fixed the problem with multiple M17N_FINI calling and now 
+  gtk programs terminate correclty even with both scim-m17n and scim-uim.
+  (closes: #283126)
+  * debian/control: Add dependency on libxml2-dev (closes: #284405)
+
+ -- Hidetaka Iwai <[e-mail]>  Wed,  8 Dec 2004 20:51:55 +0900
+
+m17n-lib (1.1.0-3) unstable; urgency=low
+
+  * src/input.c: Applied the patch from Kenichi Handa <[e-mail]>
+  (for detail, please see
+  http://freedesktop.org/pipermail/scim/2004-October/001102.html)
+
+ -- Hidetaka Iwai <[e-mail]>  Sun, 29 Aug 2004 00:59:05 +0900
+
+m17n-lib (1.1.0-2) unstable; urgency=low
+
+  * debian/control: Add versioned dependency on libotf (closes: #268666)
+
+ -- Hidetaka Iwai <[e-mail]>  Sun, 29 Aug 2004 00:52:15 +0900
+
+m17n-lib (1.1.0-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Hidetaka Iwai <[e-mail]>  Thu, 26 Aug 2004 23:07:03 +0900
+
+m17n-lib (1.0.2-3) unstable; urgency=low
+
+  * debian/control: Add build dependency on xlibs-dev (closes: #250469).
+
+ -- Hidetaka Iwai <[e-mail]>  Sun, 23 May 2004 16:33:58 +0900
+
+m17n-lib (1.0.2-2) unstable; urgency=low
+
+  * debian/rules: defined DLOPEN_SHLIB_EXT explicitly to avoid
+    loading libmimx-*.so with no version (closes: #250297).
+
+ -- Hidetaka Iwai <[e-mail]>  Sun, 23 May 2004 03:23:32 +0900
+
+m17n-lib (1.0.2-1) unstable; urgency=low
+
+  * Initial Release.  Close wnpp bug (closes: #244373).
+
+ -- Hidetaka Iwai <[e-mail]>  Mon, 19 Apr 2004 20:46:54 +0900
+
+>>>>>>> MERGE-SOURCE

=== modified file 'debian/control'
--- debian/control	2010-01-10 20:58:16 +0000
+++ debian/control	2010-02-12 23:20:30 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 Source: m17n-lib
 Section: utils
 Priority: optional
@@ -104,3 +105,111 @@
  m17n is an abbreviation of Multilingualization.
  .
  This package contains the utilities which use m17n-lib.
+=======
+Source: m17n-lib
+Section: utils
+Priority: optional
+Maintainer: Ubuntu Core Developers <[e-mail]>
+XSBC-Original-Maintainer: Harshula Jayasuriya <[e-mail]>
+Build-Depends: debhelper (>= 7), autotools-dev, dpatch, libxt-dev, libx11-dev, libxaw7-dev, libxmu-dev, libfribidi-dev, libotf-dev (>= 0.9.4), libfreetype6-dev, libxft-dev, libxrender-dev, libfontconfig1-dev, libgd2-noxpm-dev, libxml2-dev, libanthy-dev, libthai-dev
+Standards-Version: 3.8.1
+Homepage: http://www.m17n.org/
+
+Package: libm17n-0
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Recommends: m17n-db, m17n-contrib
+Suggests: m17n-docs
+Description: a multilingual text processing library - runtime
+ The m17n library is a multilingual text processing library for the C
+ language.  This library has following features:
+  - The m17n library is an open source software.
+  - The m17n library for any Linux/Unix applications.
+  - The m17n library realizes multilingualization of many aspects of
+    applications.
+  - The m17n library represents multilingual text as an object named
+    M-text.  M-text is a string with attributes called text properties,
+    and designed to substitute for string in C.  Text properties carry any
+    information required to input, display and edit the text.
+  - The m17n library  supports functions to handle M-texts.
+ .
+ m17n is an abbreviation of Multilingualization.
+ .
+ This package contains the runtime part of m17n-lib.
+
+Package: libm17n-dev
+Section: libdevel
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, libm17n-0 (= ${binary:Version}), libxml2-dev, libthai-dev
+Suggests: m17n-docs
+Description: a multilingual text processing library - development
+ The m17n library is a multilingual text processing library for the C
+ language.  This library has following features:
+ .
+  - The m17n library is an open source software.
+  - The m17n library for any Linux/Unix applications.
+  - The m17n library realizes multilingualization of many aspects of
+    applications.
+  - The m17n library represents multilingual text as an object named
+    M-text.  M-text is a string with attributes called text properties,
+    and designed to substitute for string in C.  Text properties carry any
+    information required to input, display and edit the text.
+  - The m17n library  supports functions to handle M-texts.
+ .
+ m17n is an abbreviation of Multilingualization.
+ .
+ This package contains the header and development files needed to build
+ programs and packages using m17n-lib.
+
+Package: libm17n-0-dbg
+Section: debug
+Priority: extra
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, libm17n-0 (= ${binary:Version})
+Suggests: m17n-docs
+Description: a multilingual text processing library - debugging symbols
+ The m17n library is a multilingual text processing library for the C
+ language.  This library has following features:
+ .
+  - The m17n library is an open source software.
+  - The m17n library for any Linux/Unix applications.
+  - The m17n library realizes multilingualization of many aspects of
+    applications.
+  - The m17n library represents multilingual text as an object named
+    M-text.  M-text is a string with attributes called text properties,
+    and designed to substitute for string in C.  Text properties carry any
+    information required to input, display and edit the text.
+  - The m17n library  supports functions to handle M-texts.
+ .
+ m17n is an abbreviation of Multilingualization.
+ .
+ This package contains unstripped shared libraries. it is provided
+ primarily to provide a backtrace with names in a debugger, this makes
+ it somewhat easier to interpret core dumps.  The libraries are installed
+ in /usr/lib/debug and can be used by placing that directory in
+ LD_LIBRARY_PATH.
+ Most people will not need this package.
+
+Package: m17n-lib-bin
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, libm17n-0 (= ${binary:Version})
+Suggests: m17n-docs
+Description: a multilingual text processing library - utilities
+ The m17n library is a multilingual text processing library for the C
+ language.  This library has following features:
+ .
+  - The m17n library is an open source software.
+  - The m17n library for any Linux/Unix applications.
+  - The m17n library realizes multilingualization of many aspects of
+    applications.
+  - The m17n library represents multilingual text as an object named
+    M-text.  M-text is a string with attributes called text properties,
+    and designed to substitute for string in C.  Text properties carry any
+    information required to input, display and edit the text.
+  - The m17n library  supports functions to handle M-texts.
+ .
+ m17n is an abbreviation of Multilingualization.
+ .
+ This package contains the utilities which use m17n-lib.
+>>>>>>> MERGE-SOURCE

=== modified file 'debian/copyright'
--- debian/copyright	2010-01-10 20:58:16 +0000
+++ debian/copyright	2010-02-12 23:20:30 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 This package was debianized by Hidetaka Iwai <[e-mail]> on
 Sat, 10 Apr 2004 15:09:57 +0900.
 
@@ -47,3 +48,54 @@
 
 The complete text of the GNU Lesser General Public License can be found in
 `/usr/share/common-licenses/LGPL-2.1'.
+=======
+This package was debianized by Hidetaka Iwai <[e-mail]> on
+Sat, 10 Apr 2004 15:09:57 +0900.
+
+The current Debian maintainer is Harshula Jayasuriya <[e-mail]>.
+
+It was downloaded from:
+http://www.m17n.org/m17n-lib-download/m17n-lib-1.5.4.tar.gz
+
+Home Page:
+
+    http://www.m17n.org/
+
+Upstream Authors:
+
+    Kenichi Handa <[e-mail]>
+    Mikiko Nishikimi <[e-mail]>
+    Naoto Takahashi <[e-mail]>
+    Satoru Tomura <[e-mail]>
+
+Copyright:
+
+    Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009
+      National Institute of Advanced Industrial Science and Technology (AIST)
+      Registration Number H15PRO112
+
+License:
+
+    The m17n library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public License
+    as published by the Free Software Foundation; either version 2.1 of
+    the License, or (at your option) any later version.
+
+    The m17n library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with the m17n library; if not, write to the Free
+    Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+    Boston, MA 02110-1301, USA.
+
+
+The Debian packaging is Copyright (C) 2008-2009, Harshula Jayasuriya
+<[e-mail]> and is licensed under the GPL,
+see `/usr/share/common-licenses/GPL'.
+
+The complete text of the GNU Lesser General Public License can be found in
+`/usr/share/common-licenses/LGPL'.
+>>>>>>> MERGE-SOURCE