From: Andrea Zagli Date: Sat, 11 Feb 2017 11:08:59 +0000 (+0100) Subject: Debian pkg: added files for wheezy. X-Git-Url: https://saetta.ns0.it/gitweb?a=commitdiff_plain;h=c730321ba9a77d5bed9ba894d1385eadb153c76b;p=zakform%2Fhashtable Debian pkg: added files for wheezy. --- diff --git a/.gitignore b/.gitignore index 8129d06..4298dcb 100644 --- a/.gitignore +++ b/.gitignore @@ -50,3 +50,4 @@ intltool-* Rules-quot *.exe *.csv +build_area \ No newline at end of file diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 0000000..3f648c8 --- /dev/null +++ b/debian/changelog @@ -0,0 +1,16 @@ +libzakformhashtable (0.0.1-2~1.gbp261cb5) UNRELEASED; urgency=medium + + ** SNAPSHOT build @261cb5917e3f8c1d6fbf7810dfa772b6babd2883 ** + + [ Andrea Zagli ] + * Added functions ::load_from_hashtable and ::get_values_as_hashtable. + + [ tux ] + + -- tux Sat, 11 Feb 2017 11:35:59 +0100 + +libzakformhashtable (0.0.1-1) unstable; urgency=medium + + * Initial release (Closes: #nnnn) + + -- Andrea Zagli Sat, 11 Feb 2017 11:30:19 +0100 diff --git a/debian/compat b/debian/compat new file mode 100644 index 0000000..ec63514 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +9 diff --git a/debian/control b/debian/control new file mode 100644 index 0000000..53d4195 --- /dev/null +++ b/debian/control @@ -0,0 +1,24 @@ +Source: libzakformhashtable +Priority: optional +Maintainer: Andrea Zagli +Build-Depends: debhelper (>= 9), intltool, pkg-config, gnome-common, gtk-doc-tools, libzakutils-dev, libzakform-dev +Standards-Version: 3.9.8 +Section: libs +Homepage: +#Vcs-Git: https://anonscm.debian.org/collab-maint/libzakformhashtable.git +#Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/libzakformhashtable.git + +Package: libzakformhashtable-dev +Section: libdevel +Architecture: any +Depends: libzakformhashtable (= ${binary:Version}), ${misc:Depends}, libzakutils-dev, libzakform-dev +Description: Provider for libzakform to interface with GHashTable - development files. + Provider for libzakform to interface with GHashTable. + . + Development files. + +Package: libzakformhashtable +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, libzakutils, libzakform +Description: Provider for libzakform to interface with GHashTable. + Provider for libzakform to interface with GHashTable. diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 0000000..e0044c0 --- /dev/null +++ b/debian/copyright @@ -0,0 +1,38 @@ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: libzakformhashtable +Source: + +Files: * +Copyright: + +License: + + + . + + +# If you want to use GPL v2 or later for the /debian/* files use +# the following clauses, or change it to suit. Delete these two lines +Files: debian/* +Copyright: 2017 Andrea Zagli +License: GPL-2+ + This package is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + . + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + . + You should have received a copy of the GNU General Public License + along with this program. If not, see + . + On Debian systems, the complete text of the GNU General + Public License version 2 can be found in "/usr/share/common-licenses/GPL-2". + +# Please also look if there are files or directories which have a +# different copyright/license attached and list them here. +# Please avoid picking licenses with terms that are more restrictive than the +# packaged work, as it may make Debian's contributions unacceptable upstream. diff --git a/debian/gbp.conf b/debian/gbp.conf new file mode 100644 index 0000000..d3fc6b8 --- /dev/null +++ b/debian/gbp.conf @@ -0,0 +1,10 @@ +[buildpackage] +export-dir=./build_area/wheezy +debian-branch=debian/wheezy +ignore-new=True +upstream-tree=BRANCH +upstream-branch=master +force-create=True +export=WC +dist=wheezy +pbuilder=True diff --git a/debian/libzakformhashtable-dev.install b/debian/libzakformhashtable-dev.install new file mode 100644 index 0000000..7df81cd --- /dev/null +++ b/debian/libzakformhashtable-dev.install @@ -0,0 +1,3 @@ +usr/include/* +usr/lib/*/lib*.so +usr/lib/*/pkgconfig/* diff --git a/debian/libzakformhashtable.install b/debian/libzakformhashtable.install new file mode 100644 index 0000000..3ddde58 --- /dev/null +++ b/debian/libzakformhashtable.install @@ -0,0 +1 @@ +usr/lib/*/lib*.so.* diff --git a/debian/patches/0001-M4-spec.patch b/debian/patches/0001-M4-spec.patch new file mode 100644 index 0000000..49633cb --- /dev/null +++ b/debian/patches/0001-M4-spec.patch @@ -0,0 +1,21 @@ +From: Andrea Zagli +Date: Sat, 11 Feb 2017 11:37:26 +0100 +Subject: M4 spec. + +--- + autogen.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/autogen.sh b/autogen.sh +index 83f5de2..9e5ebc4 100755 +--- a/autogen.sh ++++ b/autogen.sh +@@ -22,7 +22,7 @@ if [ "$#" = 0 -a "x$NOCONFIGURE" = "x" ]; then + fi + + set -x +-aclocal --install || exit 1 ++aclocal --install -I m4 || exit 1 + glib-gettextize --force --copy || exit 1 + #gtkdocize --copy || exit 1 + intltoolize --force --copy --automake || exit 1 diff --git a/debian/patches/0002-Glib-old-gobject-macro.patch b/debian/patches/0002-Glib-old-gobject-macro.patch new file mode 100644 index 0000000..76143aa --- /dev/null +++ b/debian/patches/0002-Glib-old-gobject-macro.patch @@ -0,0 +1,157 @@ +From: Andrea Zagli +Date: Sat, 11 Feb 2017 11:45:09 +0100 +Subject: Glib old gobject macro. + +--- + src/form.c | 28 ++++++++++++---------------- + src/form.h | 24 ++++++++++++++++++++++-- + 2 files changed, 34 insertions(+), 18 deletions(-) + +diff --git a/src/form.c b/src/form.c +index 83c4914..2c1efce 100644 +--- a/src/form.c ++++ b/src/form.c +@@ -57,16 +57,12 @@ typedef struct + GHashTable *ht; + } ZakFormHashtableProviderPrivate; + +-struct _ZakFormHashtableProvider +- { +- GObject parent_instance; +- }; +- + G_DEFINE_TYPE_WITH_CODE (ZakFormHashtableProvider, zak_form_hashtable_provider, G_TYPE_OBJECT, +- G_ADD_PRIVATE (ZakFormHashtableProvider) + G_IMPLEMENT_INTERFACE (ZAK_FORM_TYPE_IPROVIDER, + zak_form_iprovider_interface_init)) + ++#define ZAK_FORM_HASHTABLE_PROVIDER_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), ZAK_FORM_HASHTABLE_TYPE_PROVIDER, ZakFormHashtableProviderPrivate)) ++ + static void + zak_form_hashtable_provider_class_init (ZakFormHashtableProviderClass *class) + { +@@ -81,7 +77,7 @@ zak_form_hashtable_provider_class_init (ZakFormHashtableProviderClass *class) + static void + zak_form_hashtable_provider_init (ZakFormHashtableProvider *zak_form_hashtable_provider) + { +- ZakFormHashtableProviderPrivate *priv = zak_form_hashtable_provider_get_instance_private (zak_form_hashtable_provider); ++ ZakFormHashtableProviderPrivate *priv = ZAK_FORM_HASHTABLE_PROVIDER_GET_PRIVATE (zak_form_hashtable_provider); + + priv->ht = NULL; + } +@@ -108,7 +104,7 @@ ZakFormHashtableProvider + + zak_form_hashtable_provider = ZAK_FORM_HASHTABLE_PROVIDER (g_object_new (zak_form_hashtable_provider_get_type (), NULL)); + +- priv = zak_form_hashtable_provider_get_instance_private (zak_form_hashtable_provider); ++ priv = ZAK_FORM_HASHTABLE_PROVIDER_GET_PRIVATE (zak_form_hashtable_provider); + + priv->ht = g_hash_table_new (g_str_hash, g_str_equal); + +@@ -213,7 +209,7 @@ zak_form_hashtable_provider_set_property (GObject *object, + GParamSpec *pspec) + { + ZakFormHashtableProvider *zak_form_hashtable_provider = (ZakFormHashtableProvider *)object; +- ZakFormHashtableProviderPrivate *priv = zak_form_hashtable_provider_get_instance_private (zak_form_hashtable_provider); ++ ZakFormHashtableProviderPrivate *priv = ZAK_FORM_HASHTABLE_PROVIDER_GET_PRIVATE (zak_form_hashtable_provider); + + switch (property_id) + { +@@ -230,7 +226,7 @@ zak_form_hashtable_provider_get_property (GObject *object, + GParamSpec *pspec) + { + ZakFormHashtableProvider *zak_form_hashtable_provider = (ZakFormHashtableProvider *)object; +- ZakFormHashtableProviderPrivate *priv = zak_form_hashtable_provider_get_instance_private (zak_form_hashtable_provider); ++ ZakFormHashtableProviderPrivate *priv = ZAK_FORM_HASHTABLE_PROVIDER_GET_PRIVATE (zak_form_hashtable_provider); + + switch (property_id) + { +@@ -244,7 +240,7 @@ static void + zak_form_hashtable_provider_dispose (GObject *gobject) + { + ZakFormHashtableProvider *zak_form_hashtable_provider = (ZakFormHashtableProvider *)gobject; +- ZakFormHashtableProviderPrivate *priv = zak_form_hashtable_provider_get_instance_private (zak_form_hashtable_provider); ++ ZakFormHashtableProviderPrivate *priv = ZAK_FORM_HASHTABLE_PROVIDER_GET_PRIVATE (zak_form_hashtable_provider); + + + GObjectClass *parent_class = g_type_class_peek_parent (G_OBJECT_GET_CLASS (gobject)); +@@ -255,7 +251,7 @@ static void + zak_form_hashtable_provider_finalize (GObject *gobject) + { + ZakFormHashtableProvider *zak_form_hashtable_provider = (ZakFormHashtableProvider *)gobject; +- ZakFormHashtableProviderPrivate *priv = zak_form_hashtable_provider_get_instance_private (zak_form_hashtable_provider); ++ ZakFormHashtableProviderPrivate *priv = ZAK_FORM_HASHTABLE_PROVIDER_GET_PRIVATE (zak_form_hashtable_provider); + + + GObjectClass *parent_class = g_type_class_peek_parent (G_OBJECT_GET_CLASS (gobject)); +@@ -273,7 +269,7 @@ static GHashTable + + guint i; + +- ZakFormHashtableProviderPrivate *priv = zak_form_hashtable_provider_get_instance_private (zak_form_hashtable_provider); ++ ZakFormHashtableProviderPrivate *priv = ZAK_FORM_HASHTABLE_PROVIDER_GET_PRIVATE (zak_form_hashtable_provider); + + key = g_string_new (""); + for (i = 0; i < elements->len; i++) +@@ -310,7 +306,7 @@ zak_form_hashtable_provider_load (ZakFormIProvider *provider, GPtrArray *element + + GHashTable *group; + +- ZakFormHashtableProviderPrivate *priv = zak_form_hashtable_provider_get_instance_private (ZAK_FORM_HASHTABLE_PROVIDER (provider)); ++ ZakFormHashtableProviderPrivate *priv = ZAK_FORM_HASHTABLE_PROVIDER_GET_PRIVATE (ZAK_FORM_HASHTABLE_PROVIDER (provider)); + + ret = TRUE; + +@@ -391,7 +387,7 @@ zak_form_hashtable_provider_insert (ZakFormIProvider *provider, GPtrArray *eleme + + GHashTable *group; + +- ZakFormHashtableProviderPrivate *priv = zak_form_hashtable_provider_get_instance_private (ZAK_FORM_HASHTABLE_PROVIDER (provider)); ++ ZakFormHashtableProviderPrivate *priv = ZAK_FORM_HASHTABLE_PROVIDER_GET_PRIVATE (ZAK_FORM_HASHTABLE_PROVIDER (provider)); + + ret = TRUE; + +@@ -426,7 +422,7 @@ zak_form_hashtable_provider_delete (ZakFormIProvider *provider, GPtrArray *eleme + + guint i; + +- ZakFormHashtableProviderPrivate *priv = zak_form_hashtable_provider_get_instance_private (ZAK_FORM_HASHTABLE_PROVIDER (provider)); ++ ZakFormHashtableProviderPrivate *priv = ZAK_FORM_HASHTABLE_PROVIDER_GET_PRIVATE (ZAK_FORM_HASHTABLE_PROVIDER (provider)); + + ret = TRUE; + +diff --git a/src/form.h b/src/form.h +index 0b93d09..b59bf61 100644 +--- a/src/form.h ++++ b/src/form.h +@@ -28,8 +28,28 @@ + G_BEGIN_DECLS + + +-#define ZAK_FORM_HASHTABLE_TYPE_PROVIDER zak_form_hashtable_provider_get_type () +-G_DECLARE_FINAL_TYPE (ZakFormHashtableProvider, zak_form_hashtable_provider, ZAK_FORM_HASHTABLE, PROVIDER, GObject) ++#define ZAK_FORM_HASHTABLE_TYPE_PROVIDER (zak_form_hashtable_provider_get_type ()) ++#define ZAK_FORM_HASHTABLE_PROVIDER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), ZAK_FORM_HASHTABLE_TYPE_PROVIDER, ZakFormHashtableProvider)) ++#define ZAK_FORM_HASHTABLE_PROVIDER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), ZAK_FORM_HASHTABLE_TYPE_PROVIDER, ZakFormHashtableProviderClass)) ++#define ZAK_FORM_HASHTABLE_IS_PROVIDER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ZAK_FORM_HASHTABLE_TYPE_PROVIDER)) ++#define ZAK_FORM_HASHTABLE_IS_PROVIDER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), ZAK_FORM_HASHTABLE_TYPE_PROVIDER)) ++#define ZAK_FORM_HASHTABLE_PROVIDER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), ZAK_FORM_HASHTABLE_TYPE_PROVIDER, ZakFormHashtableProviderClass)) ++ ++typedef struct _ZakFormHashtableProvider ZakFormHashtableProvider; ++typedef struct _ZakFormHashtableProviderClass ZakFormHashtableProviderClass; ++ ++struct _ZakFormHashtableProvider ++{ ++ GObject parent; ++}; ++ ++struct _ZakFormHashtableProviderClass ++{ ++ GObjectClass parent_class; ++}; ++ ++ ++GType zak_form_hashtable_provider_get_type (void) G_GNUC_CONST; + + + ZakFormHashtableProvider *zak_form_hashtable_provider_new (void); diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..bdd9d86 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,2 @@ +0001-M4-spec.patch +0002-Glib-old-gobject-macro.patch diff --git a/debian/rules b/debian/rules new file mode 100755 index 0000000..14552b7 --- /dev/null +++ b/debian/rules @@ -0,0 +1,37 @@ +#!/usr/bin/make -f +# See debhelper(7) (uncomment to enable) +# output every command that modifies files on the build system. +#export DH_VERBOSE = 1 + + +# see FEATURE AREAS in dpkg-buildflags(1) +#export DEB_BUILD_MAINT_OPTIONS = hardening=+all + +# see ENVIRONMENT in dpkg-buildflags(1) +# package maintainers to append CFLAGS +#export DEB_CFLAGS_MAINT_APPEND = -Wall -pedantic +# package maintainers to append LDFLAGS +#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 $@ + + +override_dh_auto_configure: + NOCONFIGURE="X" ./autogen.sh + dh_auto_configure + +override_dh_auto_install: + $(MAKE) DESTDIR=$$(pwd)/debian/tmp prefix=/usr install + + +# dh_make generated override targets +# This is example for Cmake (See https://bugs.debian.org/641051 ) +#override_dh_auto_configure: +# dh_auto_configure -- # -DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH) diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt)