[liblangtag] 03/04: Merge branch 'master' into experimental

[Rene Engelhard]

This is an automated email from the git hooks/post-receive script.

rene pushed a commit to branch experimental
in repository liblangtag.

commit 51c755a1abfad020593e06bd64e71829844a2d3d
Merge: d61d6b9 c91f1de
Author: Rene Engelhard <rene at rene-engelhard.de>
Date:   Tue Sep 27 01:30:23 2016 +0200

    Merge branch 'master' into experimental
    
    Conflicts:
    	debian/changelog
    	debian/control

 debian/changelog                      |  6 +++++
 debian/control                        |  2 +-
 debian/patches/LT_POINTER_TO_INT.diff | 51 +++++++++++++++++++++++++++++++++++
 debian/patches/series                 |  1 +
 4 files changed, 59 insertions(+), 1 deletion(-)

diff --cc debian/changelog
index c550464,8d75127..5df764b
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,19 -1,15 +1,25 @@@
 -liblangtag (0.5.8-4) unstable; urgency=medium
++liblangtag (0.6.1-2) experimental; urgency=medium
+ 
+   * [ee47a27] add missing libxml2-dev Depends: to liblangtag-devs Depends
+ 
+  -- Rene Engelhard <rene at debian.org>  Tue, 27 Sep 2016 01:27:12 +0200
+ 
 -liblangtag (0.5.8-3) unstable; urgency=medium
 +liblangtag (0.6.1-1) experimental; urgency=medium
  
 -  * [c98af14] apply patch to remove LT_POINTER_TO_INT usage and makes
 -    lt-config.h not arch-dep, thanks Jakub Wilk (closes: #837755)
 +  * [4d13221] Imported Upstream version 0.6.1
 +    - removes LT_POINTER_TO_INT usage and makes lt-config.h not arch-dep
 +      (closes: #837755)
  
 - -- Rene Engelhard <rene at debian.org>  Wed, 21 Sep 2016 21:30:54 +0200
 + -- Rene Engelhard <rene at debian.org>  Wed, 21 Sep 2016 21:45:19 +0200
 +
 +liblangtag (0.6.0-1) experimental; urgency=medium
 +
 +  * [4ff5dfa] New upstream version 0.6.0
 +    - removes deprecated GNOME_COMMON_INIT macro (closes: #829954)
 +  * [2eedb29] LangTag-0.5.gir -> LangTag-0.6.gir
 +  * [711a0cb] update .symbols
 +
 + -- Rene Engelhard <rene at debian.org>  Tue, 13 Sep 2016 19:39:59 +0200
  
  liblangtag (0.5.8-2) unstable; urgency=medium
  
diff --cc debian/control
index cf7e696,ad45960..63f52a5
--- a/debian/control
+++ b/debian/control
@@@ -15,7 -15,7 +15,7 @@@ Package: liblangtag-de
  Section: libdevel
  Architecture: any
  Multi-arch: same
- Depends: liblangtag1 (= ${binary:Version}), liblangtag-gobject0 (= ${binary:Version}), libglib2.0-dev, gir1.2-langtag-0.6 (= ${binary:Version}), ${misc:Depends}
 -Depends: liblangtag1 (= ${binary:Version}), liblangtag-gobject0 (= ${binary:Version}), libglib2.0-dev, libxml2-dev, gir1.2-langtag-0.5 (= ${binary:Version}), ${misc:Depends}
++Depends: liblangtag1 (= ${binary:Version}), liblangtag-gobject0 (= ${binary:Version}), libglib2.0-dev, libxml2-dev, gir1.2-langtag-0.6 (= ${binary:Version}), ${misc:Depends}
  Suggests: liblangtag-doc
  Description: library to access tags for identifying languages -- development
   liblangtag is an interface library to access/deal with tags for

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/liblangtag.git