From: Felix Dörre Date: Sun, 2 Nov 2014 01:10:28 +0000 (+0100) Subject: fix: update debian packaging thingies X-Git-Url: https://code.wpia.club/?p=gigi.git;a=commitdiff_plain;h=ea934ea5c79f73528d034e867f0171f0abfd67f0 fix: update debian packaging thingies --- diff --git a/debian/cacert-gigi.default.ex b/debian/cacert-gigi.default.ex deleted file mode 100644 index 8df1ebc7..00000000 --- a/debian/cacert-gigi.default.ex +++ /dev/null @@ -1,10 +0,0 @@ -# Defaults for cacert-gigi initscript -# sourced by /etc/init.d/cacert-gigi -# installed at /etc/default/cacert-gigi by the maintainer scripts - -# -# This is a POSIX shell fragment -# - -# Additional options that are passed to the Daemon. -DAEMON_OPTS="" diff --git a/debian/cacert-gigi.manpages b/debian/cacert-gigi.manpages new file mode 100644 index 00000000..3de344bc --- /dev/null +++ b/debian/cacert-gigi.manpages @@ -0,0 +1 @@ +debian/gigi.1 diff --git a/debian/changelog b/debian/changelog index fd6df624..cc57cffe 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,5 @@ -cacert-gigi (0.1-1) unstable; urgency=low +cacert-gigi (0.1) unstable; urgency=low - * Initial release (Closes: #nnnn) + * Initial Release - -- unknown Thu, 25 Sep 2014 03:19:20 +0200 + -- CAcert Software Team Thu, 25 Sep 2014 03:19:20 +0200 diff --git a/debian/config b/debian/config deleted file mode 100644 index 2d6fc0f0..00000000 --- a/debian/config +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh - -set -e - -# source debconf stuff -. /usr/share/debconf/confmodule -# source dbconfig-common shell library, and call the hook function -#if [ -f /usr/share/dbconfig-common/dpkg/config.mysql ]; then -# . /usr/share/dbconfig-common/dpkg/config.mysql -# dbc_go cacert-gigi $@ -#fi diff --git a/debian/copyright b/debian/copyright index 43b8910f..41df19d2 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,21 +1,16 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ -Upstream-Name: cacert-gigi -Source: +Upstream-Name: gigi +Source: Files: * -Copyright: - -License: - - - . - +Copyright: 2014 CAcert Software Team +License: GPL-2.0+ -# 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: 2014 unknown -License: GPL-2+ +Copyright: 2014 CAcert Software Team +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 @@ -31,8 +26,3 @@ License: GPL-2+ . 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 to pick license terms that are more restrictive than the -# packaged work, as it may make Debian's contributions unacceptable upstream. diff --git a/debian/postinst b/debian/postinst index 4f0ed02f..3a7ec742 100644 --- a/debian/postinst +++ b/debian/postinst @@ -31,13 +31,9 @@ case "$1" in ;; esac -#. /usr/share/debconf/confmodule -#. /usr/share/dbconfig-common/dpkg/postinst.mysql - -# you can set the default database encoding to something else -#dbc_mysql_createdb_encoding="UTF8" -#dbc_generate_include=sh:/etc/cacert-gigi/debian-db.sh -#dbc_go cacert-gigi $@ +if [ -f /usr/share/debconf/confmodule ]; then + . /usr/share/debconf/confmodule +fi gigi fetch-locales diff --git a/debian/postrm b/debian/postrm deleted file mode 100644 index e3f6be28..00000000 --- a/debian/postrm +++ /dev/null @@ -1,54 +0,0 @@ -#!/bin/sh -# postrm script for cacert-gigi -# -# see: dh_installdeb(1) - -set -e - -# summary of how this script can be called: -# * `remove' -# * `purge' -# * `upgrade' -# * `failed-upgrade' -# * `abort-install' -# * `abort-install' -# * `abort-upgrade' -# * `disappear' -# -# for details, see http://www.debian.org/doc/debian-policy/ or -# the debian-policy package - - -case "$1" in - purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) - ;; - - *) - echo "postrm called with unknown argument \`$1'" >&2 - exit 1 - ;; -esac - -#if [ -f /usr/share/debconf/confmodule ]; then -# . /usr/share/debconf/confmodule -#fi -#if [ -f /usr/share/dbconfig-common/dpkg/postrm.mysql ]; then -# . /usr/share/dbconfig-common/dpkg/postrm.mysql -# dbc_go cacert-gigi $@ -#fi - - -#if [ "$1" = "purge" ]; then -# rm -f /etc/cacert-gigi/debian-db.sh -# if which ucf >/dev/null 2>&1; then -# ucf --purge /etc/cacert-gigi/debian-db.sh -# ucfr --purge cacert-gigi /etc/cacert-gigi/debian-db.sh -# fi -#fi - -# dh_installdeb will replace this with shell code automatically -# generated by other debhelper scripts. - -#DEBHELPER# - -exit 0 diff --git a/debian/prerm b/debian/prerm deleted file mode 100644 index a76ef631..00000000 --- a/debian/prerm +++ /dev/null @@ -1,46 +0,0 @@ -#!/bin/sh -# prerm script for cacert-gigi -# -# see: dh_installdeb(1) - -set -e - -# summary of how this script can be called: -# * `remove' -# * `upgrade' -# * `failed-upgrade' -# * `remove' `in-favour' -# * `deconfigure' `in-favour' -# `removing' -# -# for details, see http://www.debian.org/doc/debian-policy/ or -# the debian-policy package - -#. /usr/share/debconf/confmodule -#. /usr/share/dbconfig-common/dpkg/prerm.mysql -#dbc_go cacert-gigi $@ - - -case "$1" in - remove) - ;; - - upgrade|deconfigure) - ;; - - failed-upgrade) - ;; - - *) - echo "prerm called with unknown argument \`$1'" >&2 - exit 1 - ;; -esac - -# dh_installdeb will replace this with shell code automatically -# generated by other debhelper scripts. - - -#DEBHELPER# - -exit 0 diff --git a/debian/rules b/debian/rules index d131bd49..aaab80c6 100755 --- a/debian/rules +++ b/debian/rules @@ -13,17 +13,26 @@ build: override_dh_auto_clean: echo i dont clean +override_dh_installinit: + dh_installinit --name=cacert-gigi + dh_installinit --name=cacert-gigi-signer -binary: - dh_testdir - dh_testroot +override_dh_auto_build: build + +override_dh_auto_install: DESTDIR=debian/cacert-gigi ant install DESTDIR=debian/cacert-gigi-setuid ant install-native + +binarya: + dh_testdir + dh_testroot dh_installman debian/gigi.1 dh_installdebconf dh_installchangelogs dh_installinit --name=cacert-gigi dh_installinit --name=cacert-gigi-signer + dh_installdocs + dh_strip dh_shlibdeps dh_compress dh_fixperms