From 6da9973177614226b5fd807acdbb03f4a862d2b0 Mon Sep 17 00:00:00 2001 From: Andrea Zagli Date: Wed, 28 Dec 2016 16:41:45 +0100 Subject: [PATCH] Debian pkg: added files. --- debian/changelog | 13 ++++ debian/compat | 1 + debian/control | 28 ++++++++ debian/copyright | 34 +++++++++ debian/gbp.conf | 10 +++ debian/libterritorio-dev.install | 3 + debian/libterritorio.install | 2 + debian/patches/0001-GdaUI-missing.patch | 72 +++++++++++++++++++ ...0002-Useless-gio-dep-in-configure.ac.patch | 22 ++++++ .../0003-gtk_widget_is_visible-missing.patch | 36 ++++++++++ debian/patches/series | 3 + debian/rules | 36 ++++++++++ debian/source/format | 1 + debian/territorio.install | 1 + 14 files changed, 262 insertions(+) create mode 100644 debian/changelog create mode 100644 debian/compat create mode 100644 debian/control create mode 100644 debian/copyright create mode 100644 debian/gbp.conf create mode 100644 debian/libterritorio-dev.install create mode 100644 debian/libterritorio.install create mode 100644 debian/patches/0001-GdaUI-missing.patch create mode 100644 debian/patches/0002-Useless-gio-dep-in-configure.ac.patch create mode 100644 debian/patches/0003-gtk_widget_is_visible-missing.patch create mode 100644 debian/patches/series create mode 100755 debian/rules create mode 100644 debian/source/format create mode 100644 debian/territorio.install diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 0000000..feb8fde --- /dev/null +++ b/debian/changelog @@ -0,0 +1,13 @@ +territorio (0.0.1-2~2.gbpd2d13f) UNRELEASED; urgency=medium + + ** SNAPSHOT build @d2d13f593af76ccbabd2b1918239a5d3fc5d4056 ** + + * UNRELEASED + + -- tux Wed, 28 Dec 2016 15:57:08 +0100 + +territorio (0.0.1-1) UNRELEASED unstable; urgency=medium + + * Initial release + + -- Andrea Zagli Fri, 05 Aug 2016 11:42:29 +0200 diff --git a/debian/compat b/debian/compat new file mode 100644 index 0000000..ec63514 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +9 diff --git a/debian/control b/debian/control new file mode 100644 index 0000000..e930bce --- /dev/null +++ b/debian/control @@ -0,0 +1,28 @@ +Source: territorio +Priority: optional +Maintainer: Andrea Zagli +Build-Depends: debhelper (>=9), intltool, pkg-config, gtk-doc-tools, gnome-common, libgdaex-dev, libgdaexgrid-dev, libsolipa-dev, libgtkform-dev, libzakauthe-dev, libzakautho-dev, libzakutils-dev +Standards-Version: 3.9.8 +Section: libs +Homepage: https://saetta.ns0.it +#Vcs-Git: git://anonscm.debian.org/collab-maint/territorio.git +#Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/territorio.git + +Package: libterritorio-dev +Section: libdevel +Architecture: any +Depends: libterritorio (= ${binary:Version}), ${misc:Depends}, libgdaex-dev, libgdaexgrid-dev, libsolipa-dev, libgtkform-dev, libzakauthe-dev, libzakautho-dev, libzakutils-dev +Description: Libreria di interfaccia a territorio - devel package + Libreria di interfaccia a territorio - development files. + +Package: libterritorio +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, libgdaex, libgdaexgrid, libsolipa, libgtkform, libzakauthe, libzakautho, libzakutils +Description: Libreria di interfaccia a territorio + Libreria di interfaccia a territorio. + +Package: territorio +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, libgdaex, libgdaexgrid, libsolipa, libgtkform, libzakauthe, libzakautho, libzakutils +Description: Gestione territorio + Gestione territorio. diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 0000000..8f675ed --- /dev/null +++ b/debian/copyright @@ -0,0 +1,34 @@ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: territorio +Source: + +Files: * +Copyright: + +License: GPL-2.0+ + +Files: debian/* +Copyright: 2016 Andrea Zagli +License: GPL-2.0+ + +License: GPL-2.0+ + This package 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. + . + This package 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. + . + You should have received a copy of the GNU General Public License + along with this program. If not, see + . + On Debian systems, the complete text of the GNU General + Public License version 2 can be found in "/usr/share/common-licenses/GPL-2". + +# Please also look if there are files or directories which have a +# different copyright/license attached and list them here. +# Please avoid picking licenses with terms that are more restrictive than the +# packaged work, as it may make Debian's contributions unacceptable upstream. diff --git a/debian/gbp.conf b/debian/gbp.conf new file mode 100644 index 0000000..c411531 --- /dev/null +++ b/debian/gbp.conf @@ -0,0 +1,10 @@ +[buildpackage] +export-dir=../build_area/wheezy +debian-branch=debian/wheezy +ignore-new=True +upstream-tree=BRANCH +upstream-branch=develop +force-create=True +export=WC +dist=wheezy +pbuilder=True diff --git a/debian/libterritorio-dev.install b/debian/libterritorio-dev.install new file mode 100644 index 0000000..7df81cd --- /dev/null +++ b/debian/libterritorio-dev.install @@ -0,0 +1,3 @@ +usr/include/* +usr/lib/*/lib*.so +usr/lib/*/pkgconfig/* diff --git a/debian/libterritorio.install b/debian/libterritorio.install new file mode 100644 index 0000000..557e38c --- /dev/null +++ b/debian/libterritorio.install @@ -0,0 +1,2 @@ +usr/lib/*/lib*.so.* +usr/share/* diff --git a/debian/patches/0001-GdaUI-missing.patch b/debian/patches/0001-GdaUI-missing.patch new file mode 100644 index 0000000..7718830 --- /dev/null +++ b/debian/patches/0001-GdaUI-missing.patch @@ -0,0 +1,72 @@ +From: Andrea Zagli +Date: Wed, 28 Dec 2016 16:06:05 +0100 +Subject: GdaUI missing. + +--- + configure.ac | 1 - + libterritorio.pc.in | 2 +- + src/importaviecivilia.c | 8 +++----- + 3 files changed, 4 insertions(+), 7 deletions(-) + +diff --git a/configure.ac b/configure.ac +index e3bff55..982d157 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -38,7 +38,6 @@ AM_GLIB_GNU_GETTEXT + + # Checks for libraries. + PKG_CHECK_MODULES(TERRITORIO, [gio-2.0 >= 2.36 +- libgda-ui-5.0 >= 5.0.0 + libgdaex >= 0.5.0 + libgdaexgrid + libzakconfi >= 0.10.0 +diff --git a/libterritorio.pc.in b/libterritorio.pc.in +index c8837cd..cd742a3 100644 +--- a/libterritorio.pc.in ++++ b/libterritorio.pc.in +@@ -6,6 +6,6 @@ includedir=@includedir@ + Name: @PACKAGE_NAME@ + Description: Libreria con l'interfaccia per la gestione del territorio. + Version: @PACKAGE_VERSION@ +-Requires: libgdaex >= 0.5.0 libgtkform >= 0.5.0 libgtkformui >= 0.5.0 libzakauthe >= 0.2.0 libzakautho >= 0.0.5 libsolipa >= 0.5.0 libgda-ui-5.0 >= 5.0.0 libzakconfi >= 0.10.0 ++Requires: libgdaex >= 0.5.0 libgtkform >= 0.5.0 libgtkformui >= 0.5.0 libzakauthe >= 0.2.0 libzakautho >= 0.0.5 libsolipa >= 0.5.0 libzakconfi >= 0.10.0 + Libs: -L${libdir} -lterritorio + Cflags: -I${includedir} +diff --git a/src/importaviecivilia.c b/src/importaviecivilia.c +index a442602..4894e40 100644 +--- a/src/importaviecivilia.c ++++ b/src/importaviecivilia.c +@@ -17,7 +17,6 @@ + * + */ + +-#include + #include + #include + +@@ -104,7 +103,9 @@ TerritorioImportaVieCivilia + + TerritorioImportaVieCiviliaPrivate *priv = TERRITORIO_IMPORTA_VIECIVILIA_GET_PRIVATE (a); + +- gdaui_init (); ++ ++ g_error ("NOT IMPLEMENTED (GDAUI MISSING)."); ++ + + priv->commons = commons; + +@@ -119,14 +120,11 @@ TerritorioImportaVieCivilia + + carea = gtk_dialog_get_content_area (GTK_DIALOG (dialog)); + +- connection = gdaui_login_new (NULL); +- gdaui_login_set_mode (GDAUI_LOGIN (connection), GDA_UI_LOGIN_HIDE_DSN_SELECTION_MODE); + gtk_container_add (GTK_CONTAINER (carea), connection); + gtk_widget_show (connection); + + if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT) + { +- dsn = gdaui_login_get_connection_information (GDAUI_LOGIN (connection)); + gdaex = gdaex_new_from_string (g_strdup_printf ("%s://%s;%s", dsn->provider, dsn->cnc_string, dsn->auth_string)); + gtk_widget_destroy (dialog); + if (gdaex == NULL) diff --git a/debian/patches/0002-Useless-gio-dep-in-configure.ac.patch b/debian/patches/0002-Useless-gio-dep-in-configure.ac.patch new file mode 100644 index 0000000..991dfbf --- /dev/null +++ b/debian/patches/0002-Useless-gio-dep-in-configure.ac.patch @@ -0,0 +1,22 @@ +From: Andrea Zagli +Date: Wed, 28 Dec 2016 16:42:42 +0100 +Subject: Useless gio dep in configure.ac. + +--- + configure.ac | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 982d157..4e44067 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -37,8 +37,7 @@ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", + AM_GLIB_GNU_GETTEXT + + # Checks for libraries. +-PKG_CHECK_MODULES(TERRITORIO, [gio-2.0 >= 2.36 +- libgdaex >= 0.5.0 ++PKG_CHECK_MODULES(TERRITORIO, [libgdaex >= 0.5.0 + libgdaexgrid + libzakconfi >= 0.10.0 + libgtkform >= 0.5.0 diff --git a/debian/patches/0003-gtk_widget_is_visible-missing.patch b/debian/patches/0003-gtk_widget_is_visible-missing.patch new file mode 100644 index 0000000..cab58dc --- /dev/null +++ b/debian/patches/0003-gtk_widget_is_visible-missing.patch @@ -0,0 +1,36 @@ +From: Andrea Zagli +Date: Wed, 28 Dec 2016 16:49:05 +0100 +Subject: gtk_widget_is_visible missing. + +--- + src/widget.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/widget.c b/src/widget.c +index 40984e5..c6aafa3 100644 +--- a/src/widget.c ++++ b/src/widget.c +@@ -1,4 +1,4 @@ +-/* ++/* + * Copyright (C) 2011-2013 Andrea Zagli + * + * This library is free software; you can redistribute it and/or +@@ -987,7 +987,7 @@ territorio_widget_size_request (GtkWidget *widget, + requisition->width = 0; + requisition->height = 0; + +- if (gtk_bin_get_child (bin) && gtk_widget_is_visible (GTK_WIDGET (gtk_bin_get_child (bin)))) ++ if (gtk_bin_get_child (bin) && gtk_widget_get_visible (GTK_WIDGET (gtk_bin_get_child (bin)))) + { + /*gtk_widget_size_request (gtk_bin_get_child (bin), &child_requisition);*/ + requisition->width += child_requisition.width; +@@ -1026,7 +1026,7 @@ territorio_widget_size_allocate (GtkWidget *widget, + relative_allocation.width = MAX (1, w_allocation.width - relative_allocation.x * 2); + relative_allocation.height = MAX (1, w_allocation.height - relative_allocation.y * 2); + +- if (gtk_bin_get_child (bin) && gtk_widget_is_visible (GTK_WIDGET (gtk_bin_get_child (bin)))) ++ if (gtk_bin_get_child (bin) && gtk_widget_get_visible (GTK_WIDGET (gtk_bin_get_child (bin)))) + { + child_allocation.x = relative_allocation.x + allocation->x; + child_allocation.y = relative_allocation.y + allocation->y; diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..2f4a18e --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,3 @@ +0001-GdaUI-missing.patch +0002-Useless-gio-dep-in-configure.ac.patch +0003-gtk_widget_is_visible-missing.patch diff --git a/debian/rules b/debian/rules new file mode 100755 index 0000000..d343232 --- /dev/null +++ b/debian/rules @@ -0,0 +1,36 @@ +#!/usr/bin/make -f +# See debhelper(7) (uncomment to enable) +# output every command that modifies files on the build system. +#export DH_VERBOSE = 1 + + +# see FEATURE AREAS in dpkg-buildflags(1) +#export DEB_BUILD_MAINT_OPTIONS = hardening=+all + +# see ENVIRONMENT in dpkg-buildflags(1) +# package maintainers to append CFLAGS +#export DEB_CFLAGS_MAINT_APPEND = -Wall -pedantic +# package maintainers to append LDFLAGS +#export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed + + +export DEB_CFLAGS_MAINT_STRIP = -Werror=format-security +export DEB_CPPFLAGS_MAINT_STRIP = -Werror=format-security +export DEB_CXXFLAGS_MAINT_STRIP = -Werror=format-security + +%: + dh $@ + + +override_dh_auto_configure: + NOCONFIGURE="X" ./autogen.sh + dh_auto_configure + +override_dh_auto_install: + $(MAKE) DESTDIR=$$(pwd)/debian/tmp prefix=/usr install + + +# dh_make generated override targets +# This is example for Cmake (See https://bugs.debian.org/641051 ) +#override_dh_auto_configure: +# dh_auto_configure -- # -DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH) diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/debian/territorio.install b/debian/territorio.install new file mode 100644 index 0000000..e772481 --- /dev/null +++ b/debian/territorio.install @@ -0,0 +1 @@ +usr/bin -- 2.49.0