[Debian-iot-packaging] [hoel] 02/02: Import Debian changes 1.3.1-1

Thorsten Alteholz alteholz at moszumanska.debian.org
Mon Mar 19 21:43:27 UTC 2018


This is an automated email from the git hooks/post-receive script.

alteholz pushed a commit to branch master
in repository hoel.

commit 53b307ad0c6beb2fcf60011fa0f66569cf7bb5b7
Merge: 3e82e6c 67cbba3
Author: Thorsten Alteholz <debian at alteholz.de>
Date:   Sun Jan 21 18:31:49 2018 +0100

    Import Debian changes 1.3.1-1
    
    hoel (1.3.1-1) unstable; urgency=medium
    
      * New upstream release
      * debian/control: bump standard to 4.1.3 (no changes)
      * debian/control: use dh11

 Makefile                                          |  2 +-
 README.md                                         | 87 +++++++++++++++--------
 _config.yml                                       |  1 +
 debian/changelog                                  |  8 +++
 debian/compat                                     |  2 +-
 debian/control                                    | 17 ++---
 debian/{libhoel1.2.install => libhoel1.3.install} |  0
 debian/libhoel1.3.symbols                         | 50 +++++++++++++
 debian/patches/hardening.patch                    | 19 +++--
 src/Makefile                                      | 11 +--
 src/h-private.h                                   |  2 +-
 src/hoel-mariadb.c                                | 22 ++++--
 src/hoel-pgsql.c                                  | 17 ++++-
 src/hoel-simple-json.c                            | 63 ++++++++++++++--
 src/hoel-sqlite.c                                 | 18 ++++-
 src/hoel.c                                        | 12 ++--
 src/hoel.h                                        | 22 +++---
 test/core.c                                       | 19 +++++
 18 files changed, 287 insertions(+), 85 deletions(-)

diff --cc debian/changelog
index e8c4d6f,0000000..4ebb3ec
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,23 -1,0 +1,31 @@@
++hoel (1.3.1-1) unstable; urgency=medium
++
++  * New upstream release
++  * debian/control: bump standard to 4.1.3 (no changes)
++  * debian/control: use dh11
++
++ -- Thorsten Alteholz <debian at alteholz.de>  Sun, 21 Jan 2018 18:31:49 +0100
++
 +hoel (1.2.1-1) unstable; urgency=medium
 +
 +  * New upstream release
 +  * debian/control: move to debian-iot group
 +  * debian/control: bump soname of libhoel to 1.2
 +
 + -- Thorsten Alteholz <debian at alteholz.de>  Thu, 05 Oct 2017 19:25:48 +0200
 +
 +hoel (1.1.2-1) unstable; urgency=medium
 +
 +  * new upstream version
 +  * change homepage URL (Closes: #869933)
 +  * debian/control: bump standard to 4.1.0 (no changes)
 +  * debian/control: add VCS URLs
 +  * refresh patches
 +
 + -- Thorsten Alteholz <debian at alteholz.de>  Sat, 02 Sep 2017 17:17:33 +0200
 +
 +hoel (1.1-1) unstable; urgency=medium
 +
 +  * Initial release
 +
 + -- Thorsten Alteholz <debian at alteholz.de>  Tue, 18 Jul 2017 14:32:33 +0200
diff --cc debian/compat
index f599e28,0000000..b4de394
mode 100644,000000..100644
--- a/debian/compat
+++ b/debian/compat
@@@ -1,1 -1,0 +1,1 @@@
- 10
++11
diff --cc debian/control
index 1b78a4e,0000000..06ce28b
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,43 -1,0 +1,44 @@@
 +Source: hoel
 +Section: devel
 +Priority: optional
 +Maintainer: Debian IoT Maintainers <debian-iot-maintainers at lists.alioth.debian.org>
 +Uploaders: Thorsten Alteholz <debian at alteholz.de>
- Build-Depends: debhelper (>= 10)
++Build-Depends: debhelper (>= 11)
 +	, liborcania-dev
 +	, libyder-dev
 +	, libjansson-dev
 +	, libsqlite3-dev
 +	, libpq-dev
 +	, libmariadbclient-dev
- Standards-Version: 4.1.0
++Standards-Version: 4.1.3
 +Homepage: https://github.com/babelouest/hoel
 +Vcs-Browser: https://anonscm.debian.org/cgit/debian-iot/hoel.git
 +Vcs-Git: https://anonscm.debian.org/git/debian-iot/hoel.git
 +
- Package: libhoel1.2
++Package: libhoel1.3
 +Architecture: any
++Section: libs
 +Pre-Depends: ${misc:Pre-Depends}
 +Depends: ${shlibs:Depends}, ${misc:Depends}
 +Description: database abstraction library written in C
-  Simple and easy to use database access library. Works with SQLite 3, 
-  MariaDB/Mysql and (barely) PostgreSQL databases. Uses a json-based 
++ Simple and easy to use database access library. Works with SQLite 3,
++ MariaDB/Mysql and (barely) PostgreSQL databases. Uses a json-based
 + language with jansson to execute simples queries based on one table.
 +
 +Package: libhoel-dev
 +Architecture: any
 +Section: libdevel
- Depends: libhoel1.2 (= ${binary:Version})
++Depends: libhoel1.3 (= ${binary:Version})
 +        , ${misc:Depends}
 +        , libjansson-dev
 +	, liborcania-dev
 +	, libyder-dev
 +	, libsqlite3-dev
 +	, libpq-dev
 +	, libmariadbclient-dev
 +Description: database abstraction library written in C - development
-  Simple and easy to use database access library. Works with SQLite 3, 
-  MariaDB/Mysql and (barely) PostgreSQL databases. Uses a json-based 
++ Simple and easy to use database access library. Works with SQLite 3,
++ MariaDB/Mysql and (barely) PostgreSQL databases. Uses a json-based
 + language with jansson to execute simples queries based on one table.
 + .
 + This package contains the development files.
diff --cc debian/libhoel1.3.install
index 6ac0115,0000000..6ac0115
mode 100644,000000..100644
--- a/debian/libhoel1.3.install
+++ b/debian/libhoel1.3.install
diff --cc debian/libhoel1.3.symbols
index 0000000,0000000..c1123f6
new file mode 100644
--- /dev/null
+++ b/debian/libhoel1.3.symbols
@@@ -1,0 -1,0 +1,50 @@@
++# SymbolsHelper-Confirmed: 1.3.1 amd64
++libhoel.so.1.3 libhoel1.3 #MINVER#
++ h_clean_connection at Base 1.3.1
++ h_clean_data at Base 1.3.1
++ h_clean_data_full at Base 1.3.1
++ h_clean_result at Base 1.3.1
++ h_close_db at Base 1.3.1
++ h_close_mariadb at Base 1.3.1
++ h_close_pgsql at Base 1.3.1
++ h_close_sqlite at Base 1.3.1
++ h_connect_mariadb at Base 1.3.1
++ h_connect_pgsql at Base 1.3.1
++ h_connect_sqlite at Base 1.3.1
++ h_delete at Base 1.3.1
++ h_escape_string at Base 1.3.1
++ h_escape_string_mariadb at Base 1.3.1
++ h_escape_string_pgsql at Base 1.3.1
++ h_escape_string_sqlite at Base 1.3.1
++ h_exec_query_sqlite at Base 1.3.1
++ h_execute_query at Base 1.3.1
++ h_execute_query_json at Base 1.3.1
++ h_execute_query_json_mariadb at Base 1.3.1
++ h_execute_query_json_pgsql at Base 1.3.1
++ h_execute_query_json_sqlite at Base 1.3.1
++ h_execute_query_mariadb at Base 1.3.1
++ h_execute_query_pgsql at Base 1.3.1
++ h_free at Base 1.3.1
++ h_get_mariadb_value at Base 1.3.1
++ h_insert at Base 1.3.1
++ h_last_insert_id at Base 1.3.1
++ h_last_insert_id_mariadb at Base 1.3.1
++ h_last_insert_id_pgsql at Base 1.3.1
++ h_last_insert_id_sqlite at Base 1.3.1
++ h_new_data_blob at Base 1.3.1
++ h_new_data_datetime at Base 1.3.1
++ h_new_data_double at Base 1.3.1
++ h_new_data_int at Base 1.3.1
++ h_new_data_null at Base 1.3.1
++ h_new_data_text at Base 1.3.1
++ h_query_delete at Base 1.3.1
++ h_query_insert at Base 1.3.1
++ h_query_last_insert_id at Base 1.3.1
++ h_query_select at Base 1.3.1
++ h_query_select_json at Base 1.3.1
++ h_query_update at Base 1.3.1
++ h_result_add_row at Base 1.3.1
++ h_row_add_data at Base 1.3.1
++ h_select at Base 1.3.1
++ h_select_query_sqlite at Base 1.3.1
++ h_update at Base 1.3.1
diff --cc debian/patches/hardening.patch
index e8b5706,0000000..fd299d3
mode 100644,000000..100644
--- a/debian/patches/hardening.patch
+++ b/debian/patches/hardening.patch
@@@ -1,24 -1,0 +1,29 @@@
 +Description: add hardening flags
 +Author: Thorsten Alteholz <debian at alteholz.de>
- Index: hoel-1.2.1/src/Makefile
++Index: hoel-1.3.1/src/Makefile
 +===================================================================
- --- hoel-1.2.1.orig/src/Makefile	2017-10-05 19:32:26.552561322 +0200
- +++ hoel-1.2.1/src/Makefile	2017-10-05 19:32:26.548561181 +0200
- @@ -33,7 +33,7 @@
-  LIBS_PGSQL=-lpq
++--- hoel-1.3.1.orig/src/Makefile	2018-01-22 11:32:35.639338970 +0100
+++++ hoel-1.3.1/src/Makefile	2018-01-28 19:21:07.580147310 +0100
++@@ -36,10 +36,11 @@
++ endif
 + 
 + PREFIX=/usr/local
 +-CFLAGS=-c -fPIC -Wall -I$(PREFIX)/include $(FLAGS_SQLITE) $(FLAGS_MARIADB) $(FLAGS_PGSQL) -D_REENTRANT $(ADDITIONALFLAGS)
 ++CFLAGS+=-c -fPIC -Wall -I$(PREFIX)/include $(FLAGS_SQLITE) $(FLAGS_MARIADB) $(FLAGS_PGSQL) -D_REENTRANT $(ADDITIONALFLAGS) $(CPPFLAGS)
 + LIBS=-L$(PREFIX)/lib -lc -ljansson -lyder -lorcania $(LIBS_SQLITE) $(LIBS_PGSQL) $(LIBS_MARIADB)
 + OUTPUT=libhoel.so
-  VERSION=1.2
- @@ -56,7 +56,7 @@
++-VERSION=1.3.1
+++#VERSION=1.3.1
+++VERSION=1.3
++ 
++ all: release
++ 
++@@ -59,7 +60,7 @@
 + 	$(CC) $(CFLAGS) hoel-simple-json.c
 + 
 + libhoel.so: hoel-sqlite.o hoel-mariadb.o hoel-pgsql.o hoel-simple-json.o hoel.o
 +-	$(CC) -shared -Wl,-soname,$(OUTPUT) -o $(OUTPUT).$(VERSION) hoel-sqlite.o hoel-mariadb.o hoel-pgsql.o hoel-simple-json.o hoel.o $(LIBS)
 ++	$(CC) -shared -Wl,-soname,$(OUTPUT).$(VERSION) -o $(OUTPUT).$(VERSION) hoel-sqlite.o hoel-mariadb.o hoel-pgsql.o hoel-simple-json.o hoel.o $(LIBS) $(LDFLAGS)
 + 	ln -sf $(OUTPUT).$(VERSION) $(OUTPUT)
 + 
 + libhoel.a: hoel-sqlite.o hoel-mariadb.o hoel-pgsql.o hoel-simple-json.o hoel.o

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-iot/hoel.git



More information about the Debian-iot-packaging mailing list