[Debian-iot-packaging] [hoel] 02/02: Import Debian changes 1.1.2-1
Thorsten Alteholz
alteholz at moszumanska.debian.org
Sun Sep 3 16:41:53 UTC 2017
This is an automated email from the git hooks/post-receive script.
alteholz pushed a commit to branch master
in repository hoel.
commit f7091c11c70dbbf46f6a73c96968e65be2e9c44b
Merge: 40e444e 3443cbb
Author: Thorsten Alteholz <debian at alteholz.de>
Date: Sat Sep 2 17:17:33 2017 +0200
Import Debian changes 1.1.2-1
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
debian/changelog | 14 +-
debian/control | 8 +-
debian/patches/activate-db.patch | 21 +-
.../{activate-db.patch => activate-db.patch.old} | 0
debian/patches/hardening.patch | 10 +-
examples/Makefile | 2 +-
src/Makefile | 33 +-
src/h-private.h | 59 ++
src/hoel-mariadb.c | 1 +
src/hoel-pgsql.c | 1 +
src/hoel-simple-json.c | 1006 ++++++++++----------
src/hoel-sqlite.c | 1 +
src/hoel.c | 27 +-
src/hoel.h | 62 +-
14 files changed, 630 insertions(+), 615 deletions(-)
diff --cc debian/changelog
index e634f4c,0000000..4ea8a77
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,7 -1,0 +1,15 @@@
++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 (Closes: #123456)
- * TODO: ITP
- * TODO: debian/copyright
++ * Initial release
+
+ -- Thorsten Alteholz <debian at alteholz.de> Tue, 18 Jul 2017 14:32:33 +0200
diff --cc debian/control
index 018bbe4,0000000..3cce46f
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,42 -1,0 +1,42 @@@
+Source: hoel
+Section: devel
+Priority: optional
+Maintainer: Thorsten Alteholz <debian at alteholz.de>
+Build-Depends: debhelper (>= 10)
+ , liborcania-dev
+ , libyder-dev
+ , libjansson-dev
+ , libsqlite3-dev
+ , libpq-dev
+ , libmariadbclient-dev
- Standards-Version: 4.0.0
- Homepage: https://github.com/babelouest/yder
- #Vcs-Git: https://anonscm.debian.org/collab-maint/oauth2-server.git
- #Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/oauth2-server.git
++Standards-Version: 4.1.0
++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.1
+Architecture: any
+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
+ language with jansson to execute simples queries based on one table.
+
+Package: libhoel-dev
+Architecture: any
+Section: libdevel
+Depends: libhoel1.1 (= ${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
+ language with jansson to execute simples queries based on one table.
+ .
+ This package contains the development files.
diff --cc debian/patches/activate-db.patch
index a9ea34c,0000000..6c1a7d2
mode 100644,000000..100644
--- a/debian/patches/activate-db.patch
+++ b/debian/patches/activate-db.patch
@@@ -1,26 -1,0 +1,17 @@@
+Description: use sqlite as well
+Author: Thorsten Alteholz <debian at alteholz.de>
- Index: hoel-1.1/src/Makefile
++Index: hoel-1.1.2/src/Makefile
+===================================================================
- --- hoel-1.1.orig/src/Makefile 2017-05-27 02:06:41.000000000 +0200
- +++ hoel-1.1/src/Makefile 2017-07-25 13:55:04.662410701 +0200
- @@ -24,13 +24,14 @@
- FLAGS_SQLITE=-D_HOEL_SQLITE
- LIBS_SQLITE=-lsqlite3
++--- hoel-1.1.2.orig/src/Makefile 2017-09-03 12:48:33.213390633 +0200
+++++ hoel-1.1.2/src/Makefile 2017-09-03 12:48:47.950054099 +0200
++@@ -29,8 +29,8 @@
++ LIBS_MARIADB=$(shell mysql_config --libs)
+
- -# uncomment these lines if you want sqlite support
- +# uncomment these lines if you want mariadb support
- FLAGS_MARIADB=-D_HOEL_MARIADB -I/usr/include/mysql/
- -LIBS_MARIADB=-lmysqlclient
- +#LIBS_MARIADB=-lmysqlclient
- +LIBS_MARIADB=-lmariadbclient
-
- -# uncomment these lines if you want sqlite support
++ # comment/uncomment these lines to disable/enable postgresql support
+-# FLAGS_PGSQL=-D_HOEL_PGSQL -I/usr/include/postgresql/
+-# LIBS_PGSQL=-lpq
- +# uncomment these lines if you want postgresql support
++FLAGS_PGSQL=-D_HOEL_PGSQL -I/usr/include/postgresql/
++LIBS_PGSQL=-lpq
+
+ PREFIX=/usr/local
+ CFLAGS=-c -fPIC -Wall -I$(PREFIX)/include $(FLAGS_SQLITE) $(FLAGS_MARIADB) $(FLAGS_PGSQL) -D_REENTRANT $(ADDITIONALFLAGS)
diff --cc debian/patches/activate-db.patch.old
index a9ea34c,0000000..a9ea34c
mode 100644,000000..100644
--- a/debian/patches/activate-db.patch.old
+++ b/debian/patches/activate-db.patch.old
diff --cc debian/patches/hardening.patch
index bb1c780,0000000..8337cb6
mode 100644,000000..100644
--- a/debian/patches/hardening.patch
+++ b/debian/patches/hardening.patch
@@@ -1,24 -1,0 +1,24 @@@
+Description: add hardening flags
+Author: Thorsten Alteholz <debian at alteholz.de>
- Index: hoel-1.1/src/Makefile
++Index: hoel-1.1.2/src/Makefile
+===================================================================
- --- hoel-1.1.orig/src/Makefile 2017-07-19 10:04:37.292957024 +0200
- +++ hoel-1.1/src/Makefile 2017-07-19 10:13:43.245858548 +0200
++--- hoel-1.1.2.orig/src/Makefile 2017-09-03 12:49:31.484014093 +0200
+++++ hoel-1.1.2/src/Makefile 2017-09-03 12:49:31.480013913 +0200
+@@ -33,7 +33,7 @@
+ LIBS_PGSQL=-lpq
+
+ 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.1
++ VERSION=1.1.1
+@@ -56,7 +56,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)
+
- clean:
++ 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