Import Debian changes 10.99.33-1

libkmfl (10.99.33-1) unstable; urgency=medium

  * Change license to MIT as libkmfl is being moved into Keyman 11
  * Keyman is now owned by SIL
  * New upstream pre-release
  * d/control standards 4.2.1, no changes
  * d/compat 11
  * I am now the maintainer as I am the one working
      on Keyman for Linux upstream
  * change from cdbs to dh

9 files changed, 46 insertions, 38 deletions

diff --git a/debian/changelog b/debian/changelog
index 86219e9..808c5b2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+libkmfl (10.99.33-1) unstable; urgency=medium
+
+  * Change license to MIT as libkmfl is being moved into Keyman 11
+  * Keyman is now owned by SIL
+  * New upstream pre-release
+  * d/control standards 4.2.1, no changes
+  * d/compat 11
+  * I am now the maintainer as I am the one working
+      on Keyman for Linux upstream
+  * change from cdbs to dh
+
+ -- Daniel Glassey <wdg@debian.org>  Mon, 22 Oct 2018 10:18:16 +0700
+
 libkmfl (0.9.12-1) unstable; urgency=low
 
   * fix debug messages
diff --git a/debian/compat b/debian/compat
index ec63514..b4de394 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-9
+11
diff --git a/debian/control b/debian/control
index 2240aa4..893fc74 100644
--- a/debian/control
+++ b/debian/control
@@ -1,10 +1,10 @@
 Source: libkmfl
 Priority: optional
 Section: libs
-Maintainer: Doug Rintoul <doug_rintoul@sil.org>
-Homepage: http://kmfl.sourceforge.net/
-Build-Depends: cdbs (>= 0.4.27), debhelper (>= 9), dh-autoreconf, libkmflcomp-dev
-Standards-Version: 3.9.8.0
+Maintainer: Daniel Glassey <wdg@debian.org>
+Homepage: http://www.keyman.com/
+Build-Depends: debhelper (>= 11), libkmflcomp-dev (>=10.99.30)
+Standards-Version: 4.2.1
 
 Package: libkmfl-dev
 Section: libdevel
diff --git a/debian/copyright b/debian/copyright
index bfa97c3..7576383 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,23 +3,25 @@ Upstream-Name: libkmfl
 Upstream-Contact: Doug Rintoul <doug_rintoul@sil.org>
 
 Files: *
-Copyright: Copyright (C) 2005 SIL International and Tavultesoft Pty Ltd
-License: GPL-2+
+Copyright: Copyright (C) 2005-2018 SIL International
+License: MIT
 
-License: GPL-2+
- The KMFL library 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.
+License: MIT
+ Permission is hereby granted, free of charge, to any person obtaining
+ a copy of this software and associated documentation files (the
+ "Software"), to deal in the Software without restriction, including
+ without limitation the rights to use, copy, modify, merge, publish,
+ distribute, sublicense, and/or sell copies of the Software, and to
+ permit persons to whom the Software is furnished to do so, subject to
+ the following conditions:
  .
- The KMFL 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
- General Public License for more details.
+ The above copyright notice and this permission notice shall be
+ included in all copies or substantial portions of the Software.
  .
- You should have received a copy of the GNU General Public
- License along with the KMFL library; 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".
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/debian/libkmfl-dev.install b/debian/libkmfl-dev.install
index f882277..1bb6265 100644
--- a/debian/libkmfl-dev.install
+++ b/debian/libkmfl-dev.install
@@ -1,4 +1,3 @@
 usr/include/*
-usr/lib/lib*.a
-usr/lib/lib*.so
-usr/lib/*.la
+/usr/lib/*/lib*.a
+/usr/lib/*/lib*.so
diff --git a/debian/libkmfl0.install b/debian/libkmfl0.install
index d0dbfd1..d6a64d3 100644
--- a/debian/libkmfl0.install
+++ b/debian/libkmfl0.install
@@ -1 +1 @@
-usr/lib/lib*.so.*
+/usr/lib/*/lib*.so.*
diff --git a/debian/libkmfl0.symbols b/debian/libkmfl0.symbols
index 11f644f..335307d 100644
--- a/debian/libkmfl0.symbols
+++ b/debian/libkmfl0.symbols
@@ -1,4 +1,5 @@
 libkmfl.so.0 libkmfl0 #MINVER#
+* Build-Depends-Package: libkmfl-dev 
  DBGMSG@Base 0.9.12
  ERRMSG@Base 0.9.12
  add_to_history@Base 0.9.12
diff --git a/debian/rules b/debian/rules
index 2e9d43e..b3e5de1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,14 +1,7 @@
 #!/usr/bin/make -f
 # -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2005 Doug Rintoul <doug_rintoul@sil.org>
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/autotools.mk
-include /usr/share/cdbs/1/rules/autoreconf.mk
-
-DEB_SHLIBDEPS_INCLUDE := debian/libkmfl0/usr/lib/
-DEB_DH_INSTALL_SOURCEDIR := debian/tmp
-
-install/libkmfl-dev::
-	sed -i "/dependency_libs/ s/'.*'/''/" `find debian/ -name '*.la'`
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
+%:
+	dh $@ --with autoreconf
diff --git a/debian/watch b/debian/watch
index 27e0207..b211f2d 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,2 @@
-version=3
-http://sf.net/kmfl/libkmfl-(.+)\.tar\.gz debian uupdate
+version=4
+https://downloads.keyman.com/linux/alpha/([\.\d]+)/libkmfl-(.+)\.tar\.gz debian uupdate