Debian pkg: updates from upstream.

diff --git a/.gitignore b/.gitignore
index 1ffab2970e0b5792f2a3b0fbab0d7f159992f3dd..371ad65fddda21727cd7328341bad67a18a3eb94 100644 (file)
--- 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 3d549772f0c7ae3dd87f7a3c7f49e3f870016d4b..77fc738e73d7f10fcdd13ef18f30d4e163f32a47 100644 (file)
--- 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 <tux@develop64.comune.scandicci.fi.it>  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 <tux@develop64.example.tst>  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 e91316515acc100bdba2c48f951a3a5ee9d52ecd..e412b7b699cdc8bb6edef1a7247014d62e03a395 100644 (file)
--- 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 (file)
index c760a4f..0000000
--- a/debian/patches/0001-GdaUI-missing.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From: Andrea Zagli <azagli@libero.it>
-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 <libgda-ui/libgda-ui.h>
- #include <libzakutils/libzakutils.h>
- #include <libsolipa/libsolipa.h>
- 
-@@ -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 2bfbdc72d5ff0d84c6009de07d14459f53502c51..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +0,0 @@
-0001-GdaUI-missing.patch