fix: update debian packaging thingies
authorFelix Dörre <felix@dogcraft.de>
Sun, 2 Nov 2014 01:10:28 +0000 (02:10 +0100)
committerJanis Streib <janis@dogcraft.de>
Wed, 31 Dec 2014 01:35:58 +0000 (02:35 +0100)
debian/cacert-gigi.default.ex [deleted file]
debian/cacert-gigi.manpages [new file with mode: 0644]
debian/changelog
debian/config [deleted file]
debian/copyright
debian/postinst
debian/postrm [deleted file]
debian/prerm [deleted file]
debian/rules

diff --git a/debian/cacert-gigi.default.ex b/debian/cacert-gigi.default.ex
deleted file mode 100644 (file)
index 8df1ebc..0000000
+++ /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 (file)
index 0000000..3de344b
--- /dev/null
@@ -0,0 +1 @@
+debian/gigi.1
index fd6df6241e8c2bc776befbf644b09e52a975ddd5..cc57cffefd31a635a53ed07c0cdc071e57d512ac 100644 (file)
@@ -1,5 +1,5 @@
-cacert-gigi (0.1-1) unstable; urgency=low
+cacert-gigi (0.1) unstable; urgency=low
 
-  * Initial release (Closes: #nnnn)  <nnnn is the bug number of your ITP>
+  * Initial Release
 
- -- unknown <software@cacert.org>  Thu, 25 Sep 2014 03:19:20 +0200
+ -- CAcert Software Team <cacert-devel@cacert.org>  Thu, 25 Sep 2014 03:19:20 +0200
diff --git a/debian/config b/debian/config
deleted file mode 100644 (file)
index 2d6fc0f..0000000
+++ /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
index 43b8910fc8b02638c82af11bfe8d5cd7b1b036bd..41df19d298856351b29d71d4c8d6fbce1a67a16a 100644 (file)
@@ -1,21 +1,16 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: cacert-gigi
-Source: <url://example.com>
+Upstream-Name: gigi
+Source: <https://github.com/CAcertOrg/cacert-gigi>
 
 Files: *
-Copyright: <years> <put author's name and email here>
-           <years> <likewise for another author>
-License: <special license>
- <Put the license of the package here indented by 1 space>
- <This follows the format of Description: lines in control file>
- .
- <Including paragraphs>
+Copyright: 2014 CAcert Software Team <cacert-devel@cacert.org>
+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 <software@cacert.org>
-License: GPL-2+
+Copyright: 2014 CAcert Software Team <cacert-devel@cacert.org>
+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.
index 4f0ed02f6739fc60e34bf289c6d65048fdebf8fb..3a7ec742a9fef707348360bc016d1661439d4b7a 100644 (file)
@@ -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 (file)
index e3f6be2..0000000
+++ /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:
-#        * <postrm> `remove'
-#        * <postrm> `purge'
-#        * <old-postrm> `upgrade' <new-version>
-#        * <new-postrm> `failed-upgrade' <old-version>
-#        * <new-postrm> `abort-install'
-#        * <new-postrm> `abort-install' <old-version>
-#        * <new-postrm> `abort-upgrade' <old-version>
-#        * <disappearer's-postrm> `disappear' <overwriter>
-#          <overwriter-version>
-# 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 (file)
index a76ef63..0000000
+++ /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:
-#        * <prerm> `remove'
-#        * <old-prerm> `upgrade' <new-version>
-#        * <new-prerm> `failed-upgrade' <old-version>
-#        * <conflictor's-prerm> `remove' `in-favour' <package> <new-version>
-#        * <deconfigured's-prerm> `deconfigure' `in-favour'
-#          <package-being-installed> <version> `removing'
-#          <conflicting-package> <version>
-# 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
index d131bd4981f9602158505fd24d7067fc8ea05325..aaab80c600293369b589372713e331691eef67d7 100755 (executable)
@@ -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