From 8850f6af2dd2f8865f6138ea8437621f1ba85cda Mon Sep 17 00:00:00 2001
From: Andrea Zagli <azagli@libero.it>
Date: Thu, 12 Jul 2018 10:22:29 +0200
Subject: [PATCH] Debian pkg: python3 dep.
---
debian/changelog | 7 ++++---
debian/control | 4 ++--
debian/patches/0005-No-python-pkg-config.patch | 7 ++++---
3 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index e506be0..a8bed5b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
-libsolipa (0.5.0-2~8.gbp775309) UNRELEASED; urgency=medium
+libsolipa (0.5.0-2~9.gbp72b022) UNRELEASED; urgency=medium
- ** SNAPSHOT build @77530913ef12b64c87d870f742fab0266c6245b6 **
+ ** SNAPSHOT build @72b02257f2aa6b48baae7cd7d9b97451b8045a03 **
[ Andrea Zagli ]
* Initial release
@@ -376,5 +376,6 @@ libsolipa (0.5.0-2~8.gbp775309) UNRELEASED; urgency=medium
* Aggiunto il test ooo_no_aprichiudi.
* Esportazione variabile python per pkg-config.
* Aggiunta la funzione OOO::openoffice_in_esecuzione.
+ * Debian pkg: updates from upstream.
- -- tux <tux@develop64.example.tst> Thu, 12 Jul 2018 09:08:35 +0200
+ -- tux <tux@develop64.example.tst> Thu, 12 Jul 2018 10:19:40 +0200
diff --git a/debian/control b/debian/control
index 060ccdc..e12aead 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,7 @@
Source: libsolipa
Priority: optional
Maintainer: Andrea Zagli <azagli@libero.it>
-Build-Depends: debhelper (>=9), intltool, pkg-config, gtk-doc-tools, gobject-introspection, libgirepository1.0-dev, libgtkform-dev, libzakformgtk-dev, libcamel1.2-dev, libgdaex-dev, python-dev, libctpl-dev
+Build-Depends: debhelper (>=9), intltool, pkg-config, gtk-doc-tools, gobject-introspection, libgirepository1.0-dev, libgtkform-dev, libzakformgtk-dev, libcamel1.2-dev, libgdaex-dev, python3-dev, libctpl-dev
Standards-Version: 3.9.8
Section: libs
Homepage: https://saetta.ns0.it
@@ -19,6 +19,6 @@ Description: Utilities library - development files
Package: libsolipa
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libgtkform, libzakformgtk, libcamel-1.2-33, libgdaex, python, evolution-data-server, libctpl2
+Depends: ${shlibs:Depends}, ${misc:Depends}, libgtkform, libzakformgtk, libcamel-1.2-33, libgdaex, python3, evolution-data-server, libctpl2
Description: Utilities library
Utilities library.
diff --git a/debian/patches/0005-No-python-pkg-config.patch b/debian/patches/0005-No-python-pkg-config.patch
index 32aa23d..5f579de 100644
--- a/debian/patches/0005-No-python-pkg-config.patch
+++ b/debian/patches/0005-No-python-pkg-config.patch
@@ -17,9 +17,10 @@ index f6a0719..259be59 100644
PKG_CHECK_MODULES(PYTHON, [python-3.6], [python36_found=yes], [python36_found=no])
if test x$python36_found = xno; then
- PKG_CHECK_MODULES(PYTHON, [python])
-+AC_CHECK_PROG(PYTHON_CFLAGS, [python-config], `python-config --cflags`, [-I/c/Python26/include])
-+AC_CHECK_PROG(PYTHON_LIBS, [python-config], `python-config --libs`, [-lpthread -lm -L/c/Python26/libs -lpython26])
- PYTHON_PKGCONFIG="python"
++ AC_CHECK_PROG(PYTHON_CFLAGS, [python3.2-config], `python3.2-config --cflags`, [-I/c/Python26/include])
++ AC_CHECK_PROG(PYTHON_LIBS, [python3.2-config], `python3.2-config --libs`, [-lpthread -lm -L/c/Python26/libs -lpython26])
+- PYTHON_PKGCONFIG="python"
++ PYTHON_PKGCONFIG=""
else
PYTHON_PKGCONFIG="python-3.6"
fi
--
2.49.0