# HG changeset patch # User Heiko Schlittermann (JUMPER) # Date 1420453915 -3600 # Node ID 4e18894dec80c9d7b8776b4a2eb021e8d817e8ab # Parent 425d7c20e50902b3a8e77b672e1954b6606aaa2a# Parent 0806cdb507286297dc87bb6b398dc63e272f453a [merged] from older revision diff -r 425d7c20e509 -r 4e18894dec80 debian/changelog diff -r 425d7c20e509 -r 4e18894dec80 debian/conffiles.ex --- a/debian/conffiles.ex Mon Jan 05 11:23:32 2015 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,7 +0,0 @@ -# -# If you want to use this conffile, remove all comments and put files that -# you want dpkg to process here using their absolute pathnames. -# See the policy manual -# -# for example: -# /etc/logbuch/logbuch.conf diff -r 425d7c20e509 -r 4e18894dec80 debian/control diff -r 425d7c20e509 -r 4e18894dec80 debian/copyright --- a/debian/copyright Mon Jan 05 11:23:32 2015 +0100 +++ b/debian/copyright Mon Jan 05 11:31:55 2015 +0100 @@ -3,4 +3,4 @@ Copyright: (C) 2011-205 Heiko Schlittermann License: GNU Public License v3 or newer. -See /usr/share/common-licenses/GPL-3 for more information. +Upstream Author: Heiko Schlittermann diff -r 425d7c20e509 -r 4e18894dec80 debian/cron.d.ex --- a/debian/cron.d.ex Mon Jan 05 11:23:32 2015 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,4 +0,0 @@ -# -# Regular cron jobs for the logbuch package -# -0 4 * * * root logbuch_maintenance diff -r 425d7c20e509 -r 4e18894dec80 debian/init.d.ex --- a/debian/init.d.ex Mon Jan 05 11:23:32 2015 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,70 +0,0 @@ -#! /bin/sh -# -# skeleton example file to build /etc/init.d/ scripts. -# This file should be used to construct scripts for /etc/init.d. -# -# Written by Miquel van Smoorenburg . -# Modified for Debian GNU/Linux -# by Ian Murdock . -# -# Version: @(#)skeleton 1.8 03-Mar-1998 miquels@cistron.nl -# -# This file was automatically customized by dh-make on Fri, 4 Apr 2003 10:03:49 +0200 - -PATH=/sbin:/bin:/usr/sbin:/usr/bin -DAEMON=/usr/sbin/logbuch -NAME=logbuch -DESC=logbuch - -test -f $DAEMON || exit 0 - -set -e - -case "$1" in - start) - echo -n "Starting $DESC: " - start-stop-daemon --start --quiet --pidfile /var/run/$NAME.pid \ - --exec $DAEMON - echo "$NAME." - ;; - stop) - echo -n "Stopping $DESC: " - start-stop-daemon --oknodo --stop --quiet --pidfile /var/run/$NAME.pid \ - --exec $DAEMON - echo "$NAME." - ;; - #reload) - # - # If the daemon can reload its config files on the fly - # for example by sending it SIGHUP, do it here. - # - # If the daemon responds to changes in its config file - # directly anyway, make this a do-nothing entry. - # - # echo "Reloading $DESC configuration files." - # start-stop-daemon --stop --signal 1 --quiet --pidfile \ - # /var/run/$NAME.pid --exec $DAEMON - #;; - restart|force-reload) - # - # If the "reload" option is implemented, move the "force-reload" - # option to the "reload" entry above. If not, "force-reload" is - # just the same as "restart". - # - echo -n "Restarting $DESC: " - start-stop-daemon --stop --quiet --pidfile \ - /var/run/$NAME.pid --exec $DAEMON - sleep 1 - start-stop-daemon --start --quiet --pidfile \ - /var/run/$NAME.pid --exec $DAEMON - echo "$NAME." - ;; - *) - N=/etc/init.d/$NAME - # echo "Usage: $N {start|stop|restart|reload|force-reload}" >&2 - echo "Usage: $N {start|stop|restart|force-reload}" >&2 - exit 1 - ;; -esac - -exit 0 diff -r 425d7c20e509 -r 4e18894dec80 debian/logbuch.manpages --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/debian/logbuch.manpages Mon Jan 05 11:31:55 2015 +0100 @@ -0,0 +1,1 @@ +log.8 diff -r 425d7c20e509 -r 4e18894dec80 debian/manpage.1.ex --- a/debian/manpage.1.ex Mon Jan 05 11:23:32 2015 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,60 +0,0 @@ -.\" Hey, EMACS: -*- nroff -*- -.\" First parameter, NAME, should be all caps -.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection -.\" other parameters are allowed: see man(7), man(1) -.TH LOGBUCH SECTION "April 4, 2003" -.\" Please adjust this date whenever revising the manpage. -.\" -.\" Some roff macros, for reference: -.\" .nh disable hyphenation -.\" .hy enable hyphenation -.\" .ad l left justify -.\" .ad b justify to both left and right margins -.\" .nf disable filling -.\" .fi enable filling -.\" .br insert line break -.\" .sp insert n+1 empty lines -.\" for manpage-specific macros, see man(7) -.SH NAME -logbuch \- program to do something -.SH SYNOPSIS -.B logbuch -.RI [ options ] " files" ... -.br -.B bar -.RI [ options ] " files" ... -.SH DESCRIPTION -This manual page documents briefly the -.B logbuch -and -.B bar -commands. -This manual page was written for the Debian distribution -because the original program does not have a manual page. -Instead, it has documentation in the GNU Info format; see below. -.PP -.\" TeX users may be more comfortable with the \fB\fP and -.\" \fI\fP escape sequences to invode bold face and italics, -.\" respectively. -\fBlogbuch\fP is a program that... -.SH OPTIONS -These programs follow the usual GNU command line syntax, with long -options starting with two dashes (`-'). -A summary of options is included below. -For a complete description, see the Info files. -.TP -.B \-h, \-\-help -Show summary of options. -.TP -.B \-v, \-\-version -Show version of program. -.SH SEE ALSO -.BR bar (1), -.BR baz (1). -.br -The programs are documented fully by -.IR "The Rise and Fall of a Fooish Bar" , -available via the Info system. -.SH AUTHOR -This manual page was written by Heiko Schlittermann , -for the Debian GNU/Linux system (but may be used by others). diff -r 425d7c20e509 -r 4e18894dec80 debian/manpage.sgml.ex --- a/debian/manpage.sgml.ex Mon Jan 05 11:23:32 2015 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,152 +0,0 @@ - manpage.1'. You may view - the manual page with: `docbook-to-man manpage.sgml | nroff -man | - less'. A typical entry in a Makefile or Makefile.am is: - -manpage.1: manpage.sgml - docbook-to-man $< > $@ - - - The docbook-to-man binary is found in the docbook-to-man package. - Please remember that if you create the nroff version in one of the - debian/rules file targets (such as build), you will need to include - docbook-to-man in your Build-Depends control field. - - --> - - - FIRSTNAME"> - SURNAME"> - - April 4, 2003"> - - SECTION"> - heiko@schlittermann.de"> - - LOGBUCH"> - - - Debian"> - GNU"> -]> - - - -
- &dhemail; -
- - &dhfirstname; - &dhsurname; - - - 2001 - &dhusername; - - &dhdate; - - - &dhucpackage; - - &dhsection; - - - &dhpackage; - - program to do something - - - - &dhpackage; - - - - - - - - DESCRIPTION - - This manual page documents briefly the - &dhpackage; and bar - commands. - - This manual page was written for the &debian; distribution - because the original program does not have a manual page. - Instead, it has documentation in the &gnu; - Info format; see below. - - &dhpackage; is a program that... - - - - OPTIONS - - These programs follow the usual GNU command line syntax, - with long options starting with two dashes (`-'). A summary of - options is included below. For a complete description, see the - Info files. - - - - - - - - Show summary of options. - - - - - - - - Show version of program. - - - - - - SEE ALSO - - bar (1), baz (1). - - The programs are documented fully by The Rise and - Fall of a Fooish Bar available via the - Info system. - - - AUTHOR - - This manual page was written by &dhusername; &dhemail; for - the &debian; system (but may be used by others). Permission is - granted to copy, distribute and/or modify this document under - the terms of the GNU Free Documentation - License, Version 1.1 or any later version published by the Free - Software Foundation; with no Invariant Sections, no Front-Cover - Texts and no Back-Cover Texts. - - - - - - - diff -r 425d7c20e509 -r 4e18894dec80 debian/menu.ex --- a/debian/menu.ex Mon Jan 05 11:23:32 2015 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -?package(logbuch):needs=X11|text|vc|wm section=Apps/see-menu-manual\ - title="logbuch" command="/usr/bin/logbuch" diff -r 425d7c20e509 -r 4e18894dec80 debian/postinst.ex --- a/debian/postinst.ex Mon Jan 05 11:23:32 2015 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,48 +0,0 @@ -#! /bin/sh -# postinst script for logbuch -# -# see: dh_installdeb(1) - -set -e - -# summary of how this script can be called: -# * `configure' -# * `abort-upgrade' -# * `abort-remove' `in-favour' -# -# * `abort-deconfigure' `in-favour' -# `removing' -# -# for details, see http://www.debian.org/doc/debian-policy/ or -# the debian-policy package -# -# quoting from the policy: -# Any necessary prompting should almost always be confined to the -# post-installation script, and should be protected with a conditional -# so that unnecessary prompting doesn't happen if a package's -# installation fails and the `postinst' is called with `abort-upgrade', -# `abort-remove' or `abort-deconfigure'. - -case "$1" in - configure) - - ;; - - abort-upgrade|abort-remove|abort-deconfigure) - - ;; - - *) - echo "postinst 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 -r 425d7c20e509 -r 4e18894dec80 debian/postrm.ex --- a/debian/postrm.ex Mon Jan 05 11:23:32 2015 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,38 +0,0 @@ -#! /bin/sh -# postrm script for logbuch -# -# 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' overwrit>r> -# 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 - -# dh_installdeb will replace this with shell code automatically -# generated by other debhelper scripts. - -#DEBHELPER# - -exit 0 diff -r 425d7c20e509 -r 4e18894dec80 debian/preinst --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/debian/preinst Mon Jan 05 11:31:55 2015 +0100 @@ -0,0 +1,39 @@ +#! /bin/sh +# preinst script for logbuch +# +# see: dh_installdeb(1) + +set -e + +case "$1" in + install|upgrade) + if [ -n "$2" ] && \ + dpkg --compare-versions "$2" le "0.39" && \ + [ -f /etc/logbuch/config.pm ]; then + dirs=$(perl -e 'use lib "/etc/logbuch"; use config; print join " ", @config::notify_dirs'); + if [ -n "$dirs" ]; then + for d in "$dirs"; do + if [ -d $d/.hg ]; then + chmod -R go= $d/.hg + else + echo "Warning: '$d/.hg' is not a directory" >&2 + fi + done + fi + fi + ;; + + abort-upgrade) + ;; + + *) + echo "preinst called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +#DEBHELPER# + +exit 0 + + diff -r 425d7c20e509 -r 4e18894dec80 debian/preinst.ex --- a/debian/preinst.ex Mon Jan 05 11:23:32 2015 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,44 +0,0 @@ -#! /bin/sh -# preinst script for logbuch -# -# see: dh_installdeb(1) - -set -e - -# summary of how this script can be called: -# * `install' -# * `install' -# * `upgrade' -# * `abort-upgrade' -# -# for details, see http://www.debian.org/doc/debian-policy/ or -# the debian-policy package - - -case "$1" in - install|upgrade) -# if [ "$1" = "upgrade" ] -# then -# start-stop-daemon --stop --quiet --oknodo \ -# --pidfile /var/run/logbuch.pid \ -# --exec /usr/sbin/logbuch 2>/dev/null || true -# fi - ;; - - abort-upgrade) - ;; - - *) - echo "preinst 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 -r 425d7c20e509 -r 4e18894dec80 debian/prerm.ex --- a/debian/prerm.ex Mon Jan 05 11:23:32 2015 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,39 +0,0 @@ -#! /bin/sh -# prerm script for logbuch -# -# 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 - - -case "$1" in - remove|upgrade|deconfigure) -# install-info --quiet --remove /usr/info/logbuch.info.gz - ;; - 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 -r 425d7c20e509 -r 4e18894dec80 debian/rules --- a/debian/rules Mon Jan 05 11:23:32 2015 +0100 +++ b/debian/rules Mon Jan 05 11:31:55 2015 +0100 @@ -14,7 +14,3 @@ override_dh_auto_install: $(MAKE) prefix=/usr DESTDIR=debian/logbuch install - -override_dh_installman: - dh_installman - diff -r 425d7c20e509 -r 4e18894dec80 debian/watch.ex --- a/debian/watch.ex Mon Jan 05 11:23:32 2015 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,5 +0,0 @@ -# Example watch control file for uscan -# Rename this file to "watch" and then you can run the "uscan" command -# to check for upstream updates and more. -# Site Directory Pattern Version Script -sunsite.unc.edu /pub/Linux/Incoming logbuch-(.*)\.tar\.gz debian uupdate diff -r 425d7c20e509 -r 4e18894dec80 log.pl --- a/log.pl Mon Jan 05 11:23:32 2015 +0100 +++ b/log.pl Mon Jan 05 11:31:55 2015 +0100 @@ -129,14 +129,22 @@ } if ($opt_initdir) { + my $repo = Logbuch::HG->new(repo => $opt_initdir); $repo->is_repository() and die "$ME: directory already initialized, skipping\n"; + # any repository is likely to contain sensitive data somewhere + my $umask = umask 0077 + or die "$ME: Can't set umask: $!"; + $repo->init() or die "E: initialization failed\n"; + umask $umask + or warn "$ME: Can't restore umask: $!"; + $repo->addremove(); $repo->commit("initial check in");