From 833081e89cee870a07eec45a68defd88016e5e74 Mon Sep 17 00:00:00 2001 From: Andrea Zagli Date: Wed, 28 Dec 2016 18:32:06 +0100 Subject: [PATCH] Debian pkg: added files. --- debian/changelog | 10 +++ debian/compat | 1 + debian/control | 32 +++++++++ debian/copyright | 34 ++++++++++ debian/gbp.conf | 10 +++ debian/liborganigramma-dev.install | 3 + debian/liborganigramma.install | 2 + debian/organigramma.install | 1 + ...0001-Useless-gio-dep-in-configure.ac.patch | 22 +++++++ .../0002-Missing-libpq-pkgconfig-file.patch | 65 +++++++++++++++++++ debian/patches/series | 2 + debian/rules | 36 ++++++++++ debian/source/format | 1 + 13 files changed, 219 insertions(+) create mode 100644 debian/changelog create mode 100644 debian/compat create mode 100644 debian/control create mode 100644 debian/copyright create mode 100644 debian/gbp.conf create mode 100644 debian/liborganigramma-dev.install create mode 100644 debian/liborganigramma.install create mode 100644 debian/organigramma.install create mode 100644 debian/patches/0001-Useless-gio-dep-in-configure.ac.patch create mode 100644 debian/patches/0002-Missing-libpq-pkgconfig-file.patch create mode 100644 debian/patches/series create mode 100755 debian/rules create mode 100644 debian/source/format diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 0000000..b94fe53 --- /dev/null +++ b/debian/changelog @@ -0,0 +1,10 @@ +organigramma (0.0.3-1~1.gbp496b92) UNRELEASED; urgency=medium + + ** SNAPSHOT build @496b92993a384c54dfb355d2377374b353c6b94f ** + + [ Andrea Zagli ] + * Initial release + + [ tux ] + + -- Andrea Zagli Wed, 28 Dec 2016 17:06:23 +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..8f45f06 --- /dev/null +++ b/debian/control @@ -0,0 +1,32 @@ +Source: organigramma +Priority: optional +Maintainer: Andrea Zagli +Build-Depends: debhelper (>= 9), intltool, pkg-config, gtk-doc-tools, gnome-common, libgdaex-dev, libgdaexgrid-dev, libsolipa-dev, libgtkform-dev, libzakauthe-dev, libzakautho-dev, libzakutils-dev, libzakconfi-dev, libterritorio-dev, libzakform-dev, libzakformgdaex-dev, libzakformgtkdecoder-dev, libpq-dev +Standards-Version: 3.9.8 +Section: libs +Homepage: http://saetta.ns0.it +#Vcs-Git: https://anonscm.debian.org/collab-maint/organigramma.git +#Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/organigramma.git + +Package: liborganigramma-dev +Section: libdevel +Architecture: any +Depends: liborganigramma (= ${binary:Version}), ${misc:Depends}, libgdaex-dev, libgdaexgrid-dev, libsolipa-dev, libgtkform-dev, libzakauthe-dev, libzakautho-dev, libzakutils-dev, libzakconfi-dev, libterritorio-dev, libzakform-dev, libzakformgdaex-dev, libzakformgtkdecoder-dev, libpq-dev +Description: Libreria gestione organigramma - file di sviluppo. + Libreria gestione organigramma. + . + File di sviluppo. + +Package: liborganigramma +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, libgdaex, libgdaexgrid, libsolipa, libgtkform, libzakauthe, libzakautho, libzakutils, libzakconfi, libterritorio, libzakform, libzakformgdaex, libzakformgtkdecoder, libpq5 +Description: Libreria gestione organigramma. + Libreria gestione organigramma. + . + File di sviluppo. + +Package: organigramma +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, liborganigramma +Description: Gestione organigramma. + Gestione organigramma. diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 0000000..2ef3aa9 --- /dev/null +++ b/debian/copyright @@ -0,0 +1,34 @@ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: organigramma +Source: + +Files: * +Copyright: + +License: GPL-2.0+ + +Files: debian/* +Copyright: 2016 Andrea Zagli +License: GPL-2.0+ + +License: GPL-2.0+ + 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..d1d3e45 --- /dev/null +++ b/debian/gbp.conf @@ -0,0 +1,10 @@ +[buildpackage] +export-dir=../build_area/wheezy/organigramma +debian-branch=debian/wheezy +ignore-new=True +upstream-tree=BRANCH +upstream-branch=zakform +force-create=True +export=WC +dist=wheezy +pbuilder=True diff --git a/debian/liborganigramma-dev.install b/debian/liborganigramma-dev.install new file mode 100644 index 0000000..7df81cd --- /dev/null +++ b/debian/liborganigramma-dev.install @@ -0,0 +1,3 @@ +usr/include/* +usr/lib/*/lib*.so +usr/lib/*/pkgconfig/* diff --git a/debian/liborganigramma.install b/debian/liborganigramma.install new file mode 100644 index 0000000..557e38c --- /dev/null +++ b/debian/liborganigramma.install @@ -0,0 +1,2 @@ +usr/lib/*/lib*.so.* +usr/share/* diff --git a/debian/organigramma.install b/debian/organigramma.install new file mode 100644 index 0000000..e772481 --- /dev/null +++ b/debian/organigramma.install @@ -0,0 +1 @@ +usr/bin diff --git a/debian/patches/0001-Useless-gio-dep-in-configure.ac.patch b/debian/patches/0001-Useless-gio-dep-in-configure.ac.patch new file mode 100644 index 0000000..eb80cbd --- /dev/null +++ b/debian/patches/0001-Useless-gio-dep-in-configure.ac.patch @@ -0,0 +1,22 @@ +From: Andrea Zagli +Date: Wed, 28 Dec 2016 18:33:02 +0100 +Subject: Useless gio dep in configure.ac. + +--- + configure.ac | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 0f1fb0f..07a2c10 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -42,8 +42,7 @@ dnl ****************************** + AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal) + + # Checks for libraries. +-PKG_CHECK_MODULES(ORGANIGRAMMA, [gio-2.0 >= 2.36 +- gtk+-3.0 >= 3.0 ++PKG_CHECK_MODULES(ORGANIGRAMMA, [gtk+-3.0 >= 3.0 + libzakutils + libgdaexgrid + libgtkform >= 0.5.0 diff --git a/debian/patches/0002-Missing-libpq-pkgconfig-file.patch b/debian/patches/0002-Missing-libpq-pkgconfig-file.patch new file mode 100644 index 0000000..8b21a53 --- /dev/null +++ b/debian/patches/0002-Missing-libpq-pkgconfig-file.patch @@ -0,0 +1,65 @@ +From: Andrea Zagli +Date: Wed, 28 Dec 2016 18:52:32 +0100 +Subject: Missing libpq pkgconfig file. + +--- + configure.ac | 3 +-- + liborganigramma.pc.in | 2 +- + libreria/Makefile.am | 3 +++ + src/Makefile.am | 3 +++ + 4 files changed, 8 insertions(+), 3 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 07a2c10..2ccfa59 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -54,8 +54,7 @@ PKG_CHECK_MODULES(ORGANIGRAMMA, [gtk+-3.0 >= 3.0 + libzakconfi >= 0.10.0 + libzakauthe >= 0.5.99 + libzakautho >= 0.0.5 +- libterritorio >= 0.0.1 +- libpq]) ++ libterritorio >= 0.0.1]) + + AC_SUBST(ORGANIGRAMMA_CFLAGS) + AC_SUBST(ORGANIGRAMMA_LIBS) +diff --git a/liborganigramma.pc.in b/liborganigramma.pc.in +index 23d4659..c6ceba8 100644 +--- a/liborganigramma.pc.in ++++ b/liborganigramma.pc.in +@@ -6,6 +6,6 @@ includedir=@includedir@ + Name: @PACKAGE_NAME@ + Description: Libreria con l'interfaccia per la gestione dell'organigramma. + Version: @PACKAGE_VERSION@ +-Requires: libzakutils libgdaex >= 0.5.0 libgtkform >= 0.5.0 libgtkformui >= 0.5.0 libzakform libzakformgtk libzakformgdaex libzakformgtkdecoder libzakconfi libzakauthe libzakautho >= 0.0.5 libsolipa >= 0.5.0 libterritorio libpq ++Requires: libzakutils libgdaex >= 0.5.0 libgtkform >= 0.5.0 libgtkformui >= 0.5.0 libzakform libzakformgtk libzakformgdaex libzakformgtkdecoder libzakconfi libzakauthe libzakautho >= 0.0.5 libsolipa >= 0.5.0 libterritorio + Libs: -L${libdir} -lorganigramma + Cflags: -I${includedir} +diff --git a/libreria/Makefile.am b/libreria/Makefile.am +index 53f9e1f..6f21226 100644 +--- a/libreria/Makefile.am ++++ b/libreria/Makefile.am +@@ -15,6 +15,9 @@ LIBS = $(ORGANIGRAMMA_LIBS) \ + if PLATFORM_WIN32 + AM_CPPFLAGS += -I/programmi/PostgreSQL/8.4/include + LIBS += -L/programmi/PostgreSQL/8.4/lib -lpq ++else ++AM_CPPFLAGS += -I`pg_config --includedir` ++LIBS += -L`pg_config --libdir` -lpq + endif + + lib_LTLIBRARIES = liborganigramma.la +diff --git a/src/Makefile.am b/src/Makefile.am +index c0df1d9..45e26bd 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -14,6 +14,9 @@ LIBS = $(ORGANIGRAMMA_LIBS) \ + if PLATFORM_WIN32 + AM_CPPFLAGS += -I/programmi/PostgreSQL/8.4/include + LIBS += -L/programmi/PostgreSQL/8.4/lib -lpq ++else ++AM_CPPFLAGS += -I`pg_config --includedir` ++LIBS += -L`pg_config --libdir` -lpq + endif + + .rc.o: diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..65a8583 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,2 @@ +0001-Useless-gio-dep-in-configure.ac.patch +0002-Missing-libpq-pkgconfig-file.patch diff --git a/debian/rules b/debian/rules new file mode 100755 index 0000000..d343232 --- /dev/null +++ b/debian/rules @@ -0,0 +1,36 @@ +#!/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) -- 2.49.0