From: Andrea Zagli Date: Tue, 12 Jun 2018 08:32:25 +0000 (+0200) Subject: Debian pkg: updates from upstream. X-Git-Url: https://saetta.ns0.it/gitweb?a=commitdiff_plain;h=15f0ae23a4ddbefe59dd6763a39e1ca5ddaff37f;p=solipa%2Fterritorio Debian pkg: updates from upstream. --- diff --git a/.gitignore b/.gitignore index 1ffab29..371ad65 100644 --- a/.gitignore +++ b/.gitignore @@ -29,4 +29,5 @@ stamp-h1 tests/comune_by_id tests/widget compile -*.rc \ No newline at end of file +*.rc +build/ \ No newline at end of file diff --git a/debian/changelog b/debian/changelog index 3d54977..77fc738 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,6 @@ -territorio (0.0.1-2~4.gbp9f3648) UNRELEASED; urgency=medium +territorio (0.0.1-2~5.gbp4c62e8) UNRELEASED; urgency=medium - ** SNAPSHOT build @9f36488639832625fb49b52ef5919525c82c0434 ** + ** SNAPSHOT build @4c62e8e1e805da7eea24672b6b813fe15eeecd77 ** [ tux ] ** SNAPSHOT build @4617200dd88cffa413a5061a6f0f8e3fb09a4b30 ** @@ -16,7 +16,23 @@ territorio (0.0.1-2~4.gbp9f3648) UNRELEASED; urgency=medium [ tux ] - -- tux Mon, 22 May 2017 17:47:18 +0200 + [ Andrea Zagli ] + * Debian pgk: updated from upstream. + * Aggiunta la funzione Comuni::get_dm_order. + * Rimossi i file anjuta e eclipse. + * Rimossa la dipendenza da libgda-ui. + * Dipendenza mancanti in file pkg-config. + * Aggiunta la funzione Territorio::init. + * Aggiunto salva e chiudi in stato. + * Aggiunto salva e chiudi a regione. + * Aggiunto salva e chiudi a provincia. + * Aggiunto salva e chiudi a via. + * Aggiunto salva e chiudi a comune. + * Aggiunto salva e chiudi a aggregazione territoriale. + * Tipo sbagliato colonna id in tipi aggrazione territoriale. + * Aggiunto salva e chiudi a tipo aggregazione territoriale. + + -- tux Tue, 12 Jun 2018 09:30:10 +0200 territorio (0.0.1-1) UNRELEASED unstable; urgency=medium diff --git a/debian/gbp.conf b/debian/gbp.conf index e913165..e412b7b 100644 --- a/debian/gbp.conf +++ b/debian/gbp.conf @@ -1,5 +1,5 @@ [buildpackage] -export-dir=../build_area/sid +export-dir=./build/sid debian-branch=debian/sid ignore-new=True upstream-tree=BRANCH diff --git a/debian/patches/0001-GdaUI-missing.patch b/debian/patches/0001-GdaUI-missing.patch deleted file mode 100644 index c760a4f..0000000 --- a/debian/patches/0001-GdaUI-missing.patch +++ /dev/null @@ -1,72 +0,0 @@ -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 index 2bfbdc7..e69de29 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +0,0 @@ -0001-GdaUI-missing.patch