Merge lp:~ubuntu-branches/ubuntu/precise/libdatrie/precise-201201030357 into lp:ubuntu/precise/libdatrie

[Ubuntu Package Importer]

The package importer has detected a possible inconsistency between the package history in the archive and the history in bzr. As the archive is authoritative the importer has made lp:ubuntu/precise/libdatrie reflect what is in the archive and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/precise/libdatrie/precise-201201030357. This merge proposal was created so that an Ubuntu developer can review the situations and perform a merge/upload if necessary. There are three typical cases where this can happen.
  1. Where someone pushes a change to bzr and someone else uploads the package without that change. This is the reason that this check is done by the importer. If this appears to be the case then a merge/upload should be done if the changes that were in bzr are still desirable.
  2. The importer incorrectly detected the above situation when someone made a change in bzr and then uploaded it.
  3. The importer incorrectly detected the above situation when someone just uploaded a package and didn't touch bzr.

If this case doesn't appear to be the first situation then set the status of the merge proposal to "Rejected" and help avoid the problem in future by filing a bug at https://bugs.launchpad.net/udd linking to this merge proposal.

(this is an automatically generated message)

Unmerged revisions

12. By Theppitak Karoonboonyanan <email address hidden> on 2011-11-17

* debian/copyright:
  - Use non-forwarding format URL. Bump to revision 202.
  - Upstream license is actually LGPL-2.1, not 2.0.
  - Add extended text for LGPL-2.1 and GPL-2.
* debian/rules:
  - Add back upstream 'make distclean' that was lost in 0.2.4-3, so it
    builds twice in a row again.

11. By Theppitak Karoonboonyanan <email address hidden> on 2011-11-04

* New upstream release.
* Use hardening build flags:
  - B-Dep on dpkg-dev (>= 0.16.1~) for dpkg-buildflags
  - Obtain build flags from dpkg-buildflags
  - Drop old CFLAGS & LDFLAGS, as now overridden by dpkg-buildflags

=== modified file 'debian/changelog'
--- debian/changelog	2011-12-22 13:03:09 +0000
+++ debian/changelog	2012-01-03 04:02:26 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 libdatrie (0.2.5-3) unstable; urgency=low
 
   * Set Vcs-Git and Vcs-Browser to alioth
@@ -268,3 +269,267 @@
 
  -- Theppitak Karoonboonyanan <[e-mail]>  Thu, 12 Oct 2006 15:27:50 +0700
 
+=======
+libdatrie (0.2.5-2) unstable; urgency=low
+
+  * debian/copyright:
+    - Use non-forwarding format URL. Bump to revision 202.
+    - Upstream license is actually LGPL-2.1, not 2.0.
+    - Add extended text for LGPL-2.1 and GPL-2.
+  * debian/rules:
+    - Add back upstream 'make distclean' that was lost in 0.2.4-3, so it
+      builds twice in a row again.
+
+ -- Theppitak Karoonboonyanan <[e-mail]>  Thu, 17 Nov 2011 15:44:58 +0700
+
+libdatrie (0.2.5-1) unstable; urgency=low
+
+  * New upstream release.
+  * Use hardening build flags:
+    - B-Dep on dpkg-dev (>= 0.16.1~) for dpkg-buildflags
+    - Obtain build flags from dpkg-buildflags
+    - Drop old CFLAGS & LDFLAGS, as now overridden by dpkg-buildflags
+
+ -- Theppitak Karoonboonyanan <[e-mail]>  Fri, 04 Nov 2011 16:03:41 +0700
+
+libdatrie (0.2.4-3) unstable; urgency=low
+
+  * Merge Ubuntu changes (build for multiarch)
+    - Build-dep on debhelper (>= 8.1.3)
+    - Add "Pre-Depends: ${misc:Pre-Depends}" for libdatrie1
+    - Add DEB_HOST_MULTIARCH and pass it to --libdir as a subdir
+      under /usr/lib in configure
+    - Replace /usr/lib/ with /usr/lib/*/ in {libdatrie1,libdatrie-dev}.install
+    - Add "Multi-Arch: same" for libdatrie1
+  * Use dh-autoreconf instead of direct autoreconf call and manual cleanups
+    - Build-dep on dh-autoreconf
+    - Call dh_autoreconf on configure and dh_autoreconf_clean on clean
+  * Bump Standards-Version to 3.9.2 (no changes needed)
+
+ -- Theppitak Karoonboonyanan <[e-mail]>  Sun, 19 Jun 2011 22:11:10 +0700
+
+libdatrie (0.2.4-2ubuntu1) oneiric; urgency=low
+
+  * Build for multiarch.
+
+ -- Steve Langasek <[e-mail]>  Sat, 26 Mar 2011 00:56:37 -0700
+
+libdatrie (0.2.4-2) unstable; urgency=low
+
+  * debian/copyright:
+    - Updated to DEP-5 rev 173.
+    - Update copyright year for debian/*.
+  * debian/rules:
+    - Drop unnecessary --infodir configure option.
+    - Use short options -i/-a instead of --indep/--arch for dh_ commands.
+  * Mark libdatrie-doc as "Multi-Arch: foreign" in preparation for multi-arch
+    environment to come. This will satisfy Recommends from libdatrie-dev.
+  * Bump Standards-Version to 3.9.1 (no changes needed)
+
+ -- Theppitak Karoonboonyanan <[e-mail]>  Sun, 13 Mar 2011 21:32:47 +0700
+
+libdatrie (0.2.4-1) unstable; urgency=low
+
+  * New upstream release
+    - debian/libdatrie1.symbols: Add new symbols according to upstream.
+  * Bump Standards-Version to 3.9.0 (no changes needed)
+
+ -- Theppitak Karoonboonyanan <[e-mail]>  Wed, 30 Jun 2010 16:40:33 +0700
+
+libdatrie (0.2.3-1) unstable; urgency=low
+
+  * New upstream release.
+  * Bump Standards-Version to 3.8.4 (no changes needed)
+
+ -- Theppitak Karoonboonyanan <[e-mail]>  Sat, 27 Feb 2010 21:09:46 +0700
+
+libdatrie (0.2.2-3) unstable; urgency=low
+
+  * debian/rules: Fix failure to build twice in a row (Closes: #564815):
+    - Fix typo '$(MAKE) maintainerclan'
+    - Clean other changed files left over from 'make maintainer-clean'
+    - 'config.status' depends on 'configure.ac' instead of 'configure'
+    - Don't fail if m4/ already exists
+  * Add missing ${misc:Depends} [lintian].
+
+ -- Theppitak Karoonboonyanan <[e-mail]>  Wed, 13 Jan 2010 20:48:24 +0700
+
+libdatrie (0.2.2-2) unstable; urgency=low
+
+  * debian/control:
+    - Update my e-mail address to @debian.org.
+    - Drop DM-Upload-Allowed.
+  * debian/copyright:
+    - Update my e-mail address for debian/* to @debian.org.
+  * debian/rules:
+    - Run autoreconf instead of just updating config.{sub,guess}, as required
+      by libtool
+    - Run 'make maintainerclean' instead of 'make distclean' on clean target,
+      to clear all autoconf-generated files
+  * debian/control:
+    - Build-Depends on libtool, automake, autoconf, for autoreconf.
+    - Drop Build-Depends on autotools-dev
+  * Switch to "3.0 (quilt)" source format.
+  * Bump Standards-Version to 3.8.3 (no changes needed)
+
+ -- Theppitak Karoonboonyanan <[e-mail]>  Mon, 07 Dec 2009 12:40:05 +0700
+
+libdatrie (0.2.2-1) unstable; urgency=low
+
+  * Use complete sentences in libdatrie1 long description. (Closes: #525806)
+  * New upstream release, fixing builds on non-GNU systems.
+  * Remove duplicated field "section" for libdatrie1 [lintian].
+
+ -- Theppitak Karoonboonyanan <[e-mail]>  Wed, 29 Apr 2009 15:24:31 +0700
+
+libdatrie (0.2.1-2) unstable; urgency=low
+
+  * Drop versioned b-dep on dpkg-dev, as Vcs-Cvs: is no more needed.
+  * Upload to unstable.
+
+ -- Theppitak Karoonboonyanan <[e-mail]>  Sun, 12 Apr 2009 10:02:04 +0700
+
+libdatrie (0.2.1-1) experimental; urgency=low
+
+  * Fix broken Vcs-Browser field.
+  * New upstream release, with symbols versioning added
+    - debian/libdatrie0.symbols: Update symbols tags to "DATRIE_0.2" as per
+      upstream. This is not considered ABI breakage, as unversioned calls are
+      still resolved to the same symbols as versioned ones.
+
+ -- Theppitak Karoonboonyanan <[e-mail]>  Sun, 05 Apr 2009 14:42:01 +0700
+
+libdatrie (0.2.0-1) experimental; urgency=low
+
+  * VCS moved from CVS to SVN; update Vcs-* fields accordingly.
+  * New upstream version, with ABI breakage
+    - Rename binary packages according to SONAME change, to allow run-time
+      coexistence with old version: libdatrie1, libdatrie1-bin
+    - Rename libdatrie0-dev to libdatrie-dev, and conflicts with
+      libdatrie0-dev, as both versions share the same headers location;
+      this should be the package naming scheme from now on
+    - Ditto to libdatrie-doc
+  * Shared lib updates:
+    - debian/rules:
+      + Bump shlib dep to 0.2.0, and shlib package is now libdatrie1
+    - debian/libdatrie1.symbols:
+      + Update symbols, setting minver to 0.2.0 for all symbols
+  * Bump debhelper compat to level 7
+    - Bump debian/compat to 7
+    - Build-dep on debhelper (>= 7)
+    - debian/rules:
+      + Replace obsoleted 'dh_clean -k' with 'dh_prep'
+      + Remove *-stamp clean-ups in clean target, as dh_clean now does it
+  * debian/libdatrie-doc.docs:
+    - Install README.migration provided by upstream
+  * debian/copyright:
+    - Update format to proposal rev 454
+  * Bump Standards-Version to 3.8.1 (no changes needed)
+
+ -- Theppitak Karoonboonyanan <[e-mail]>  Wed, 25 Mar 2009 14:43:36 +0700
+
+libdatrie (0.1.3-2) unstable; urgency=low
+
+  * Add Build-Depends-Package info to libdatrie0.symbols and bump dpkg-dev
+    Build-deps to (>= 1.14.13) accordingly. Thanks Loïc Minier.
+  * Fix CVSROOT in Vcs-Cvs, so it really works with debcheckout.
+  * debian/libdatrie0-doc.doc-base: Correct doc-base section (Programming).
+  * debian/rules:
+    - Update config.{guess,status} before configure, and clean them up on
+      clean target, so the changes are not included in .diff.gz
+    - Use 'make -C $dir' instead of 'cd $dir; make'
+    - Do not build/install doc on binary-arch
+  * debian/copyright:
+    - Remove inline license file referals, and use usual Debian text at the
+      bottom instead
+    - Update format to current proposal
+  * debian/watch: Fix watch pattern so that only *.tar.gz is matched, not
+    *.tar.gz.md5sum.
+  * Use short description for libdatrie0, and add that it's usually
+    auto-installed.
+  * debian/control:
+    - Add DM-Upload-Allowed
+    - Bump Standards-Versions to 3.8.0 (no changes needed)
+
+ -- Theppitak Karoonboonyanan <[e-mail]>  Sat, 21 Jun 2008 11:39:32 +0700
+
+libdatrie (0.1.3-1) unstable; urgency=low
+
+  * New upstream release
+    - Fix memory bug which can crash on some platforms, reportedly win32.
+    - Fix symbols exporting, so it builds on Mac.
+    - Remove excessive documentation for private API's.
+    - Add the SBM file format documentation frequently asked for
+  * debian/copyright: Rewrite in machine-interpretable format.
+  * Remove XS- prefix from XS-Vcs-* fields.
+  * Move Homepage info from description to control field.
+  * Bump Standards-Version to 3.7.3, no changes needed.
+  * debian/libdatrie0.symbols: Add symbols file to provide fine-grained
+    shlib dependency tracking.
+  * debian/control: Build-depend on debhelper (>= 5.0.61) and dpkg-dev (>=
+    1.14.9) for the required dh_makeshlibs version.
+  * debian/libdatrie0-doc.doc-base: Remove excessive whitespace. (lintian)
+
+ -- Theppitak Karoonboonyanan <[e-mail]>  Mon, 28 Jan 2008 17:19:12 +0700
+
+libdatrie (0.1.2-2) unstable; urgency=low
+
+  * Do not install functions man pages for now, to avoid messing man
+    directories with plenty of doxygen-generated pages, and to avoid conflicts
+    with other packages.
+
+ -- Theppitak Karoonboonyanan <[e-mail]>  Sat, 25 Aug 2007 17:11:23 +0700
+
+libdatrie (0.1.2-1) unstable; urgency=low
+
+  * debian/libdatrie-bin.manpages:
+    - Install man pages from built directory, rather than from source.
+  * debian/libdatrie0-dev.manpages:
+    - Added to install doxygen-generated API man pages.
+  * New upstream release
+    - Limited symbols export, to avoid name clashing
+    - Improved error handling for edge cases
+    - Fix crashes
+  * Set shlibs to >= 0.1.2.
+  * Add XS-Vcs-Cvs and XS-Vcs-Browser info.
+  * Do not ignore 'make clean' error.
+
+ -- Theppitak Karoonboonyanan <[e-mail]>  Sat, 25 Aug 2007 14:56:20 +0700
+
+libdatrie (0.1.1-4) unstable; urgency=low
+
+  * debian/rules: Revert manual calls to doxygen and rely on configure
+    auto-detection. Doxygen shouldn't be found in arch buildd's now, as we had
+    moved it to Build-Depends-Indep. Thanks to Loïc Minier for suggestion.
+
+ -- Theppitak Karoonboonyanan <[e-mail]>  Mon, 11 Dec 2006 09:51:26 +0700
+
+libdatrie (0.1.1-3) unstable; urgency=low
+
+  * Package sponsored by Loïc Minier.
+  * Split arch and indep builds completely
+    - debian/control: move doxygen to Build-Depends-Indep.
+    - debian/rules: disable doxygen and manually call it on indep targets.
+  * debian/rules adjustments
+    - Remove unused shared library version info assignment.
+    - Pass --host=$(DEB_HOST_GNU_TYPE) to configure only when cross compiling.
+    - Add missing targets in .PHONY
+  * debian/*.dirs: Removed, not needed for debhelper compat level 5.
+  * debian/copyright: Change the download place to match that in watch file.
+
+ -- Theppitak Karoonboonyanan <[e-mail]>  Sun, 10 Dec 2006 17:02:24 +0700
+
+libdatrie (0.1.1-2) unstable; urgency=low
+
+  * Split binary program to libdatrie-bin.
+  * Rename libdatrie-{dev,doc} to libdatrie0-{dev,doc}.
+
+ -- Theppitak Karoonboonyanan <[e-mail]>  Wed, 18 Oct 2006 00:17:08 +0700
+
+libdatrie (0.1.1-1) unstable; urgency=low
+
+  * Initial release (Closes: #392315)
+
+ -- Theppitak Karoonboonyanan <[e-mail]>  Thu, 12 Oct 2006 15:27:50 +0700
+
+>>>>>>> MERGE-SOURCE

=== modified file 'debian/control'
--- debian/control	2011-12-22 13:03:09 +0000
+++ debian/control	2012-01-03 04:02:26 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 Source: libdatrie
 Priority: optional
 Maintainer: Theppitak Karoonboonyanan <[e-mail]>
@@ -74,3 +75,81 @@
  found at http://linux.thai.net/~thep/datrie/datrie.html
  .
  This package contains some documents about the datrie library.
+=======
+Source: libdatrie
+Priority: optional
+Maintainer: Theppitak Karoonboonyanan <[e-mail]>
+Build-Depends: dpkg-dev (>= 1.16.1~), debhelper (>= 8.1.3), dh-autoreconf
+Build-Depends-Indep: doxygen
+Standards-Version: 3.9.2
+Section: libs
+Vcs-Svn: http://linux.thai.net/svn/software/datrie
+Vcs-Browser: http://linux.thai.net/websvn/wsvn/software.datrie/?sc=0
+Homepage: http://libthai.sourceforge.net/
+
+Package: libdatrie-dev
+Section: libdevel
+Architecture: any
+Depends: libdatrie1 (= ${binary:Version}), ${misc:Depends}
+Suggests: libdatrie-doc (= ${source:Version})
+Conflicts: libdatrie0-dev
+Description: Development files for double-array trie library
+ Trie is a kind of digital search tree, an efficient indexing method with
+ O(1) time complexity for searching. Comparably as efficient as hashing,
+ trie also provides flexibility on incremental matching and key spelling
+ manipulation. This makes it ideal for lexical analyzers, as well as
+ spelling dictionaries.
+ .
+ This library is an implementation of double-array structure for representing 
+ trie, as proposed by Junichi Aoe. The details of the implementation can be 
+ found at http://linux.thai.net/~thep/datrie/datrie.html
+ .
+ This package contains the development libraries, header files and manpages
+ you need to develop your programs using the datrie library.
+
+Package: libdatrie1-bin
+Section: misc
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: Programs for double-array trie library
+ Trie is a kind of digital search tree, an efficient indexing method with
+ O(1) time complexity for searching. Comparably as efficient as hashing,
+ trie also provides flexibility on incremental matching and key spelling
+ manipulation. This makes it ideal for lexical analyzers, as well as
+ spelling dictionaries.
+ .
+ This library is an implementation of double-array structure for representing 
+ trie, as proposed by Junichi Aoe. The details of the implementation can be 
+ found at http://linux.thai.net/~thep/datrie/datrie.html
+ .
+ This package contains the program files which is used with the library,
+ including trietool, the trie manipulation tool.
+
+Package: libdatrie1
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
+Description: Double-array trie library
+ This package provides shared libraries needed to run programs that use the
+ datrie library. It is usually automatically installed.
+
+Package: libdatrie-doc
+Section: doc
+Architecture: all
+Multi-Arch: foreign
+Depends: lynx | www-browser, ${misc:Depends}
+Conflicts: libdatrie0-doc
+Description: Documentation files for double-array trie library
+ Trie is a kind of digital search tree, an efficient indexing method with
+ O(1) time complexity for searching. Comparably as efficient as hashing,
+ trie also provides flexibility on incremental matching and key spelling
+ manipulation. This makes it ideal for lexical analyzers, as well as
+ spelling dictionaries.
+ .
+ This library is an implementation of double-array structure for representing 
+ trie, as proposed by Junichi Aoe. The details of the implementation can be 
+ found at http://linux.thai.net/~thep/datrie/datrie.html
+ .
+ This package contains some documents about the datrie library.
+>>>>>>> MERGE-SOURCE

=== modified file 'debian/copyright'
--- debian/copyright	2011-12-22 13:03:09 +0000
+++ debian/copyright	2012-01-03 04:02:26 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 Format: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?view=co&revision=202
 Upstream-Name: libdatrie
 Upstream-Contact: Theppitak Karoonboonyanan <[e-mail]>
@@ -42,3 +43,50 @@
  .
  On Debian systems, the complete text of the GNU General Public License
  version 2 can be found in `/usr/share/common-licenses/GPL-2'.
+=======
+Format: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?view=co&revision=202
+Upstream-Name: libdatrie
+Upstream-Contact: Theppitak Karoonboonyanan <[e-mail]>
+Source: ftp://linux.thai.net/pub/thailinux/software/libthai/
+
+Files: *
+Copyright: 2006-2009 Theppitak Karoonboonyanan <[e-mail]>
+License: LGPL-2.1+
+ This 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.
+ .
+ This 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 this library; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ .
+ On Debian systems, the complete text of the GNU Lesser General Public
+ License version 2.1 can be found in `/usr/share/common-licenses/LGPL-2.1'.
+
+Files: debian/*
+Copyright: 2006-2011 Theppitak Karoonboonyanan <[e-mail]> 
+License: GPL-2+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+ .
+ This program 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 General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License along
+ with this program; if not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ .
+ On Debian systems, the complete text of the GNU General Public License
+ version 2 can be found in `/usr/share/common-licenses/GPL-2'.
+
+>>>>>>> MERGE-SOURCE