From 3bfc6bea78086115d564ddbbd9ff2c3396abdebb Mon Sep 17 00:00:00 2001 From: Andrea Zagli Date: Mon, 22 May 2017 15:12:54 +0200 Subject: [PATCH] Debian pkg: updates from upstream. --- debian/changelog | 24 ++++++++++++-- debian/control | 6 ++-- .../patches/0001-Added-DESTDIR-support.patch | 32 +++++++++++++++++++ debian/patches/series | 1 + 4 files changed, 57 insertions(+), 6 deletions(-) create mode 100644 debian/patches/0001-Added-DESTDIR-support.patch create mode 100644 debian/patches/series diff --git a/debian/changelog b/debian/changelog index e13501d..225f5e5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,6 @@ -libsolipa (0.5.0-1~2.gbp85921d) UNRELEASED; urgency=medium +libsolipa (0.5.0-1~3.gbpa758bf) UNRELEASED; urgency=medium - ** SNAPSHOT build @85921d6bef3a10a0ced1d753ebad54d843f09ce4 ** + ** SNAPSHOT build @a758bfc56e0e688d52c89a02f30a1a24638f3283 ** [ Andrea Zagli ] * Initial release @@ -16,4 +16,22 @@ libsolipa (0.5.0-1~2.gbp85921d) UNRELEASED; urgency=medium [ tux ] - -- tux Sat, 11 Mar 2017 11:00:14 +0100 + [ Andrea Zagli ] + * Debian pkg: updated from upstream. + * Dipendenze mancanti nel file pkg-config. + * Utilizzo di pkg-config per l'individuazione di python. + * Inizio scorporamento utilità per mail da libreria principale. + * Aggiunta interfaccia a ctpl. + * File pkg-config mancanti in installazione. + * Header mancanti nell'header principale. + * Typo. + * Rimossi alcuni warning e deprecazioni. + * Typo in nuova classe SolipaCamel. + * Aggiunto SolipaZakFormElementValidatorCodfisc. + * Aggiunto SolipaZakFormElementValidatorPiva. + * Per adesso libsolipa rimane dipendente da camel. + * Ordine errato multipart nelle mail con attachment e testo e html. + + [ tux ] + + -- tux Wed, 24 May 2017 09:15:26 +0200 diff --git a/debian/control b/debian/control index ea2bd7d..4289d97 100644 --- a/debian/control +++ b/debian/control @@ -1,7 +1,7 @@ Source: libsolipa Priority: optional Maintainer: Andrea Zagli -Build-Depends: debhelper (>=9), intltool, pkg-config, gtk-doc-tools, gnome-common, libgtkform-dev, libzakformgtk-dev, libcamel1.2-dev, libgdaex-dev, python-dev +Build-Depends: debhelper (>=9), intltool, pkg-config, gtk-doc-tools, gnome-common, libgtkform-dev, libzakformgtk-dev, libcamel1.2-dev, libgdaex-dev, python-dev, libctpl-dev Standards-Version: 3.9.8 Section: libs Homepage: https://saetta.ns0.it @@ -11,7 +11,7 @@ Homepage: https://saetta.ns0.it Package: libsolipa-dev Section: libdevel Architecture: any -Depends: libsolipa (= ${binary:Version}), ${misc:Depends}, libgtkform-dev, libzakformgtk-dev, libcamel1.2-dev, libgdaex-dev, python-dev +Depends: libsolipa (= ${binary:Version}), ${misc:Depends}, libgtkform-dev, libzakformgtk-dev, libcamel1.2-dev, libgdaex-dev, python-dev, libctpl-dev Description: Utilities library - development files Utilities library. . @@ -19,6 +19,6 @@ Description: Utilities library - development files Package: libsolipa Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, libgtkform, libzakformgtk, libcamel-1.2-59, libgdaex, python +Depends: ${shlibs:Depends}, ${misc:Depends}, libgtkform, libzakformgtk, libcamel-1.2-59, libgdaex, python, libctpl2 Description: Utilities library Utilities library. diff --git a/debian/patches/0001-Added-DESTDIR-support.patch b/debian/patches/0001-Added-DESTDIR-support.patch new file mode 100644 index 0000000..1f9dfca --- /dev/null +++ b/debian/patches/0001-Added-DESTDIR-support.patch @@ -0,0 +1,32 @@ +From: Andrea Zagli +Date: Wed, 24 May 2017 09:29:07 +0200 +Subject: Added DESTDIR support. + +--- + src/Makefile.am | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/Makefile.am b/src/Makefile.am +index a5a99f1..ebcc1ec 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -10,7 +10,7 @@ libmodulesext = .so + libmodulesdir = $(libdir) + endif + +-libzakformmodulesdir = `pkg-config --variable=modulesdir libzakform` ++libzakformmodulesdir = $(DESTDIR)`pkg-config --variable=modulesdir libzakform` + + LIBS = $(SOLIPA_LIBS) \ + $(SOLIPA_WIN32_LIBS) \ +@@ -109,8 +109,8 @@ libsolipaooo_includedir = $(includedir)/libsolipa + + + install-exec-hook: +- cd $(libzakformmodulesdir) && \ +- ln -s -f $(libmodulesdir)/libsolipa$(libmodulesext) . ++ mkdir -p $(libzakformmodulesdir) ++ ln -s -f -t $(libzakformmodulesdir) $(libmodulesdir)/libzakformgtk$(libmodulesext) + + uninstall-hook: + rm -f $(libzakformmodulesdir)/libsolipa$(libmodulesext) diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..6382560 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +0001-Added-DESTDIR-support.patch -- 2.49.0