New upstream release.

* New upstream release.
  - All patches merged upstream.

4 files changed, 7 insertions, 114 deletions

diff --git a/debian/changelog b/debian/changelog
index bfba956..3b867a6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+gammu (1.39.0-1) UNRELEASED; urgency=medium
+
+  * New upstream release.
+    - All patches merged upstream.
+
+ -- Michal Čihař <nijel@debian.org>  Fri, 05 Jan 2018 11:21:05 +0100
+
 gammu (1.38.5-1) unstable; urgency=medium
 
   * New upstream release.
diff --git a/debian/patches/Avoid-invoking-Sphinx-though-Python.patch b/debian/patches/Avoid-invoking-Sphinx-though-Python.patch
deleted file mode 100644
index 255fb9c..0000000
--- a/debian/patches/Avoid-invoking-Sphinx-though-Python.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-From 060a41f0a6c9bd8c616fe7fe162cdaaae3e58193 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <michal@cihar.com>
-Date: Wed, 18 Oct 2017 10:44:59 +0200
-Subject: [PATCH 1/1] Avoid invoking Sphinx though Python
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-It might be different version Sphinx is using...
-
-Signed-off-by: Michal Čihař <michal@cihar.com>
----
- CMakeLists.txt             | 3 ---
- configure                  | 7 +------
- docs/manual/CMakeLists.txt | 2 +-
- 3 files changed, 2 insertions(+), 10 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 7c924bd18..4e934d68e 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -179,9 +179,6 @@ endif()
- 
- find_package (Threads)
- 
--# Check for Python
--find_package(PythonInterp 2)
--
- # Packages in sources
- macro_optional_find_package (MySQL)
- macro_optional_find_package (ODBC)
-diff --git a/configure b/configure
-index 8aa553d14..4f51ca76d 100755
---- a/configure
-+++ b/configure
-@@ -33,7 +33,6 @@ Usage: ./configure [options]
- --enable-backup     enable backup support
- --enable-win32      enable mingw crosscomilation
- --enable-protection enable compile time protections
----with-python=<path> path to Python interpreter
- --without-gnapplet  disable installation of gnapplet
- --without-completion disable installation of bash completion script
- 
-@@ -56,7 +55,6 @@ CMAKE_DEBUG=
- CMAKE_BACKUP=
- CMAKE_CROSS=
- CMAKE_PROTECTION=
--CMAKE_PYTHON=
- CMAKE_GNAP=
- CMAKE_COMPLETE=
- 
-@@ -69,9 +67,6 @@ while [ "$#" -gt 0 ] ; do
-         --prefix=*)
-             CMAKE_PREFIX="-DCMAKE_INSTALL_PREFIX=${1##--prefix=}"
-             ;;
--        --with-python=*)
--            CMAKE_PYTHON="-DBUILD_PYTHON=${1##--with-python=}"
--            ;;
-         --enable-backup)
-             CMAKE_BACKUP="-DWITH_BACKUP=ON"
-             ;;
-@@ -144,4 +139,4 @@ fi
- cd "$BUILD_DIR"
- 
- # invoke cmake to do configuration
--cmake $SOURCE_DIR $CMAKE_PREFIX $CMAKE_SHARED $CMAKE_DEBUG $CMAKE_BACKUP $CMAKE_CROSS $CMAKE_PROTECTION $CMAKE_PYTHON $CMAKE_GNAP $CMAKE_COMPLETE
-+cmake $SOURCE_DIR $CMAKE_PREFIX $CMAKE_SHARED $CMAKE_DEBUG $CMAKE_BACKUP $CMAKE_CROSS $CMAKE_PROTECTION $CMAKE_GNAP $CMAKE_COMPLETE
-diff --git a/docs/manual/CMakeLists.txt b/docs/manual/CMakeLists.txt
-index f803bef9f..375df20d2 100644
---- a/docs/manual/CMakeLists.txt
-+++ b/docs/manual/CMakeLists.txt
-@@ -26,7 +26,7 @@ if (SPHINX_BUILD_EXECUTABLE)
-     set (SPHINX_PAPER_SIZE "a4" CACHE STRING "Paper size for Sphinx LaTeX/PDF/PS output")
-     configure_file ("${CMAKE_CURRENT_SOURCE_DIR}/conf.py" "${CMAKE_CURRENT_BINARY_DIR}/conf.py" @ONLY)
-     macro(sphinxdoc _format)
--        add_custom_target (manual-${_format} ${PYTHON_EXECUTABLE} ${SPHINX_BUILD_EXECUTABLE}
-+        add_custom_target (manual-${_format} ${SPHINX_BUILD_EXECUTABLE}
-                 -c ${CMAKE_CURRENT_BINARY_DIR}/
-                 -n
-                 -b ${_format}
--- 
-2.15.0.rc1
-
diff --git a/debian/patches/Fix-documentation-build-with-Python-3.patch b/debian/patches/Fix-documentation-build-with-Python-3.patch
deleted file mode 100644
index 799e714..0000000
--- a/debian/patches/Fix-documentation-build-with-Python-3.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 40687c228ab8b61d36eee6dcd9e0554e01f8c022 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <michal@cihar.com>
-Date: Wed, 18 Oct 2017 10:52:11 +0200
-Subject: [PATCH 1/1] Fix documentation build with Python 3
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Michal Čihař <michal@cihar.com>
----
- docs/manual/configext.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/docs/manual/configext.py b/docs/manual/configext.py
-index 50b1cb75b..c98577cf1 100644
---- a/docs/manual/configext.py
-+++ b/docs/manual/configext.py
-@@ -147,7 +147,7 @@ class ConfigFileDomain(Domain):
-                                 labelid, contnode)
- 
-     def get_objects(self):
--        for (type, name), info in self.data['objects'].iteritems():
-+        for (type, name), info in self.data['objects'].items():
-             yield (name, name, type, info[0], info[1],
-                    self.object_types[type].attrs['searchprio'])
- 
--- 
-2.15.0.rc1
-
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 150370a..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-Fix-documentation-build-with-Python-3.patch
-Avoid-invoking-Sphinx-though-Python.patch