From: Andrea Zagli Date: Wed, 28 Dec 2016 15:03:06 +0000 (+0100) Subject: Debian pkg: aggiustamenti. X-Git-Url: https://saetta.ns0.it/gitweb?a=commitdiff_plain;h=4e65fc08904bc10e16bd6df37a1065dd9a22089c;p=solipa%2Fterritorio Debian pkg: aggiustamenti. --- diff --git a/debian/changelog b/debian/changelog index 555d617..23d5d29 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +territorio (0.0.1-2~3.gbp461720) UNRELEASED; urgency=medium + + ** SNAPSHOT build @4617200dd88cffa413a5061a6f0f8e3fb09a4b30 ** + + * UNRELEASED + + -- tux Wed, 28 Dec 2016 15:57:08 +0100 + territorio (0.0.1-1) UNRELEASED unstable; urgency=medium * Initial release diff --git a/debian/control b/debian/control index 78cff6b..2e83844 100644 --- a/debian/control +++ b/debian/control @@ -1,7 +1,7 @@ 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 +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 @@ -11,18 +11,18 @@ Homepage: https://saetta.ns0.it 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 +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 +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 +Depends: ${shlibs:Depends}, ${misc:Depends}, libterritorio Description: Gestione territorio Gestione territorio. diff --git a/debian/gbp.conf b/debian/gbp.conf index d2e2b59..e913165 100644 --- a/debian/gbp.conf +++ b/debian/gbp.conf @@ -1,5 +1,5 @@ [buildpackage] -export-dir=../build_area +export-dir=../build_area/sid debian-branch=debian/sid ignore-new=True upstream-tree=BRANCH 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/series b/debian/patches/series new file mode 100644 index 0000000..2bfbdc7 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +0001-GdaUI-missing.patch diff --git a/debian/rules b/debian/rules index dc0ef3d..d343232 100755 --- a/debian/rules +++ b/debian/rules @@ -14,6 +14,10 @@ #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 $@ diff --git a/debian/territorio-dev.install b/debian/territorio-dev.install deleted file mode 100644 index 7df81cd..0000000 --- a/debian/territorio-dev.install +++ /dev/null @@ -1,3 +0,0 @@ -usr/include/* -usr/lib/*/lib*.so -usr/lib/*/pkgconfig/* diff --git a/debian/territorio1.install b/debian/territorio1.install deleted file mode 100644 index 3ddde58..0000000 --- a/debian/territorio1.install +++ /dev/null @@ -1 +0,0 @@ -usr/lib/*/lib*.so.*