[26945] in Source-Commits
Re: /svn/athena r25844 - in trunk/debathena/debathena/config-package-dev: . Debian Debian/Debhelper Debian/Debhelper/Sequence debian debian/source examples examples/cdbs examples/cdbs/debathena-bin-example-1.0/debian examples/cdbs/debathena-bin-example-1.1/debian examples/cdbs/debathena-conffile-example-1.0/debian examples/cdbs/debathena-conffile-example-1.1 examples/cdbs/debathena-conff
daemon@ATHENA.MIT.EDU (Jonathan Reed)
Fri Mar 8 10:40:06 2013
Mime-Version: 1.0 (Apple Message framework v1084)
Content-Type: text/plain; charset=windows-1252
From: Jonathan Reed <jdreed@MIT.EDU>
In-Reply-To: <201303072259.r27MxsKb032227@drugstore.mit.edu>
Date: Fri, 8 Mar 2013 10:39:56 -0500
Cc: source-commits@MIT.EDU
Message-Id: <2787791D-7CE8-471E-855A-497ABC893029@mit.edu>
To: Geoffrey Thomas <geofft@MIT.EDU>
Content-Transfer-Encoding: 8bit
ACK, pending a few missed renames in documentation (but not anywhere important and with no introduction of ambiguity). I'll file a separate ticket for that.
-Jon
On Mar 7, 2013, at 5:59 PM, Geoffrey Thomas wrote:
> Author: geofft
> Date: 2013-03-07 17:59:53 -0500 (Thu, 07 Mar 2013)
> New Revision: 25844
>
> Added:
> trunk/debathena/debathena/config-package-dev/Debian/
> trunk/debathena/debathena/config-package-dev/Debian/Debhelper/
> trunk/debathena/debathena/config-package-dev/Debian/Debhelper/Sequence/
> trunk/debathena/debathena/config-package-dev/Debian/Debhelper/Sequence/config_package.pm
> trunk/debathena/debathena/config-package-dev/Debian/Debhelper/config_package.pm
> trunk/debathena/debathena/config-package-dev/debian/config-package-dev.manpages
> trunk/debathena/debathena/config-package-dev/debian/source/
> trunk/debathena/debathena/config-package-dev/debian/source/format
> trunk/debathena/debathena/config-package-dev/dh_configpackage
> trunk/debathena/debathena/config-package-dev/displace.mk
> trunk/debathena/debathena/config-package-dev/displace.sh.in
> trunk/debathena/debathena/config-package-dev/examples/cdbs/
> trunk/debathena/debathena/config-package-dev/examples/cdbs/debathena-bin-example-1.0/
> trunk/debathena/debathena/config-package-dev/examples/cdbs/debathena-bin-example-1.1/
> trunk/debathena/debathena/config-package-dev/examples/cdbs/debathena-conffile-example-1.0/
> trunk/debathena/debathena/config-package-dev/examples/cdbs/debathena-conffile-example-1.1/
> trunk/debathena/debathena/config-package-dev/examples/cdbs/debathena-conffile-example-1.1/debian/
> trunk/debathena/debathena/config-package-dev/examples/cdbs/debathena-conffile-example-1.1/debian/changelog
> trunk/debathena/debathena/config-package-dev/examples/cdbs/debathena-conffile-example-1.1/debian/compat
> trunk/debathena/debathena/config-package-dev/examples/cdbs/debathena-conffile-example-1.1/debian/control
> trunk/debathena/debathena/config-package-dev/examples/cdbs/debathena-conffile-example-1.1/debian/control.in
> trunk/debathena/debathena/config-package-dev/examples/cdbs/debathena-conffile-example-1.1/debian/copyright
> trunk/debathena/debathena/config-package-dev/examples/cdbs/debathena-conffile-example-1.1/debian/debathena-conffile-example.install
> trunk/debathena/debathena/config-package-dev/examples/cdbs/debathena-conffile-example-1.1/debian/rules
> trunk/debathena/debathena/config-package-dev/examples/cdbs/debathena-conffile-example-1.1/debian/transform_legal.debathena
> trunk/debathena/debathena/config-package-dev/examples/cdbs/debathena-conffile-example-1.1/files/
> trunk/debathena/debathena/config-package-dev/examples/cdbs/debathena-conffile-example-1.1/files/etc/
> trunk/debathena/debathena/config-package-dev/examples/cdbs/debathena-conffile-example-1.1/files/etc/issue.net.debathena
> trunk/debathena/debathena/config-package-dev/examples/cdbs/debathena-cron-example-1.0/
> trunk/debathena/debathena/config-package-dev/examples/cdbs/debathena-transform-example-1.0/
> trunk/debathena/debathena/config-package-dev/examples/debhelper/
> trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-bin-example-1.0/
> trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-bin-example-1.0/debian/
> trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-bin-example-1.0/debian/changelog
> trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-bin-example-1.0/debian/compat
> trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-bin-example-1.0/debian/control
> trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-bin-example-1.0/debian/copyright
> trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-bin-example-1.0/debian/debathena-bin-example.displace
> trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-bin-example-1.0/debian/debathena-bin-example.install
> trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-bin-example-1.0/debian/debathena-bin-example.links
> trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-bin-example-1.0/debian/elinks.debathena
> trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-bin-example-1.0/debian/less.debathena
> trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-bin-example-1.0/debian/rules
> trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-bin-example-1.0/debian/source/
> trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-bin-example-1.0/debian/source/format
> trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-bin-example-1.1/
> trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-bin-example-1.1/debian/
> trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-bin-example-1.1/debian/changelog
> trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-bin-example-1.1/debian/compat
> trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-bin-example-1.1/debian/control
> trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-bin-example-1.1/debian/copyright
> trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-bin-example-1.1/debian/debathena-bin-example.displace
> trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-bin-example-1.1/debian/debathena-bin-example.install
> trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-bin-example-1.1/debian/debathena-bin-example.links
> trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-bin-example-1.1/debian/debathena-bin-example.undisplace
> trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-bin-example-1.1/debian/less.debathena
> trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-bin-example-1.1/debian/rules
> trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-bin-example-1.1/debian/source/
> trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-bin-example-1.1/debian/source/format
> trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-conffile-example-1.0/
> trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-conffile-example-1.0/debian/
> trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-conffile-example-1.0/debian/changelog
> trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-conffile-example-1.0/debian/compat
> trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-conffile-example-1.0/debian/control
> trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-conffile-example-1.0/debian/copyright
> trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-conffile-example-1.0/debian/debathena-conffile-example.displace
> trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-conffile-example-1.0/debian/debathena-conffile-example.install
> trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-conffile-example-1.0/debian/rules
> trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-conffile-example-1.0/debian/source/
> trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-conffile-example-1.0/debian/source/format
> trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-conffile-example-1.0/files/
> trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-conffile-example-1.0/files/etc/
> trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-conffile-example-1.0/files/etc/issue.net.debathena
> trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-conffile-example-1.1/
> trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-conffile-example-1.1/debian/
> trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-conffile-example-1.1/debian/changelog
> trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-conffile-example-1.1/debian/compat
> trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-conffile-example-1.1/debian/control
> trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-conffile-example-1.1/debian/copyright
> trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-conffile-example-1.1/debian/debathena-conffile-example.displace
> trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-conffile-example-1.1/debian/debathena-conffile-example.install
> trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-conffile-example-1.1/debian/rules
> trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-conffile-example-1.1/debian/source/
> trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-conffile-example-1.1/debian/source/format
> trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-conffile-example-1.1/debian/transform_legal.debathena
> trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-conffile-example-1.1/files/
> trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-conffile-example-1.1/files/etc/
> trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-conffile-example-1.1/files/etc/issue.net.debathena
> trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-cron-example-1.0/
> trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-cron-example-1.0/debian/
> trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-cron-example-1.0/debian/changelog
> trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-cron-example-1.0/debian/compat
> trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-cron-example-1.0/debian/control
> trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-cron-example-1.0/debian/copyright
> trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-cron-example-1.0/debian/debathena-cron-example.cron.d
> trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-cron-example-1.0/debian/debathena-cron-example.hide
> trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-cron-example-1.0/debian/rules
> trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-cron-example-1.0/debian/source/
> trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-cron-example-1.0/debian/source/format
> trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-transform-example-1.0/
> trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-transform-example-1.0/debian/
> trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-transform-example-1.0/debian/changelog
> trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-transform-example-1.0/debian/compat
> trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-transform-example-1.0/debian/control
> trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-transform-example-1.0/debian/copyright
> trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-transform-example-1.0/debian/debathena-transform-example.transform
> trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-transform-example-1.0/debian/rules
> trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-transform-example-1.0/debian/source/
> trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-transform-example-1.0/debian/source/format
> Removed:
> trunk/debathena/debathena/config-package-dev/debian/control.in
> trunk/debathena/debathena/config-package-dev/divert.mk
> trunk/debathena/debathena/config-package-dev/divert.sh.in
> trunk/debathena/debathena/config-package-dev/examples/debathena-bin-example-1.0/
> trunk/debathena/debathena/config-package-dev/examples/debathena-bin-example-1.1/
> trunk/debathena/debathena/config-package-dev/examples/debathena-conffile-example-1.0/
> trunk/debathena/debathena/config-package-dev/examples/debathena-cron-example-1.0/
> trunk/debathena/debathena/config-package-dev/examples/debathena-transform-example-1.0/
> Modified:
> trunk/debathena/debathena/config-package-dev/check-files.mk
> trunk/debathena/debathena/config-package-dev/config-package.mk
> trunk/debathena/debathena/config-package-dev/debian/changelog
> trunk/debathena/debathena/config-package-dev/debian/compat
> trunk/debathena/debathena/config-package-dev/debian/config-package-dev.install
> trunk/debathena/debathena/config-package-dev/debian/control
> trunk/debathena/debathena/config-package-dev/debian/copyright
> trunk/debathena/debathena/config-package-dev/debian/rules
> trunk/debathena/debathena/config-package-dev/decode
> trunk/debathena/debathena/config-package-dev/encode
> trunk/debathena/debathena/config-package-dev/examples/EXAMPLES
> trunk/debathena/debathena/config-package-dev/examples/cdbs/debathena-bin-example-1.0/debian/rules
> trunk/debathena/debathena/config-package-dev/examples/cdbs/debathena-bin-example-1.1/debian/changelog
> trunk/debathena/debathena/config-package-dev/examples/cdbs/debathena-bin-example-1.1/debian/rules
> trunk/debathena/debathena/config-package-dev/examples/cdbs/debathena-conffile-example-1.0/debian/rules
> trunk/debathena/debathena/config-package-dev/examples/cdbs/debathena-cron-example-1.0/debian/rules
> trunk/debathena/debathena/config-package-dev/examples/cdbs/debathena-transform-example-1.0/debian/rules
> Log:
> Sync config-package-dev 5.0 from Debian unstable.
>
> Added: trunk/debathena/debathena/config-package-dev/Debian/Debhelper/Sequence/config_package.pm
> ===================================================================
> --- trunk/debathena/debathena/config-package-dev/Debian/Debhelper/Sequence/config_package.pm (rev 0)
> +++ trunk/debathena/debathena/config-package-dev/Debian/Debhelper/Sequence/config_package.pm 2013-03-07 22:59:53 UTC (rev 25844)
> @@ -0,0 +1,10 @@
> +#!/usr/bin/perl
> +# debhelper sequence file for config-package-dev
> +
> +use warnings;
> +use strict;
> +use Debian::Debhelper::Dh_Lib;
> +
> +insert_before("dh_link", "dh_configpackage");
> +
> +1
>
> Added: trunk/debathena/debathena/config-package-dev/Debian/Debhelper/config_package.pm
> ===================================================================
> --- trunk/debathena/debathena/config-package-dev/Debian/Debhelper/config_package.pm (rev 0)
> +++ trunk/debathena/debathena/config-package-dev/Debian/Debhelper/config_package.pm 2013-03-07 22:59:53 UTC (rev 25844)
> @@ -0,0 +1,48 @@
> +#!/usr/bin/perl
> +
> +package Debian::Debhelper::config_package;
> +
> +use warnings;
> +use strict;
> +
> +use Exporter;
> +use vars qw(@ISA @EXPORT);
> +@ISA=qw(Exporter);
> +@EXPORT=qw(&encode &decode);
> +
> +sub encode {
> + my $result = "";
> + my $input = shift;
> + $input =~ s,^/,,;
> + foreach (split('', $input)) {
> + if (m/[a-z0-9.-]/) {
> + $result .= "$_";
> + } elsif (m/[A-Z]/) {
> + $result .= "+".lc($_)."+";
> + } elsif ($_ eq '/') {
> + $result .= "++";
> + } elsif ($_ eq '_') {
> + $result .= "+-+";
> + } else{
> + $result .= "+x".hex(ord($_))."+";
> + }
> + }
> + return $result;
> +}
> +
> +sub unparse {
> + $_ = $_[0];
> + return "/" unless $_;
> + return "_" if $_ eq "-";
> + return uc($_) if /^[a-z]$/;
> + s/^x//;
> + return chr hex $_;
> +}
> +
> +sub decode {
> + my $input = shift;
> + $input =~ s/\+([^+]*)\+/unparse($1)/eg;
> + return $input;
> +}
> +
> +1
>
> Modified: trunk/debathena/debathena/config-package-dev/check-files.mk
> ===================================================================
> --- trunk/debathena/debathena/config-package-dev/check-files.mk 2013-03-07 21:46:43 UTC (rev 25843)
> +++ trunk/debathena/debathena/config-package-dev/check-files.mk 2013-03-07 22:59:53 UTC (rev 25844)
> @@ -34,11 +34,11 @@
> ifndef _cdbs_rules_check_files
> _cdbs_rules_check_files = 1
>
> -include /usr/share/cdbs/1/rules/divert.mk
> +include /usr/share/cdbs/1/rules/displace.mk
>
> DEB_CHECK_FILES_TMPDIR = debian/check_file_copies
>
> -debian_check_files_source = $(if $(DEB_CHECK_FILES_SOURCE_$(1)),$(DEB_CHECK_FILES_SOURCE_$(1)),$(call divert_files_replace_name,$(1)))
> +debian_check_files_source = $(if $(DEB_CHECK_FILES_SOURCE_$(1)),$(DEB_CHECK_FILES_SOURCE_$(1)),$(call displace_files_replace_name,$(1)))
>
> debian_check_files = $(patsubst %,$(DEB_CHECK_FILES_TMPDIR)%,$(1))
> undebian_check_files = $(patsubst $(DEB_CHECK_FILES_TMPDIR)%,%,$(1))
>
> Modified: trunk/debathena/debathena/config-package-dev/config-package.mk
> ===================================================================
> --- trunk/debathena/debathena/config-package-dev/config-package.mk 2013-03-07 21:46:43 UTC (rev 25843)
> +++ trunk/debathena/debathena/config-package-dev/config-package.mk 2013-03-07 22:59:53 UTC (rev 25844)
> @@ -24,26 +24,26 @@
> #
> # Most variables are lists, so one can
> #
> -# DEB_DIVERT_FILES_package += /path1/file1.divert \
> -# /path2/file2.divert \
> -# /path3/file3.divert
> +# DEB_DISPLACE_FILES_package += /path1/file1.divert \
> +# /path2/file2.divert \
> +# /path3/file3.divert
> #
> # We use += in the examples
> #
> # The config-package-dev system supports the following variables:
> #
> -# DEB_DIVERT_EXTENSION
> +# DEB_DISPLACE_EXTENSION
> #
> # Extension used for all config-package-dev diversions (defaults to
> # .divert, which we will use in examples). This field is difficult to
> # change on package upgrades; we recommend picking a value to use for
> # all packages at your site.
> #
> -# DEB_DIVERT_FILES_package += /path/file.divert
> +# DEB_DISPLACE_FILES_package += /path/file.divert
> #
> # List of absolute paths to files to be replaced at package install
> # time by being diverted from /path/file to /path/file.divert-orig
> -# (DEB_DIVERT_EXTENSION should be part of the path, but need not
> +# (DEB_DISPLACE_EXTENSION should be part of the path, but need not
> # appear at the end); a symlink /path/file -> /path/file.divert will
> # be installed in its place. The user is responsible for installing
> # /path/file.divert. This is best for diverting binaries and most
> @@ -51,7 +51,7 @@
> #
> # DEB_TRANSFORM_FILES_package += /path/file.divert
> #
> -# This works like DEB_DIVERT_FILES, but additionally the file to be
> +# This works like DEB_DISPLACE_FILES, but additionally the file to be
> # installed to /path/file.divert will be generated at package build
> # time as the standard output from
> #
> @@ -74,7 +74,7 @@
> # the file, to allow you to rebuild a package using DEB_TRANSFORM_FILES
> # that is currently installed, in most cases.)
> #
> -# DEB_REMOVE_FILES_package += /path/file
> +# DEB_HIDE_FILES_package += /path/file
> #
> # List of absolute paths to files to be diverted to a unique path in
> # /usr/share/package/. No symlink or replacement file will be
> @@ -86,20 +86,22 @@
> # replacement file to /etc/cron.d/file; you must install it to some
> # other path (which should be fine in a .d directory). If you want to
> # install a replacement file with the same name, you probably want
> -# DEB_DIVERT_FILES.
> +# DEB_DISPLACE_FILES.
> #
> -# DEB_UNDIVERT_FILES_package += /path/file.divert
> +# DEB_UNDISPLACE_FILES_package += /path/file.divert
> #
> # List of absolute paths to files whose diversions caused by
> -# DEB_DIVERT_FILES are to be removed upon installing this package, if
> +# DEB_DISPLACE_FILES are to be removed upon installing this package, if
> # the diversions have been made on the target system. This is
> -# primarily useful for removing a now-unecessary diversion provided by
> +# primarily useful for removing a now-unnecessary displacement provided by
> # a previous version of this package on an upgrade.
> #
> -# DEB_UNREMOVE_FILES_package += /path/file
> +# DEB_UNHIDE_FILES_package += /path/file
> #
> -# This works like DEB_UNDIVERT_FILES_package, except that it only
> -# removes the diversion (not a symlink).
> +# This works like DEB_UNDISPLACE_FILES_package, except that it undoes
> +# the work of a previous DEB_HIDE_FILES. In particular, it only removes
> +# the diversion, whereas DEB_UNDISPLACE_FILES first removes the symlink
> +# generated by DEB_DISPLACE_FILES.
>
> ifndef _cdbs_rules_config_package
> _cdbs_rules_config_package = 1
>
> Modified: trunk/debathena/debathena/config-package-dev/debian/changelog
> ===================================================================
> --- trunk/debathena/debathena/config-package-dev/debian/changelog 2013-03-07 21:46:43 UTC (rev 25843)
> +++ trunk/debathena/debathena/config-package-dev/debian/changelog 2013-03-07 22:59:53 UTC (rev 25844)
> @@ -1,3 +1,24 @@
> +config-package-dev (5.0) unstable; urgency=low
> +
> + * Add Debhelper support (Debathena: #867) (Closes: #693672). This
> + release includes a new command, dh_configpackage, and a sequencer
> + extension, dh --with config-package.
> + * Use the terms "displace" and "hide" for actions of the
> + config-package-dev system, instead of the terms "divert" and
> + "remove", which already have existing (related) meanings in the
> + context of Debian packages.
> + * Move examples/* to examples/cdbs/*, and create examples/debhelper/*,
> + with the same packages using Debhelper 7-style packaging.
> +
> + * Change config-package-dev's own packaging to Debhelper 7.
> + * Bump Standards-Version to 3.9.4 (no changes required).
> + * Update Vcs-Git and Vcs-Browser locations to new upstream.
> + * Drop CDBS runtime dependency. CDBS users should be explicitly
> + Build-Depending on CDBS, probably through use of the @cdbs@ macro in
> + debian/control.in.
> +
> + -- Geoffrey Thomas <geofft@mit.edu> Wed, 06 Mar 2013 17:14:42 -0800
> +
> config-package-dev (4.14) unstable; urgency=low
>
> [ Anders Kaseorg ]
>
> Modified: trunk/debathena/debathena/config-package-dev/debian/compat
> ===================================================================
> --- trunk/debathena/debathena/config-package-dev/debian/compat 2013-03-07 21:46:43 UTC (rev 25843)
> +++ trunk/debathena/debathena/config-package-dev/debian/compat 2013-03-07 22:59:53 UTC (rev 25844)
> @@ -1 +1 @@
> -6
> +7
>
> Modified: trunk/debathena/debathena/config-package-dev/debian/config-package-dev.install
> ===================================================================
> --- trunk/debathena/debathena/config-package-dev/debian/config-package-dev.install 2013-03-07 21:46:43 UTC (rev 25843)
> +++ trunk/debathena/debathena/config-package-dev/debian/config-package-dev.install 2013-03-07 22:59:53 UTC (rev 25844)
> @@ -1,9 +1,11 @@
> -divert.mk usr/share/cdbs/1/rules/
> +displace.mk usr/share/cdbs/1/rules/
> debconf-divert.mk usr/share/cdbs/1/rules/
> check-files.mk usr/share/cdbs/1/rules/
> config-package.mk usr/share/cdbs/1/rules/
> transform-files.mk usr/share/cdbs/1/rules/
> encode usr/share/config-package-dev/
> decode usr/share/config-package-dev/
> -divert.sh.in usr/share/config-package-dev/
> +displace.sh.in usr/share/debhelper/autoscripts/
> debconf-hack.sh usr/share/config-package-dev/
> +dh_configpackage usr/bin/
> +Debian usr/share/perl5/
>
> Added: trunk/debathena/debathena/config-package-dev/debian/config-package-dev.manpages
> ===================================================================
> --- trunk/debathena/debathena/config-package-dev/debian/config-package-dev.manpages (rev 0)
> +++ trunk/debathena/debathena/config-package-dev/debian/config-package-dev.manpages 2013-03-07 22:59:53 UTC (rev 25844)
> @@ -0,0 +1 @@
> +dh_configpackage.1
>
> Modified: trunk/debathena/debathena/config-package-dev/debian/control
> ===================================================================
> --- trunk/debathena/debathena/config-package-dev/debian/control 2013-03-07 21:46:43 UTC (rev 25843)
> +++ trunk/debathena/debathena/config-package-dev/debian/control 2013-03-07 22:59:53 UTC (rev 25844)
> @@ -4,25 +4,25 @@
> Maintainer: Debathena Project <debathena@mit.edu>
> Uploaders: Tim Abbott <tabbott@mit.edu>, Anders Kaseorg <andersk@mit.edu>, Geoffrey Thomas <geofft@mit.edu>
> Homepage: http://debathena.mit.edu/config-package-dev
> -Vcs-Git: git://andersk.mit.edu/config-package-dev.git
> -Vcs-Browser: http://andersk.mit.edu/gitweb/config-package-dev.git
> -Build-Depends: cdbs,
> - debhelper,
> - dh-buildinfo
> -Standards-Version: 3.9.2
> +Vcs-Git: git://debathena.mit.edu/config-package-dev.git
> +Vcs-Browser: http://debathena.mit.edu/trac/browser/config-package-dev/
> +Build-Depends: debhelper (>= 7.0.50~)
> +Standards-Version: 3.9.4
>
> Package: config-package-dev
> Architecture: all
> -Depends: cdbs, ${misc:Depends}
> -Description: CDBS modules for building configuration packages
> - This package contains a system of CDBS modules for creating Debian
> +Depends: ${misc:Depends}
> +Description: Debhelper (and CDBS) modules for building configuration packages
> + This package contains a system of modules for creating Debian
> configuration packages: packages that configure an existing Debian
> system by using dpkg-divert on configuration files. These modules
> attempt to make the process of creating configuration packages
> efficient by checking the md5sums of upstream configuration files
> that are to be modified and automatically generating the relevant
> postinst code to perform the diversions using the standard debhelper
> - mechanism.
> + mechanism. In addition to a debhelper command and sequencer extension
> + module, CDBS modules are also included, but future development will
> + focus on the debhelper interface.
> .
> The config-package-dev modules are optimized for site defaults (i.e.
> configuration for a university or a company), though they are useful
>
> Modified: trunk/debathena/debathena/config-package-dev/debian/copyright
> ===================================================================
> --- trunk/debathena/debathena/config-package-dev/debian/copyright 2013-03-07 21:46:43 UTC (rev 25843)
> +++ trunk/debathena/debathena/config-package-dev/debian/copyright 2013-03-07 22:59:53 UTC (rev 25844)
> @@ -6,6 +6,7 @@
> It is also available from http://debathena.mit.edu/config-package-dev
>
> Copyright: (C) Tim Abbott and Anders Kaseorg 2006-2008
> + (C) Geoffrey Thomas 2011-2013
>
> This program is free software; you can redistribute it and/or modify
> it under the terms of the GNU General Public License as published by
> @@ -18,4 +19,4 @@
> GNU General Public License for more details.
>
> On Debian systems, the complete text of the GNU General Public License
> -can be found in the file /usr/share/common-licenses/GPL.
> +can be found in the file /usr/share/common-licenses/GPL-2.
>
> Modified: trunk/debathena/debathena/config-package-dev/debian/rules
> ===================================================================
> --- trunk/debathena/debathena/config-package-dev/debian/rules 2013-03-07 21:46:43 UTC (rev 25843)
> +++ trunk/debathena/debathena/config-package-dev/debian/rules 2013-03-07 22:59:53 UTC (rev 25844)
> @@ -1,3 +1,12 @@
> #!/usr/bin/make -f
> +version := $(shell dpkg-parsechangelog | sed -nr 's/^Version: (.*)/\1/p')
> +pod2man := pod2man -r "config-package-dev $(version)" -c config-package-dev
>
> -include /usr/share/cdbs/1/rules/debhelper.mk
> +%:
> + dh $@
> +
> +override_dh_auto_build:
> + $(pod2man) --section=1 dh_configpackage dh_configpackage.1
> +
> +override_dh_clean:
> + dh_clean dh_configpackage.1
>
> Added: trunk/debathena/debathena/config-package-dev/debian/source/format
> ===================================================================
> --- trunk/debathena/debathena/config-package-dev/debian/source/format (rev 0)
> +++ trunk/debathena/debathena/config-package-dev/debian/source/format 2013-03-07 22:59:53 UTC (rev 25844)
> @@ -0,0 +1 @@
> +3.0 (native)
>
> Modified: trunk/debathena/debathena/config-package-dev/decode
> ===================================================================
> --- trunk/debathena/debathena/config-package-dev/decode 2013-03-07 21:46:43 UTC (rev 25843)
> +++ trunk/debathena/debathena/config-package-dev/decode 2013-03-07 22:59:53 UTC (rev 25844)
> @@ -1,15 +1,12 @@
> #!/usr/bin/perl
> +# Reverse the encoding performed by the "encode" helper.
> +#
> +# This is not currently used by config-package-dev itself, but can by
> +# used by helper programs that want to determine what files are diverted
> +# by a package generated using this system.
>
> use strict;
> use warnings;
> +use Debian::Debhelper::config_package;
>
> -$ARGV[0] =~ s/\+([^+]*)\+/unparse($1)/eg;
> -print $ARGV[0];
> -sub unparse {
> - $_ = $_[0];
> - return "/" unless $_;
> - return "_" if $_ eq "-";
> - return uc($_) if /^[a-z]$/;
> - s/^x//;
> - return chr hex $_;
> -}
> +print decode($ARGV[0]);
>
> Added: trunk/debathena/debathena/config-package-dev/dh_configpackage
> ===================================================================
> --- trunk/debathena/debathena/config-package-dev/dh_configpackage (rev 0)
> +++ trunk/debathena/debathena/config-package-dev/dh_configpackage 2013-03-07 22:59:53 UTC (rev 25844)
> @@ -0,0 +1,457 @@
> +#!/usr/bin/perl -w
> +# Copyright © 2007-2008 Anders Kaseorg <andersk@mit.edu> and
> +# Tim Abbott <tabbott@mit.edu>
> +# Copyright © 2011-2012 Geoffrey Thomas <geofft@mit.edu>
> +#
> +# This program 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, or (at
> +# your option) any later version.
> +#
> +# This program 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, write to the Free Software
> +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
> +# 02111-1307 USA.
> +
> +
> +=head1 NAME
> +
> +dh_configpackage - add maintainer script rules to displace, hide, or transform files
> +
> +=cut
> +
> +use strict;
> +use Debian::Debhelper::Dh_Lib;
> +use Debian::Debhelper::config_package;
> +use Digest::MD5;
> +use IPC::Open3;
> +
> +
> +=head1 SYNOPSIS
> +
> +B<dh_configpackage> [B<--displace> I<path>] [B<--hide> I<path>] [B<--undisplace> I<path>] [B<--unhide> I<file>] [B<--transform> I<transformation>] [S<I<debhelper options>>] [B<-n>]
> +
> +=head1 DESCRIPTION
> +
> +B<dh_configpackage> is a debhelper program to create "configuration
> +packages". These packages provide an ideal way to distribute
> +configurations to target systems while still affording local system
> +administrators a degree of control over their workstations. The
> +motivation and philosophy behind this style of packaging is described
> +in detail on the config-package-dev website. Configuration packages
> +make use of dpkg diversions and maintainer script snippets to provide
> +three primary operations: displacing, hiding, and transforming files.
> +
> +The I<displace> operation consists of replacing a file on the target
> +system. The original file is renamed out of the way and diverted in the
> +dpkg database. The replacement file is then installed by the package,
> +and the config-package-dev maintainer script snippets create a symlink
> +from the original name. A common use of this is to install a wrapper
> +script for an executable.
> +
> +The I<transform> operation is a special case of the displace operation.
> +At build time, a "transform script" is applied to the original source,
> +and the result is used as the replacement in the displace operation. A
> +common use of this is to change one value in a config file without
> +needing to re-type the entire config file (and risk bit-rot).
> +
> +The I<hide> operation is yet another special case of the displace
> +operation, namely that there is no replacement or symlink. Instead, the
> +file is diverted to a unique path on the target system, thus preserving
> +its contents. A common use of this is to suppress a snippet file in a
> +configuration directory (e.g. /etc/foo.d), thus disabling a specific
> +operation or configuration.
> +
> +The I<displace extension> is a suffix appended to the diverted versions
> +of files, and this suffix plus the string "-orig" is appended to the
> +original versions of the files. The default value is the first word of
> +the package name. For example, the extension for debathena-bin-example
> +would be ".debathena". So if debathena-bin-example displaced /bin/true,
> +the original /bin/true would be found at /bin/true.debathena-orig and
> +the new version (installed by e.g. dh_install) found at
> +/bin/true.debathena. /bin/true itself would become a symbolic link.
> +(For the remainder of this documentation, ".debathena" will be used as
> +the displace extension.)
> +
> +=head1 FILES
> +
> +=over 4
> +
> +=item debian/I<package>.displace
> +
> +List the files to displace, one per line, including the full path and
> +displace extension. For example, to displace /usr/bin/true to
> +/usr/bin/true.debathena, you would list "/usr/bin/true.debathena" in
> +the file. (As with other Debhelper commands, you can omit the initial
> +leading slash in pathnames in the package, but these examples retain
> +it.)
> +
> +=item debian/I<package>.hide
> +
> +List the files to hide, one per line, including the full path and
> +displace extension. As noted above, these files won't actually be
> +removed, but merely diverted and renamed to a unique path below
> +/usr/share/I<package>.
> +
> +=item debian/I<package>.undisplace
> +
> +List the files to undisplace, one per line, including the full path and
> +displace extension. B<NOTE:> This is only needed when a new version of
> +the package no longer needs to displace a file (for example, if an
> +upstream bug was fixed). Packages automatically undo all operations
> +upon removal or deconfiguration.
> +
> +=item debian/I<package>.unhide
> +
> +List the files to unhide, one per line, including the full path
> +and displace extension. B<NOTE:> As with undisplace, this is only needed
> +when a new version of the package no longer needs to hide a file.
> +
> +=item debian/I<package>.transform
> +
> +Each line in the file specifies a transformation. A transformation
> +consists of two space-separated fields: the full path of the
> +target file including the displace extension and the transformation
> +command itself. The transformation can either be a single shell
> +command, or an executable file in the debian directory. The
> +transformation takes the original source of the file on stdin and prints
> +its transformation on stdout. Transformations are typically performed
> +by perl, sed, or awk, but there is no limitation on what can be used as
> +a transformation.
> +
> +For example, to transform /etc/school.conf by replacing all
> +occurrences of the word 'Harvard' with the word 'MIT', you might
> +specify the following line:
> +
> + /etc/school.conf.debathena sed -e 's/Harvard/MIT/g'
> +
> +Or, storing the command in a separate script:
> +
> + /etc/school.conf.debathena debian/transform_school.conf.pl
> +
> +If the transformation script fails, the package build fails. You can use
> +this with e.g. Perl's C<or die> syntax to make sure that the source
> +file of the transformation has not changed from what you expected.
> +
> +I<Transformation sources>: Under normal operation, the source (passed
> +on stdin) for the transformation is the name of the diversion without
> +the divert extension. In some cases, you may wish to use a different
> +source (e.g. a sample configuration file in /usr/share/doc). You can
> +specify this source as an optional field between the diversion
> +filename and the transformation. This field must begin with a '<'
> +immediately followed by the full path to the source. Taking the
> +example above, we might alter it as follows:
> +
> + /etc/school.conf.debathena </usr/share/doc/school/conf.example sed -e 's/Harvard/MIT/g'
> +
> +B<NOTE:> There is no "untransform" operation. Because a transform
> +operation is a special case of a displace operation, the "undisplace"
> +operation is the correct way of removing a no-longer-needed
> +transformation in future versions of the package.
> +
> +=item debian/I<package>.displace-extension
> +
> +This file is used to specify the displace extension for any files
> +diverted by this package, if you do not want to accept the default of
> +the first word in the package name. It will not normally be present.
> +(See L<"CAVEATS">.)
> +
> +=back
> +
> +=head1 OPTIONS
> +
> +=over 4
> +
> +=item B<-n>, B<--noscripts>
> +
> +Do not modify maintainer scripts. This is a standard debhelper
> +option, though you are strongly discouraged from using it except for
> +debugging, as these operations rely heavily on the maintainer scripts.
> +
> +=item B<--displace> I<path>
> +
> +=item B<--hide> I<path>
> +
> +=item B<--undisplace> I<path>
> +
> +=item B<--unhide> I<path>
> +
> +=item B<--transform> I<transformation>
> +
> +These options allow for specifying an operation on the command line.
> +The argument to the option is the same as a single line of the
> +corresponding file, as described above. You may specify multiple
> +occurrences of B<--displace>, or you may invoke B<dh_configpackage>
> +repeatedly with different invocations. The most common use of this
> +format is in a rules file when performing conditional operations, in an
> +C<override_dh_configpackage> target in the C<rules> file. See the
> +debathena-conffile-example-1.1 package in
> +/usr/share/doc/config-package-dev/EXAMPLES for one such use.
> +
> +=back
> +
> +=cut
> +
> +my (@arg_displace, @arg_hide, @arg_undisplace, @arg_unhide, @arg_transform);
> +my $args_present = 0;
> +
> +init(options => {
> + "displace=s" => \@arg_displace,
> + "hide=s" => \@arg_hide,
> + "undisplace=s" => \@arg_undisplace,
> + "unhide=s" => \@arg_unhide,
> + "transform=s" => \@arg_transform,
> +});
> +
> +if (@arg_displace or @arg_hide or @arg_undisplace or @arg_unhide or @arg_transform) {
> + $args_present = 1;
> +}
> +
> +# We default the displace extension to a period followed by the first
> +# word of the package name, on the assumption that it is probably the
> +# site name (e.g., "debathena-kerberos-config" displaces to
> +# ".debathena"). You can set this extension explicitly in
> +# debian/$package.displace-extension or debian/displace-extension.
> +sub displace_extension {
> + my $package = shift;
> + my $file = pkgfile($package, "displace-extension");
> + if ($file) {
> + open(my $fh, $file);
> + my $ret = <$fh>;
> + chomp $ret;
> + close $fh;
> + return $ret;
> + }
> + $package =~ s/-.*//;
> + return ".$package";
> +}
> +
> +# Replace only the last instance of the displace extension in the
> +# filename, to make it possible to displace /path/foo.divert to
> +# foo.divert.divert-orig
> +sub displace_files_replace_name {
> + my ($package, $filename, $replacement) = @_;
> + my $extension = displace_extension($package);
> + $filename =~ s/(.*)\Q$extension\E/$1$replacement/;
> + return $filename;
> +}
> +
> +# Encode a full path into the path it should be diverted to if it's
> +# hidden
> +sub hide_files_name {
> + my ($filename, $package) = @_;
> + return "/usr/share/$package/" . encode($filename);
> +}
> +
> +# At compatibility levels 6 and above, prerms take effect in the
> +# opposite order from postinsts
> +sub reverse_if_6 {
> + if (compat(5)) {
> + return @_;
> + } else {
> + return reverse @_;
> + }
> +}
> +
> +
> +# check_file is used to verify that files on local disk have not
> +# been modified from the upstream packaged version.
> +#
> +# We check md5sums from both /var/lib/dpkg/info/$(package).md5sums
> +# (the md5sums database for non-conffiles) and the conffiles database
> +# used for prompting about conffiles being changed (via dpkg-query).
> +#
> +# There is some wrangling here because the formats of these sources differ.
> +
> +sub check_file {
> + my $name = shift;
> + my $truename = `dpkg-divert --truename $name`;
> + chomp $truename;
> + die "$truename missing\n" unless (-e $truename);
> + my $package = `LC_ALL=C dpkg -S $name | sed -n '/^diversion by /! s/: .*\$// p'`;
> + chomp $package;
> + die "$truename is not owned by any package\n" unless ($package);
> +
> + my $ctx = Digest::MD5->new;
> + open(my $fh, $truename);
> + binmode $fh;
> + $ctx->addfile($fh);
> + my $digest = $ctx->hexdigest;
> + close $fh;
> +
> + my $hassums = 0;
> +
> + FINDMD5: {
> + open($fh, "-|", qw(dpkg-query --showformat=${Conffiles}\n --show), $package);
> + while (<$fh>) {
> + next unless /^ \Q$name\E ([0-9a-f]{32})$/;
> + $hassums = 1;
> + if ($1 eq $digest) {
> + last FINDMD5;
> + } else {
> + die "md5sum mismatch on $name\n";
> + }
> + }
> + close $fh;
> +
> + open(my $devnull, ">/dev/null");
> + my $pid = open3(undef, my $dpkg_query, $devnull, qw(dpkg-query --control-path), $package, "md5sums");
> + my $md5sums = <$dpkg_query>;
> + chomp $md5sums;
> + close $dpkg_query;
> + close $devnull;
> + waitpid $pid, 0;
> +
> + $md5sums ||= "/var/lib/dpkg/info/$package.md5sums";
> +
> + if (-e $md5sums) {
> + $hassums = 1;
> + open($fh, $md5sums);
> + my $relname = $name;
> + $relname =~ s|^/||;
> + while (<$fh>) {
> + next unless /^([0-9a-f]{32}) \Q$relname\E$/;
> + if ($1 eq $digest) {
> + last FINDMD5;
> + } else {
> + die "md5sum mismatch on $name\n";
> + }
> + }
> + close $fh;
> + }
> +
> + if ($hassums) {
> + die "$package contains no md5sums for $name. Is it a generated file?\n";
> + } else {
> + print "config-package-dev: warning: $package does not include md5sums!\n";
> + print "config-package-dev: warning: md5sum for $name not verified.\n";
> + }
> + }
> +
> + return $truename;
> +}
> +
> +foreach my $package (@{$dh{DOPACKAGES}}) {
> + my (@displacefiles, @hidefiles, @undisplacefiles, @unhidefiles, @transformfiles);
> +
> + if (($package eq $dh{FIRSTPACKAGE} || $dh{PARAMS_ALL}) && $args_present) {
> + @displacefiles = @arg_displace;
> + @hidefiles = @arg_hide;
> + @undisplacefiles = @arg_undisplace;
> + @unhidefiles = @arg_unhide;
> + @transformfiles = map {[split]} @arg_transform;
> + } else {
> + my $displacefile = pkgfile($package, "displace");
> + @displacefiles = filearray($displacefile) if $displacefile;
> + my $hidefile = pkgfile($package, "hide");
> + @hidefiles = filearray($hidefile) if $hidefile;
> + my $undisplacefile = pkgfile($package, "undisplace");
> + @undisplacefiles = filearray($undisplacefile) if $undisplacefile;
> + my $unhidefile = pkgfile($package, "unhide");
> + @unhidefiles = filearray($unhidefile) if $unhidefile;
> + my $transformfile = pkgfile($package, "transform");
> + @transformfiles = filedoublearray($transformfile) if $transformfile;
> + }
> +
> + my $tmp = tmpdir($package);
> + my $extension = displace_extension($package);
> +
> + if (! $dh{ONLYSCRIPTS} && @hidefiles) {
> + doit("install", "-d", "$tmp/usr/share/$package");
> + }
> +
> + foreach my $line (@transformfiles) {
> + my $file = shift @$line;
> + $file =~ s|^/?|/|;
> + my $source;
> + if (@$line[0] =~ /^</) {
> + $source = shift @$line;
> + $source =~ s/^<//;
> + } else {
> + $source = displace_files_replace_name($package, $file, "");
> + if ($source eq $file) {
> + die("Error: '$file' does not contain '$extension'\n");
> + }
> + }
> +
> + #if ($rest =~ m|^debian/[^ ]*| && -e $rest) {
> + # # In case this is a single file in debian/, make sure it's
> + # # executable, since source-format 1.0 debian/ directories
> + # # (from .diff.gz) cannot have mode bits
> + # chmod 0755, $rest;
> + #}
> +
> + $source = check_file($source);
> + my $destdir = dirname("$tmp/$file");
> + if (! -d $destdir) {
> + doit("install", "-d", $destdir);
> + }
> + complex_doit(@$line, "<", $source, ">", "$tmp/$file");
> + push @displacefiles, $source;
> + }
> +
> + # Add code to postinst to add/remove diversions as appropriate
> + if (! $dh{NOSCRIPTS}) {
> + if (@undisplacefiles || @unhidefiles || @displacefiles || @hidefiles) {
> + my $postinst = escape_shell(join "\\n", (
> + 'if [ "$1" = "configure" ]; then',
> + (map {" check_undisplace_unlink " . displace_files_replace_name($package, $_, " ")} @undisplacefiles),
> + (map {" check_undisplace_unhide $_ " . hide_files_name($_, $package)} @unhidefiles),
> + (map {" displace_link " . displace_files_replace_name($package, $_, " ")} @displacefiles),
> + (map {" displace_hide $_ " . hide_files_name($_, $package)} @hidefiles),
> + 'fi'
> + ));
> + autoscript($package, "postinst", "displace.sh.in",
> + "s/#PACKAGE#/$package/g; s/#DEB_DISPLACE_EXTENSION#/$extension/g; \\\$a\"$postinst\"");
> + }
> + if (@displacefiles || @hidefiles) {
> + my $prerm = escape_shell(join "\\n", (
> + 'if [ "$1" = "remove" ] || [ "$1" = "deconfigure" ]; then',
> + (map {" undisplace_unlink " . displace_files_replace_name($package, $_, " ")} reverse_if_6 (@displacefiles)),
> + (map {" undisplace_unhide $_ $package"} reverse_if_6 (@hidefiles)),
> + 'fi'
> + ));
> + autoscript($package, "prerm", "displace.sh.in",
> + "s/#PACKAGE#/$package/g; s/#DEB_DISPLACE_EXTENSION#/$extension/g; \\\$a\"$prerm\"");
> + }
> + }
> +
> + # Add an encoding of the names of the diverted files to the Provides:
> + # and Conflicts: lists. This prevents two packages diverting the same
> + # file from being installed simultaneously (it cannot work, and this
> + # produces a much less ugly error). Requires in debian/control:
> + # Provides: ${diverted-files}
> + # Conflicts: ${diverted-files}
> + foreach my $file (@displacefiles, @hidefiles) {
> + my $encodedfile = encode(displace_files_replace_name($package, $file, ""));
> + addsubstvar($package, "diverted-files", "diverts-$encodedfile");
> + }
> +}
> +
> +=head1 CAVEATS
> +
> +Because the displace extension is automatically generated from the
> +package name, renaming the package can have unintended consequences.
> +If you must rename a package such that the first component of the name
> +changes, specify the old extension using the C<displace-extension> file
> +(see above).
> +
> +=head1 SEE ALSO
> +
> +L<debhelper(7)>, L<The config-package-dev
> +homepage|http://debathena.mit.edu/config-package-dev>
> +
> +This program is a part of config-package-dev.
> +
> +=head1 AUTHOR
> +
> +config-package-dev was written by Anders Kaseorg <andersk@mit.edu> and
> +Tim Abbott <tabbott@mit.edu>. The debhelper port is by Geoffrey Thomas
> +<geofft@mit.edu>. Documentation by Jonathan Reed <jdreed@mit.edu>.
> +
> +=cut
>
>
> Property changes on: trunk/debathena/debathena/config-package-dev/dh_configpackage
> ___________________________________________________________________
> Added: svn:executable
> + *
>
> Copied: trunk/debathena/debathena/config-package-dev/displace.mk (from rev 25843, trunk/debathena/debathena/config-package-dev/divert.mk)
> ===================================================================
> --- trunk/debathena/debathena/config-package-dev/displace.mk (rev 0)
> +++ trunk/debathena/debathena/config-package-dev/displace.mk 2013-03-07 22:59:53 UTC (rev 25844)
> @@ -0,0 +1,144 @@
> +# -*- mode: makefile; coding: utf-8 -*-
> +# Copyright © 2007-2008 Anders Kaseorg <andersk@mit.edu> and
> +# Tim Abbott <tabbott@mit.edu>
> +#
> +# This program 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, or (at
> +# your option) any later version.
> +#
> +# This program 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, write to the Free Software
> +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
> +# 02111-1307 USA.
> +
> +# Don't include displace.mk in your rules files directly; instead use
> +# config-package.mk.
> +
> +# displace.mk handles the low-level diversion logic. It includes
> +# displace.sh.in in the postinst and prerm scripts, and adds calls to
> +# the functions in displace.sh.in to add and remove diversions and
> +# symlinks at the appropriate points.
> +
> +ifndef _cdbs_rules_displace
> +_cdbs_rules_displace = 1
> +
> +include /usr/share/cdbs/1/rules/debhelper.mk
> +
> +CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), config-package-dev (>= 5.0~)
> +
> +# displace.sh.in is included in the postinst/prerm scripts of packages
> +# installing diversions and symlinks using config-package-dev.
> +DEB_DISPLACE_SCRIPT = /usr/share/debhelper/autoscripts/displace.sh.in
> +# script used to encode the path of a file uniquely in a valid virtual
> +# package name.
> +DEB_DISPLACE_ENCODER = /usr/share/config-package-dev/encode
> +
> +DEB_DISPLACE_PACKAGES += $(foreach package,$(DEB_ALL_PACKAGES), \
> + $(if $(DEB_TRANSFORM_FILES_$(package)),$(package), \
> + $(if $(DEB_HIDE_FILES_$(package)),$(package), \
> + $(if $(DEB_UNHIDE_FILES_$(package)),$(package), \
> + $(if $(DEB_UNDISPLACE_FILES_$(package)),$(package), \
> + $(if $(DEB_DISPLACE_FILES_$(package)),$(package), \
> + $(if $(DEB_REMOVE_FILES_$(package)),$(package), \
> + $(if $(DEB_UNREMOVE_FILES_$(package)),$(package), \
> + $(if $(DEB_UNDIVERT_FILES_$(package)),$(package), \
> + $(if $(DEB_DIVERT_FILES_$(package)),$(package)))))))))))
> +
> +ifeq ($(DEB_DISPLACE_EXTENSION),)
> +ifeq ($(DEB_DIVERT_EXTENSION),)
> +DEB_DISPLACE_EXTENSION = .divert
> +else
> +DEB_DISPLACE_EXTENSION = $(DEB_DIVERT_EXTENSION)
> +endif
> +endif
> +
> +# Replace only the last instance of DEB_DISPLACE_EXTENSION in the
> +# filename, to make it possible to displace /path/foo.divert to
> +# foo.divert.divert-orig
> +displace_files_replace_name = $(shell echo $(1) | perl -pe 's/(.*)\Q$(DEB_DISPLACE_EXTENSION)\E/$$1$(2)/')
> +
> +# Encode a full path into the path it should be diverted to if it's
> +# hidden
> +hide_files_name = /usr/share/$(cdbs_curpkg)/$(shell $(DEB_DISPLACE_ENCODER) $(1))
> +
> +dh_compat_6 := $(shell if [ '$(DH_COMPAT)' -ge 6 ]; then echo y; fi)
> +
> +reverse = $(foreach n,$(shell seq $(words $(1)) -1 1),$(word $(n),$(1)))
> +reverse_dh_compat_6 = $(if $(dh_compat_6),$(call reverse,$(1)),$(1))
> +
> +debian-displace/%: package = $(subst debian-displace/,,$@)
> +debian-displace/%: displace_files = $(DEB_DISPLACE_FILES_$(package)) $(DEB_DIVERT_FILES_$(package)) $(DEB_TRANSFORM_FILES_$(package))
> +debian-displace/%: displace_hide_files = $(DEB_HIDE_FILES_$(package)) $(DEB_REMOVE_FILES_$(package))
> +debian-displace/%: displace_undisplace_files = $(DEB_UNDISPLACE_FILES_$(package)) $(DEB_UNDIVERT_FILES_$(package))
> +debian-displace/%: displace_unhide_files = $(DEB_UNHIDE_FILES_$(package)) $(DEB_UNREMOVE_FILES_$(package))
> +debian-displace/%: displace_files_all = $(strip $(displace_files) $(displace_hide_files) $(displace_undisplace_files) $(displace_unhide_files))
> +debian-displace/%: displace_files_thispkg = $(strip $(displace_files) $(displace_hide_files))
> +$(patsubst %,debian-displace/%,$(DEB_DISPLACE_PACKAGES)) :: debian-displace/%:
> +# Writing shell scripts in makefiles sucks. Remember to $$ shell
> +# variables and include \ at the end of each line.
> +# Add code to postinst to add/remove diversions and symlinks as appropriate
> + set -e; \
> + { \
> + sed 's/#PACKAGE#/$(cdbs_curpkg)/g; s/#DEB_DISPLACE_EXTENSION#/$(DEB_DISPLACE_EXTENSION)/g' $(DEB_DISPLACE_SCRIPT); \
> + $(if $(displace_files_all), \
> + echo 'if [ "$$1" = "configure" ]; then'; \
> + $(foreach file,$(displace_undisplace_files), \
> + echo " check_undisplace_unlink $(call displace_files_replace_name,$(file), )"; )\
> + $(foreach file,$(displace_unhide_files), \
> + echo " check_undisplace_unhide $(file) $(call hide_files_name,$(file))"; )\
> + $(foreach file,$(displace_files), \
> + echo " displace_link $(call displace_files_replace_name,$(file), )";) \
> + $(foreach file,$(displace_hide_files), \
> + mkdir -p debian/$(cdbs_curpkg)/usr/share/$(cdbs_curpkg); \
> + echo " displace_hide $(file) $(call hide_files_name,$(file))";) \
> + echo 'fi'; \
> + ) \
> + } >> $(CURDIR)/debian/$(cdbs_curpkg).postinst.debhelper
> +# Add code to prerm script to undo diversions and symlinks when package is removed.
> + set -e; \
> + { \
> + $(if $(dh_compat_6),, \
> + if [ -e $(CURDIR)/debian/$(cdbs_curpkg).prerm.debhelper ]; then \
> + cat $(CURDIR)/debian/$(cdbs_curpkg).prerm.debhelper; \
> + fi;) \
> + sed 's/#PACKAGE#/$(cdbs_curpkg)/g; s/#DEB_DISPLACE_EXTENSION#/$(DEB_DISPLACE_EXTENSION)/g' $(DEB_DISPLACE_SCRIPT); \
> + $(if $(displace_files_thispkg), \
> + echo 'if [ "$$1" = "remove" ] || [ "$$1" = "deconfigure" ]; then'; \
> + $(foreach file,$(call reverse_dh_compat_6,$(displace_files)), \
> + echo " undisplace_unlink $(call displace_files_replace_name,$(file), )";) \
> + $(foreach file,$(call reverse_dh_compat_6,$(displace_hide_files)), \
> + echo " undisplace_unhide $(file) $(cdbs_curpkg)";) \
> + echo 'fi'; \
> + ) \
> + $(if $(dh_compat_6), \
> + if [ -e $(CURDIR)/debian/$(cdbs_curpkg).prerm.debhelper ]; then \
> + cat $(CURDIR)/debian/$(cdbs_curpkg).prerm.debhelper; \
> + fi;) \
> + } >> $(CURDIR)/debian/$(cdbs_curpkg).prerm.debhelper.new
> + mv $(CURDIR)/debian/$(cdbs_curpkg).prerm.debhelper.new \
> + $(CURDIR)/debian/$(cdbs_curpkg).prerm.debhelper
> +# Add an encoding of the names of the diverted files to the Provides:
> +# and Conflicts: lists. This prevents two packages diverting the same
> +# file from being installed simultaneously (it cannot work, and this
> +# produces a much less ugly error). Requires in debian/control:
> +# Provides: ${diverted-files}
> +# Conflicts: ${diverted-files}
> + set -e; \
> + { \
> + echo -n "diverted-files="; \
> + $(foreach file,$(displace_files_thispkg),\
> + echo -n "diverts-"; \
> + ${DEB_DISPLACE_ENCODER} "$(call displace_files_replace_name,$(file))"; \
> + echo -n ", ";) \
> + echo; \
> + } >> $(CURDIR)/debian/$(cdbs_curpkg).substvars
> +
> +$(patsubst %,binary-post-install/%,$(DEB_DISPLACE_PACKAGES)) :: binary-post-install/%: debian-displace/%
> +
> +endif
>
> Copied: trunk/debathena/debathena/config-package-dev/displace.sh.in (from rev 25843, trunk/debathena/debathena/config-package-dev/divert.sh.in)
> ===================================================================
> --- trunk/debathena/debathena/config-package-dev/displace.sh.in (rev 0)
> +++ trunk/debathena/debathena/config-package-dev/displace.sh.in 2013-03-07 22:59:53 UTC (rev 25844)
> @@ -0,0 +1,159 @@
> +# displace.sh.in: diversion helpers for maintainer scripts
> +#
> +# displace_link <prefix> <suffix>
> +#
> +# Ensures that the file <prefix><suffix> is properly diverted to
> +# <prefix>.divert-orig<suffix> by this package, and becomes a
> +# symbolic link to either <prefix>.divert<suffix> (default) or
> +# <prefix>.divert-orig<suffix>.
> +#
> +# undisplace_unlink <prefix> <suffix>
> +#
> +# Undoes the action of displace_link <prefix> <suffix> specified
> +# above.
> +#
> +# Version: 4.0
> +#
> +# Copyright © 2008–2012 Tim Abbott <tabbott@mit.edu> and Anders
> +# Kaseorg <andersk@mit.edu>
> +#
> +# Permission is hereby granted, free of charge, to any person
> +# obtaining a copy of this software and associated documentation files
> +# (the “Software”), to deal in the Software without restriction,
> +# including without limitation the rights to use, copy, modify, merge,
> +# publish, distribute, sublicense, and/or sell copies of the Software,
> +# and to permit persons to whom the Software is furnished to do so,
> +# subject to the following conditions:
> +#
> +# The above copyright notice and this permission notice shall be
> +# included in all copies or substantial portions of the Software.
> +#
> +# THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND,
> +# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
> +# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
> +# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
> +# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
> +# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
> +# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
> +# SOFTWARE.
> +#
> +
> +package=#PACKAGE#
> +
> +ours=#DEB_DISPLACE_EXTENSION#
> +theirs=#DEB_DISPLACE_EXTENSION#-orig
> +
> +displace_link_displace()
> +{
> + file=$1
> + ourfile=$2
> + theirfile=$3
> + if ! LC_ALL=C dpkg-divert --list "$package" | \
> + grep -xFq "diversion of $file to $theirfile by $package"; then
> + dpkg-divert --divert "$theirfile" --rename --package "$package" --add "$file"
> + fi
> +}
> +
> +displace_link_symlink()
> +{
> + file=$1
> + ourfile=$2
> + theirfile=$3
> + if [ ! -L "$file" ] && [ ! -e "$file" ]; then
> + ln -s "$(basename "$ourfile")" "$file"
> + elif [ ! -L "$file" ] || \
> + [ "$(readlink "$file")" != "$(basename "$ourfile")" -a \
> + "$(readlink "$file")" != "$(basename "$theirfile")" ]; then
> + echo "*** OMINOUS WARNING ***: $file is not linked to either $(basename "$ourfile") or $(basename "$theirfile")" >&2
> + fi
> +}
> +
> +displace_link()
> +{
> + prefix=$1
> + suffix=$2
> +
> + file=$prefix$suffix
> + ourfile=$prefix$ours$suffix
> + theirfile=$prefix$theirs$suffix
> + displace_link_displace "$file" "$ourfile" "$theirfile"
> + displace_link_symlink "$file" "$ourfile" "$theirfile"
> +}
> +
> +displace_hide()
> +{
> + file=$1
> + ourfile=""
> + theirfile=$2
> + displace_link_displace "$file" "$ourfile" "$theirfile"
> +}
> +
> +undisplace_unlink_symlink()
> +{
> + file="$1"
> + ourfile="$2"
> + theirfile="$3"
> + if [ ! -L "$file" ] || \
> + [ "$(readlink "$file")" != "$(basename "$ourfile")" -a \
> + "$(readlink "$file")" != "$(basename "$theirfile")" ]; then
> + echo "*** OMINOUS WARNING ***: $file is not linked to either $(basename "$ourfile") or $(basename "$theirfile")" >&2
> + else
> + rm -f "$file"
> + fi
> +}
> +
> +undisplace_unlink_displace()
> +{
> + file="$1"
> + if [ ! -L "$file" ] && [ ! -e "$file" ]; then
> + dpkg-divert --remove --rename --package "$package" "$file"
> + else
> + echo "Not removing diversion of $file by $package" >&2
> + fi
> +}
> +
> +undisplace_unlink()
> +{
> + prefix=$1
> + suffix=$2
> +
> + file=$prefix$suffix
> + ourfile=$prefix$ours$suffix
> + theirfile=$prefix$theirs$suffix
> +
> + undisplace_unlink_symlink "$file" "$ourfile" "$theirfile"
> + undisplace_unlink_displace "$file"
> +}
> +
> +undisplace_unhide()
> +{
> + file=$1
> + undisplace_unlink_displace "$file"
> +}
> +
> +check_undisplace_unlink()
> +{
> + prefix=$1
> + suffix=$2
> +
> + file=$prefix$suffix
> + ourfile=$prefix$ours$suffix
> + theirfile=$prefix$theirs$suffix
> +
> + if LC_ALL=C dpkg-divert --list "$package" | \
> + grep -xFq "diversion of $file to $theirfile by $package"; then
> + undisplace_unlink "$prefix" "$suffix"
> + fi
> +}
> +
> +check_undisplace_unhide()
> +{
> + file=$1
> + hiddenfile=$2
> + if LC_ALL=C dpkg-divert --list "$package" | \
> + grep -xFq "diversion of $file to $hiddenfile by $package"; then
> + undisplace_unhide "$file"
> + fi
> +}
> +
> +# End of divert.sh.in
>
> Modified: trunk/debathena/debathena/config-package-dev/encode
> ===================================================================
> --- trunk/debathena/debathena/config-package-dev/encode 2013-03-07 21:46:43 UTC (rev 25843)
> +++ trunk/debathena/debathena/config-package-dev/encode 2013-03-07 22:59:53 UTC (rev 25844)
> @@ -13,18 +13,6 @@
>
> use strict;
> use warnings;
> +use Debian::Debhelper::config_package;
>
> -$ARGV[0] =~ s,^/,,;
> -foreach (split('', $ARGV[0])) {
> - if (m/[a-z0-9.-]/) {
> - print "$_";
> - } elsif (m/[A-Z]/) {
> - print "+".lc($_)."+";
> - } elsif ($_ eq '/') {
> - print "++";
> - } elsif ($_ eq '_') {
> - print "+-+";
> - } else{
> - print "+x".hex(ord($_))."+";
> - }
> -}
> +print encode($ARGV[0]);
>
> Modified: trunk/debathena/debathena/config-package-dev/examples/EXAMPLES
> ===================================================================
> --- trunk/debathena/debathena/config-package-dev/examples/EXAMPLES 2013-03-07 21:46:43 UTC (rev 25843)
> +++ trunk/debathena/debathena/config-package-dev/examples/EXAMPLES 2013-03-07 22:59:53 UTC (rev 25844)
> @@ -1,15 +1,37 @@
> This directory contains example packages using the config-package-dev
> system that you can start from in designing your own packages.
>
> -debathena-conffile-example-1.0: Example package using DEB_DIVERT_FILES to divert configuration files
> -debathena-bin-example-1.0: Example package diverting binaries using DEB_DIVERT_FILES
> -debathena-bin-example-1.1: Upgrade of debathena-bin-example-1.0 removing one of the diversions using DEB_UNDIVERT_FILES.
> -debathena-transform-example-1.0: Example package using DEB_TRANSFORM_FILES
> -debathena-cron-example-1.0: Example package using DEB_REMOVE_FILES to disable a cron job
> +debathena-conffile-example-1.0:
> + Displaces a configuration file and provides different configuration
> +debathena-conffile-example-1.1:
> + Transforms a configuration file if it exists at build time
> +debathena-bin-example-1.0:
> + Displaces a binary and provides a wrapper script
> +debathena-bin-example-1.1:
> + Upgrades debathena-bin-example-1.0 undoing one of the displacements
> +debathena-transform-example-1.0:
> + Transforms a configuration file
> +debathena-cron-example-1.0:
> + Hides a cron job
>
> -Note that if you want the control files to be regenerated from the
> -control.in files, you need to add
> +Both CDBS and Debhelper 7+ versions are provided, in the cdbs/ and
> +debhelper/ directories, respectively.
>
> +
> +If you are trying to build these packages out of a config-package-dev
> +source tree (e.g., because you are hacking on config-package-dev), note
> +that you will need to set a few environment variables to make things
> +work. For debuild, e.g., try the command
> +
> +debuild -e PERL5LIB=../../.. -e DH_AUTOSCRIPTDIR=../../.. --prepend-path=../../..
> +
> +This trick will not work for CDBS, since debian/rules hard-codes an
> +absolute path to CDBS class and rules files.
> +
> +
> +For the CDBS examples, note that if you want the control files to be
> +regenerated from the control.in files, you need to add
> +
> DEB_AUTO_UPDATE_DEBIAN_CONTROL=1
>
> to the debian/rules files (or e.g. set it in your environment).
> @@ -17,3 +39,9 @@
> We do not include DEB_AUTO_UPDATE_DEBIAN_CONTROL=1 in these example
> rules files because option is banned in official Debian packages (see
> the CDBS section of <http://ftp-master.debian.org/REJECT-FAQ.html>).
> +
> +
> +config-package-dev supports older versions of debhelper, although
> +examples are not given. You can use it in your own packages by adding
> +dh_configpackage into the list of dh_* commands in debian/rules, before
> +dh_link.
>
> Modified: trunk/debathena/debathena/config-package-dev/examples/cdbs/debathena-bin-example-1.0/debian/rules
> ===================================================================
> --- trunk/debathena/debathena/config-package-dev/examples/debathena-bin-example-1.0/debian/rules 2013-03-07 21:46:43 UTC (rev 25843)
> +++ trunk/debathena/debathena/config-package-dev/examples/cdbs/debathena-bin-example-1.0/debian/rules 2013-03-07 22:59:53 UTC (rev 25844)
> @@ -1,15 +1,15 @@
> #!/usr/bin/make -f
>
> -DEB_DIVERT_EXTENSION = .debathena
> +DEB_DISPLACE_EXTENSION = .debathena
> # Install wrapper scripts for /usr/bin/elinks and /usr/bin/less
> -DEB_DIVERT_FILES_debathena-bin-example += \
> +DEB_DISPLACE_FILES_debathena-bin-example += \
> /usr/bin/elinks.debathena \
> /usr/bin/less.debathena
>
> # If these had materially different behavior from the original
> -# versions, one might divert the man pages as well
> -DEB_DIVERT_FILES_debathena-bin-example += /usr/share/man/man1/elinks.debathena.1.gz
> -DEB_DIVERT_FILES_debathena-bin-example += /usr/share/man/man1/less.debathena.1.gz
> +# versions, one might displace the man pages as well
> +DEB_DISPLACE_FILES_debathena-bin-example += /usr/share/man/man1/elinks.debathena.1.gz
> +DEB_DISPLACE_FILES_debathena-bin-example += /usr/share/man/man1/less.debathena.1.gz
>
> # This isn't config-package-dev specific, but we may want to install symlinks instead.
> DEB_DH_LINK_debathena-bin-example += \
>
> Modified: trunk/debathena/debathena/config-package-dev/examples/cdbs/debathena-bin-example-1.1/debian/changelog
> ===================================================================
> --- trunk/debathena/debathena/config-package-dev/examples/debathena-bin-example-1.1/debian/changelog 2013-03-07 21:46:43 UTC (rev 25843)
> +++ trunk/debathena/debathena/config-package-dev/examples/cdbs/debathena-bin-example-1.1/debian/changelog 2013-03-07 22:59:53 UTC (rev 25844)
> @@ -1,6 +1,6 @@
> debathena-bin-example (1.1) unstable; urgency=low
>
> - * suppose elinks bug is fixed; stop diverting elinks.
> + * suppose elinks bug is fixed; stop displacing elinks.
>
> -- Tim Abbott <tabbott@mit.edu> Sun, 13 Jul 2008 02:06:39 -0400
>
>
> Modified: trunk/debathena/debathena/config-package-dev/examples/cdbs/debathena-bin-example-1.1/debian/rules
> ===================================================================
> --- trunk/debathena/debathena/config-package-dev/examples/debathena-bin-example-1.1/debian/rules 2013-03-07 21:46:43 UTC (rev 25843)
> +++ trunk/debathena/debathena/config-package-dev/examples/cdbs/debathena-bin-example-1.1/debian/rules 2013-03-07 22:59:53 UTC (rev 25844)
> @@ -1,23 +1,23 @@
> #!/usr/bin/make -f
>
> -DEB_DIVERT_EXTENSION = .debathena
> +DEB_DISPLACE_EXTENSION = .debathena
> # Install wrapper scripts for /usr/bin/elinks and /usr/bin/less
> -DEB_DIVERT_FILES_debathena-bin-example += \
> +DEB_DISPLACE_FILES_debathena-bin-example += \
> /usr/bin/less.debathena
>
> # If these had materially different behavior from the original
> # versions, one might divert the man pages as well
> -DEB_DIVERT_FILES_debathena-bin-example += /usr/share/man/man1/less.debathena.1.gz
> +DEB_DISPLACE_FILES_debathena-bin-example += /usr/share/man/man1/less.debathena.1.gz
>
> # This isn't config-package-dev specific, but we may want to install symlinks instead.
> DEB_DH_LINK_debathena-bin-example += \
> /usr/share/man/man1/less.debathena-orig.1.gz /usr/share/man/man1/less.debathena.1.gz
>
> -# Remove elinks diversion on upgrade if it was previously in place on
> +# Remove elinks displacement on upgrade if it was previously in place on
> # the target system
> -DEB_UNDIVERT_FILES_debathena-bin-example += /usr/bin/elinks.debathena
> +DEB_UNDISPLACE_FILES_debathena-bin-example += /usr/bin/elinks.debathena
> # and the man page
> -DEB_UNDIVERT_FILES_debathena-bin-example += /usr/share/man/man1/elinks.debathena.1.gz
> +DEB_UNDISPLACE_FILES_debathena-bin-example += /usr/share/man/man1/elinks.debathena.1.gz
>
> include /usr/share/cdbs/1/rules/debhelper.mk
> include /usr/share/cdbs/1/rules/config-package.mk
>
> Modified: trunk/debathena/debathena/config-package-dev/examples/cdbs/debathena-conffile-example-1.0/debian/rules
> ===================================================================
> --- trunk/debathena/debathena/config-package-dev/examples/debathena-conffile-example-1.0/debian/rules 2013-03-07 21:46:43 UTC (rev 25843)
> +++ trunk/debathena/debathena/config-package-dev/examples/cdbs/debathena-conffile-example-1.0/debian/rules 2013-03-07 22:59:53 UTC (rev 25844)
> @@ -1,8 +1,8 @@
> #!/usr/bin/make -f
>
> -DEB_DIVERT_EXTENSION = .debathena
> +DEB_DISPLACE_EXTENSION = .debathena
> # Replace some base files with simple replacements.
> -DEB_DIVERT_FILES_debathena-conffile-example += \
> +DEB_DISPLACE_FILES_debathena-conffile-example += \
> /etc/issue.net.debathena
> # These files are installed via dh_install from the files/ directory
> # (see debian/debathena-conffile-example.install)
>
> Added: trunk/debathena/debathena/config-package-dev/examples/cdbs/debathena-conffile-example-1.1/debian/changelog
> ===================================================================
> --- trunk/debathena/debathena/config-package-dev/examples/cdbs/debathena-conffile-example-1.1/debian/changelog (rev 0)
> +++ trunk/debathena/debathena/config-package-dev/examples/cdbs/debathena-conffile-example-1.1/debian/changelog 2013-03-07 22:59:53 UTC (rev 25844)
> @@ -0,0 +1,12 @@
> +debathena-conffile-example (1.1) unstable; urgency=low
> +
> + * Remove /etc/sysctl.d/10-ptrace.conf if it exists. Once again,
> + convenience trumps security.
> +
> + -- Jonathan Reed <jdreed@mit.edu> Mon, 25 Feb 2013 15:22:59 -0500
> +
> +debathena-conffile-example (1.0) unstable; urgency=low
> +
> + * Initial release.
> +
> + -- Tim Abbott <tabbott@mit.edu> Sun, 13 Jul 2008 00:37:03 -0400
>
> Added: trunk/debathena/debathena/config-package-dev/examples/cdbs/debathena-conffile-example-1.1/debian/compat
> ===================================================================
> --- trunk/debathena/debathena/config-package-dev/examples/cdbs/debathena-conffile-example-1.1/debian/compat (rev 0)
> +++ trunk/debathena/debathena/config-package-dev/examples/cdbs/debathena-conffile-example-1.1/debian/compat 2013-03-07 22:59:53 UTC (rev 25844)
> @@ -0,0 +1 @@
> +4
>
> Added: trunk/debathena/debathena/config-package-dev/examples/cdbs/debathena-conffile-example-1.1/debian/control
> ===================================================================
> --- trunk/debathena/debathena/config-package-dev/examples/cdbs/debathena-conffile-example-1.1/debian/control (rev 0)
> +++ trunk/debathena/debathena/config-package-dev/examples/cdbs/debathena-conffile-example-1.1/debian/control 2013-03-07 22:59:53 UTC (rev 25844)
> @@ -0,0 +1,17 @@
> +Source: debathena-conffile-example
> +Section: config
> +Priority: extra
> +Maintainer: Jonathan Reed <jdreed@mit.edu>
> +Build-Depends: cdbs,
> + debhelper,
> + dh-buildinfo,
> + config-package-dev (>= 4.5~)
> +Standards-Version: 3.8.0
> +
> +Package: debathena-conffile-example
> +Architecture: all
> +Depends: ${misc:Depends}
> +Provides: ${diverted-files}
> +Conflicts: ${diverted-files}
> +Description: Example config-package-dev package
> + This is an example config-package-dev package.
>
> Added: trunk/debathena/debathena/config-package-dev/examples/cdbs/debathena-conffile-example-1.1/debian/control.in
> ===================================================================
> --- trunk/debathena/debathena/config-package-dev/examples/cdbs/debathena-conffile-example-1.1/debian/control.in (rev 0)
> +++ trunk/debathena/debathena/config-package-dev/examples/cdbs/debathena-conffile-example-1.1/debian/control.in 2013-03-07 22:59:53 UTC (rev 25844)
> @@ -0,0 +1,14 @@
> +Source: debathena-conffile-example
> +Section: config
> +Priority: extra
> +Maintainer: Jonathan Reed <jdreed@mit.edu>
> +Build-Depends: @cdbs@
> +Standards-Version: 3.8.0
> +
> +Package: debathena-conffile-example
> +Architecture: all
> +Depends: ${misc:Depends}
> +Provides: ${diverted-files}
> +Conflicts: ${diverted-files}
> +Description: Example config-package-dev package
> + This is an example config-package-dev package.
>
> Added: trunk/debathena/debathena/config-package-dev/examples/cdbs/debathena-conffile-example-1.1/debian/copyright
> ===================================================================
> --- trunk/debathena/debathena/config-package-dev/examples/cdbs/debathena-conffile-example-1.1/debian/copyright (rev 0)
> +++ trunk/debathena/debathena/config-package-dev/examples/cdbs/debathena-conffile-example-1.1/debian/copyright 2013-03-07 22:59:53 UTC (rev 25844)
> @@ -0,0 +1,24 @@
> +Example config-package-dev package.
> +
> +Author: Tim Abbott <tabbott@mit.edu>
> +
> +Copyright © 2008 Tim Abbott <tabbott@mit.edu>
> +
> +Permission is hereby granted, free of charge, to any person obtaining
> +a copy of this software and associated documentation files (the
> +"Software"), to deal in the Software without restriction, including
> +without limitation the rights to use, copy, modify, merge, publish,
> +distribute, sublicense, and/or sell copies of the Software, and to
> +permit persons to whom the Software is furnished to do so, subject to
> +the following conditions:
> +
> +The above copyright notice and this permission notice shall be
> +included in all copies or substantial portions of the Software.
> +
> +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
> +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
> +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
> +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
> +LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
> +OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
> +WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
>
> Added: trunk/debathena/debathena/config-package-dev/examples/cdbs/debathena-conffile-example-1.1/debian/debathena-conffile-example.install
> ===================================================================
> --- trunk/debathena/debathena/config-package-dev/examples/cdbs/debathena-conffile-example-1.1/debian/debathena-conffile-example.install (rev 0)
> +++ trunk/debathena/debathena/config-package-dev/examples/cdbs/debathena-conffile-example-1.1/debian/debathena-conffile-example.install 2013-03-07 22:59:53 UTC (rev 25844)
> @@ -0,0 +1 @@
> +files/* /
>
> Added: trunk/debathena/debathena/config-package-dev/examples/cdbs/debathena-conffile-example-1.1/debian/rules
> ===================================================================
> --- trunk/debathena/debathena/config-package-dev/examples/cdbs/debathena-conffile-example-1.1/debian/rules (rev 0)
> +++ trunk/debathena/debathena/config-package-dev/examples/cdbs/debathena-conffile-example-1.1/debian/rules 2013-03-07 22:59:53 UTC (rev 25844)
> @@ -0,0 +1,16 @@
> +#!/usr/bin/make -f
> +
> +DEB_DISPLACE_EXTENSION = .debathena
> +# Replace some base files with simple replacements.
> +DEB_DISPLACE_FILES_debathena-conffile-example += \
> + /etc/issue.net.debathena
> +# These files are installed via dh_install from the files/ directory
> +# (see debian/debathena-conffile-example.install)
> +
> +ifneq ($(wildcard /etc/sysctl.d/10-ptrace.conf),)
> + DEB_HIDE_FILES_debathena-conffile-example += \
> + /etc/sysctl.d/10-ptrace.conf
> +endif
> +
> +include /usr/share/cdbs/1/rules/debhelper.mk
> +include /usr/share/cdbs/1/rules/config-package.mk
>
>
> Property changes on: trunk/debathena/debathena/config-package-dev/examples/cdbs/debathena-conffile-example-1.1/debian/rules
> ___________________________________________________________________
> Added: svn:executable
> + *
>
> Added: trunk/debathena/debathena/config-package-dev/examples/cdbs/debathena-conffile-example-1.1/debian/transform_legal.debathena
> ===================================================================
> --- trunk/debathena/debathena/config-package-dev/examples/cdbs/debathena-conffile-example-1.1/debian/transform_legal.debathena (rev 0)
> +++ trunk/debathena/debathena/config-package-dev/examples/cdbs/debathena-conffile-example-1.1/debian/transform_legal.debathena 2013-03-07 22:59:53 UTC (rev 25844)
> @@ -0,0 +1,6 @@
> +#!/bin/sh
> +
> +cat
> +echo
> +echo "Use of Athena facilities is restricted to authorized holders of Athena"
> +echo "accounts (MIT students, faculty, staff, and other authorized guests.)"
>
>
> Property changes on: trunk/debathena/debathena/config-package-dev/examples/cdbs/debathena-conffile-example-1.1/debian/transform_legal.debathena
> ___________________________________________________________________
> Added: svn:executable
> + *
>
> Added: trunk/debathena/debathena/config-package-dev/examples/cdbs/debathena-conffile-example-1.1/files/etc/issue.net.debathena
> ===================================================================
> --- trunk/debathena/debathena/config-package-dev/examples/cdbs/debathena-conffile-example-1.1/files/etc/issue.net.debathena (rev 0)
> +++ trunk/debathena/debathena/config-package-dev/examples/cdbs/debathena-conffile-example-1.1/files/etc/issue.net.debathena 2013-03-07 22:59:53 UTC (rev 25844)
> @@ -0,0 +1 @@
> +Debian Linux running debathena-conffile-example version 1.0
>
> Modified: trunk/debathena/debathena/config-package-dev/examples/cdbs/debathena-cron-example-1.0/debian/rules
> ===================================================================
> --- trunk/debathena/debathena/config-package-dev/examples/debathena-cron-example-1.0/debian/rules 2013-03-07 21:46:43 UTC (rev 25843)
> +++ trunk/debathena/debathena/config-package-dev/examples/cdbs/debathena-cron-example-1.0/debian/rules 2013-03-07 22:59:53 UTC (rev 25844)
> @@ -1,17 +1,17 @@
> #!/usr/bin/make -f
>
> -DEB_DIVERT_EXTENSION = .debathena
> +DEB_DISPLACE_EXTENSION = .debathena
>
> -# This will remove /etc/cron.d/logcheck
> -DEB_REMOVE_FILES_debathena-cron-example += \
> +# This will hide /etc/cron.d/logcheck
> +DEB_HIDE_FILES_debathena-cron-example += \
> /etc/cron.d/logcheck
>
> # We will install (using dh_installcron, by placing the new cron job
> # at debian/debathena-cron-example.cron.d) a new version that runs
> # every minute, rather than every 30 minutes. This will generate a
> # lot of mail. Note that we cannot install a new file to the path
> -# /etc/cron.d/logcheck from which a file was removed using
> -# DEB_REMOVE_FILES.
> +# /etc/cron.d/logcheck from which a file was hidden using
> +# DEB_HIDE_FILES.
>
> include /usr/share/cdbs/1/rules/debhelper.mk
> include /usr/share/cdbs/1/rules/config-package.mk
>
> Modified: trunk/debathena/debathena/config-package-dev/examples/cdbs/debathena-transform-example-1.0/debian/rules
> ===================================================================
> --- trunk/debathena/debathena/config-package-dev/examples/debathena-transform-example-1.0/debian/rules 2013-03-07 21:46:43 UTC (rev 25843)
> +++ trunk/debathena/debathena/config-package-dev/examples/cdbs/debathena-transform-example-1.0/debian/rules 2013-03-07 22:59:53 UTC (rev 25844)
> @@ -1,6 +1,6 @@
> #!/usr/bin/make -f
>
> -DEB_DIVERT_EXTENSION = .debathena
> +DEB_DISPLACE_EXTENSION = .debathena
> DEB_TRANSFORM_FILES_debathena-transform-example += \
> /etc/lynx-cur/lynx.cfg.debathena
>
>
> Added: trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-bin-example-1.0/debian/changelog
> ===================================================================
> --- trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-bin-example-1.0/debian/changelog (rev 0)
> +++ trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-bin-example-1.0/debian/changelog 2013-03-07 22:59:53 UTC (rev 25844)
> @@ -0,0 +1,5 @@
> +debathena-bin-example (1.0) unstable; urgency=low
> +
> + * Initial release.
> +
> + -- Geoffrey Thomas <geofft@mit.edu> Tue, 11 Sep 2012 12:39:03 -0700
>
> Added: trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-bin-example-1.0/debian/compat
> ===================================================================
> --- trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-bin-example-1.0/debian/compat (rev 0)
> +++ trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-bin-example-1.0/debian/compat 2013-03-07 22:59:53 UTC (rev 25844)
> @@ -0,0 +1 @@
> +7
>
> Added: trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-bin-example-1.0/debian/control
> ===================================================================
> --- trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-bin-example-1.0/debian/control (rev 0)
> +++ trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-bin-example-1.0/debian/control 2013-03-07 22:59:53 UTC (rev 25844)
> @@ -0,0 +1,14 @@
> +Source: debathena-bin-example
> +Section: config
> +Priority: extra
> +Maintainer: Geoffrey Thomas <geofft@mit.edu>
> +Build-Depends: debhelper (>= 7.0.0~), config-package-dev (>= 4.15~)
> +Standards-Version: 3.9.2
> +
> +Package: debathena-bin-example
> +Architecture: all
> +Depends: ${misc:Depends}, elinks, less
> +Provides: ${diverted-files}
> +Conflicts: ${diverted-files}
> +Description: Example config-package-dev package
> + This is an example config-package-dev package.
>
> Added: trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-bin-example-1.0/debian/copyright
> ===================================================================
> --- trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-bin-example-1.0/debian/copyright (rev 0)
> +++ trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-bin-example-1.0/debian/copyright 2013-03-07 22:59:53 UTC (rev 25844)
> @@ -0,0 +1,25 @@
> +Example config-package-dev package.
> +
> +Author: Tim Abbott <tabbott@mit.edu>
> +
> +Copyright © 2008 Tim Abbott <tabbott@mit.edu>
> +Copyright © 2012 Geoffrey Thomas <geofft@mit.edu>
> +
> +Permission is hereby granted, free of charge, to any person obtaining
> +a copy of this software and associated documentation files (the
> +"Software"), to deal in the Software without restriction, including
> +without limitation the rights to use, copy, modify, merge, publish,
> +distribute, sublicense, and/or sell copies of the Software, and to
> +permit persons to whom the Software is furnished to do so, subject to
> +the following conditions:
> +
> +The above copyright notice and this permission notice shall be
> +included in all copies or substantial portions of the Software.
> +
> +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
> +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
> +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
> +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
> +LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
> +OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
> +WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
>
> Added: trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-bin-example-1.0/debian/debathena-bin-example.displace
> ===================================================================
> --- trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-bin-example-1.0/debian/debathena-bin-example.displace (rev 0)
> +++ trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-bin-example-1.0/debian/debathena-bin-example.displace 2013-03-07 22:59:53 UTC (rev 25844)
> @@ -0,0 +1,4 @@
> +/usr/bin/elinks.debathena
> +/usr/bin/less.debathena
> +/usr/share/man/man1/elinks.debathena.1.gz
> +/usr/share/man/man1/less.debathena.1.gz
>
> Added: trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-bin-example-1.0/debian/debathena-bin-example.install
> ===================================================================
> --- trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-bin-example-1.0/debian/debathena-bin-example.install (rev 0)
> +++ trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-bin-example-1.0/debian/debathena-bin-example.install 2013-03-07 22:59:53 UTC (rev 25844)
> @@ -0,0 +1,2 @@
> +debian/elinks.debathena usr/bin
> +debian/less.debathena usr/bin
>
> Added: trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-bin-example-1.0/debian/debathena-bin-example.links
> ===================================================================
> --- trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-bin-example-1.0/debian/debathena-bin-example.links (rev 0)
> +++ trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-bin-example-1.0/debian/debathena-bin-example.links 2013-03-07 22:59:53 UTC (rev 25844)
> @@ -0,0 +1,2 @@
> +/usr/share/man/man1/elinks.debathena-orig.1.gz /usr/share/man/man1/elinks.debathena.1.gz
> +/usr/share/man/man1/less.debathena-orig.1.gz /usr/share/man/man1/less.debathena.1.gz
>
> Added: trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-bin-example-1.0/debian/elinks.debathena
> ===================================================================
> --- trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-bin-example-1.0/debian/elinks.debathena (rev 0)
> +++ trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-bin-example-1.0/debian/elinks.debathena 2013-03-07 22:59:53 UTC (rev 25844)
> @@ -0,0 +1,6 @@
> +#!/bin/sh
> +# Wrapper to make elinks put its UNIX sockets under /tmp rather than in $HOME.
> +# Works around <http://bugs.debian.org/460336>.
> +TMPDIR=mktemp -d
> +export ELINKS_CONFDIR=$TMPDIR
> +exec elinks.debathena-orig "$@"x
>
> Added: trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-bin-example-1.0/debian/less.debathena
> ===================================================================
> --- trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-bin-example-1.0/debian/less.debathena (rev 0)
> +++ trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-bin-example-1.0/debian/less.debathena 2013-03-07 22:59:53 UTC (rev 25844)
> @@ -0,0 +1,4 @@
> +#!/bin/sh
> +# Wrapper to make less read tarballs and so on.
> +eval $(lesspipe)
> +exec less.debathena-orig "$@"
>
> Added: trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-bin-example-1.0/debian/rules
> ===================================================================
> --- trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-bin-example-1.0/debian/rules (rev 0)
> +++ trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-bin-example-1.0/debian/rules 2013-03-07 22:59:53 UTC (rev 25844)
> @@ -0,0 +1,4 @@
> +#!/usr/bin/make -f
> +
> +%:
> + dh $@ --with=config-package
>
>
> Property changes on: trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-bin-example-1.0/debian/rules
> ___________________________________________________________________
> Added: svn:executable
> + *
>
> Added: trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-bin-example-1.0/debian/source/format
> ===================================================================
> --- trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-bin-example-1.0/debian/source/format (rev 0)
> +++ trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-bin-example-1.0/debian/source/format 2013-03-07 22:59:53 UTC (rev 25844)
> @@ -0,0 +1 @@
> +3.0 (native)
>
> Added: trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-bin-example-1.1/debian/changelog
> ===================================================================
> --- trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-bin-example-1.1/debian/changelog (rev 0)
> +++ trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-bin-example-1.1/debian/changelog 2013-03-07 22:59:53 UTC (rev 25844)
> @@ -0,0 +1,11 @@
> +debathena-bin-example (1.1) unstable; urgency=low
> +
> + * suppose elinks bug is fixed; stop displacing elinks.
> +
> + -- Geoffrey Thomas <geofft@mit.edu> Tue, 11 Sep 2012 12:50:13 -0700
> +
> +debathena-bin-example (1.0) unstable; urgency=low
> +
> + * Initial release.
> +
> + -- Geoffrey Thomas <geofft@mit.edu> Tue, 11 Sep 2012 12:39:03 -0700
>
> Added: trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-bin-example-1.1/debian/compat
> ===================================================================
> --- trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-bin-example-1.1/debian/compat (rev 0)
> +++ trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-bin-example-1.1/debian/compat 2013-03-07 22:59:53 UTC (rev 25844)
> @@ -0,0 +1 @@
> +7
>
> Added: trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-bin-example-1.1/debian/control
> ===================================================================
> --- trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-bin-example-1.1/debian/control (rev 0)
> +++ trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-bin-example-1.1/debian/control 2013-03-07 22:59:53 UTC (rev 25844)
> @@ -0,0 +1,14 @@
> +Source: debathena-bin-example
> +Section: config
> +Priority: extra
> +Maintainer: Geoffrey Thomas <geofft@mit.edu>
> +Build-Depends: debhelper (>= 7.0.0~), config-package-dev (>= 4.15~)
> +Standards-Version: 3.9.2
> +
> +Package: debathena-bin-example
> +Architecture: all
> +Depends: ${misc:Depends}, less
> +Provides: ${diverted-files}
> +Conflicts: ${diverted-files}
> +Description: Example config-package-dev package
> + This is an example config-package-dev package.
>
> Added: trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-bin-example-1.1/debian/copyright
> ===================================================================
> --- trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-bin-example-1.1/debian/copyright (rev 0)
> +++ trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-bin-example-1.1/debian/copyright 2013-03-07 22:59:53 UTC (rev 25844)
> @@ -0,0 +1,25 @@
> +Example config-package-dev package.
> +
> +Author: Tim Abbott <tabbott@mit.edu>
> +
> +Copyright © 2008 Tim Abbott <tabbott@mit.edu>
> +Copyright © 2012 Geoffrey Thomas <geofft@mit.edu>
> +
> +Permission is hereby granted, free of charge, to any person obtaining
> +a copy of this software and associated documentation files (the
> +"Software"), to deal in the Software without restriction, including
> +without limitation the rights to use, copy, modify, merge, publish,
> +distribute, sublicense, and/or sell copies of the Software, and to
> +permit persons to whom the Software is furnished to do so, subject to
> +the following conditions:
> +
> +The above copyright notice and this permission notice shall be
> +included in all copies or substantial portions of the Software.
> +
> +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
> +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
> +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
> +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
> +LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
> +OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
> +WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
>
> Added: trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-bin-example-1.1/debian/debathena-bin-example.displace
> ===================================================================
> --- trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-bin-example-1.1/debian/debathena-bin-example.displace (rev 0)
> +++ trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-bin-example-1.1/debian/debathena-bin-example.displace 2013-03-07 22:59:53 UTC (rev 25844)
> @@ -0,0 +1,2 @@
> +/usr/bin/less.debathena
> +/usr/share/man/man1/less.debathena.1.gz
>
> Added: trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-bin-example-1.1/debian/debathena-bin-example.install
> ===================================================================
> --- trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-bin-example-1.1/debian/debathena-bin-example.install (rev 0)
> +++ trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-bin-example-1.1/debian/debathena-bin-example.install 2013-03-07 22:59:53 UTC (rev 25844)
> @@ -0,0 +1 @@
> +debian/less.debathena usr/bin
>
> Added: trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-bin-example-1.1/debian/debathena-bin-example.links
> ===================================================================
> --- trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-bin-example-1.1/debian/debathena-bin-example.links (rev 0)
> +++ trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-bin-example-1.1/debian/debathena-bin-example.links 2013-03-07 22:59:53 UTC (rev 25844)
> @@ -0,0 +1 @@
> +/usr/share/man/man1/less.debathena-orig.1.gz /usr/share/man/man1/less.debathena.1.gz
>
> Added: trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-bin-example-1.1/debian/debathena-bin-example.undisplace
> ===================================================================
> --- trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-bin-example-1.1/debian/debathena-bin-example.undisplace (rev 0)
> +++ trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-bin-example-1.1/debian/debathena-bin-example.undisplace 2013-03-07 22:59:53 UTC (rev 25844)
> @@ -0,0 +1,2 @@
> +/usr/bin/elinks.debathena
> +/usr/share/man/man1/elinks.debathena.1.gz
>
> Added: trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-bin-example-1.1/debian/less.debathena
> ===================================================================
> --- trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-bin-example-1.1/debian/less.debathena (rev 0)
> +++ trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-bin-example-1.1/debian/less.debathena 2013-03-07 22:59:53 UTC (rev 25844)
> @@ -0,0 +1,4 @@
> +#!/bin/sh
> +# Wrapper to make less read tarballs and so on.
> +eval $(lesspipe)
> +exec less.debathena-orig "$@"
>
> Added: trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-bin-example-1.1/debian/rules
> ===================================================================
> --- trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-bin-example-1.1/debian/rules (rev 0)
> +++ trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-bin-example-1.1/debian/rules 2013-03-07 22:59:53 UTC (rev 25844)
> @@ -0,0 +1,4 @@
> +#!/usr/bin/make -f
> +
> +%:
> + dh $@ --with=config-package
>
>
> Property changes on: trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-bin-example-1.1/debian/rules
> ___________________________________________________________________
> Added: svn:executable
> + *
>
> Added: trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-bin-example-1.1/debian/source/format
> ===================================================================
> --- trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-bin-example-1.1/debian/source/format (rev 0)
> +++ trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-bin-example-1.1/debian/source/format 2013-03-07 22:59:53 UTC (rev 25844)
> @@ -0,0 +1 @@
> +3.0 (native)
>
> Added: trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-conffile-example-1.0/debian/changelog
> ===================================================================
> --- trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-conffile-example-1.0/debian/changelog (rev 0)
> +++ trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-conffile-example-1.0/debian/changelog 2013-03-07 22:59:53 UTC (rev 25844)
> @@ -0,0 +1,5 @@
> +debathena-conffile-example (1.0) unstable; urgency=low
> +
> + * Initial release.
> +
> + -- Geoffrey Thomas <geofft@mit.edu> Wed, 08 Aug 2012 18:37:54 -0700
>
> Added: trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-conffile-example-1.0/debian/compat
> ===================================================================
> --- trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-conffile-example-1.0/debian/compat (rev 0)
> +++ trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-conffile-example-1.0/debian/compat 2013-03-07 22:59:53 UTC (rev 25844)
> @@ -0,0 +1 @@
> +7
>
> Added: trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-conffile-example-1.0/debian/control
> ===================================================================
> --- trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-conffile-example-1.0/debian/control (rev 0)
> +++ trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-conffile-example-1.0/debian/control 2013-03-07 22:59:53 UTC (rev 25844)
> @@ -0,0 +1,14 @@
> +Source: debathena-conffile-example
> +Section: config
> +Priority: extra
> +Maintainer: Geoffrey Thomas <geofft@mit.edu>
> +Build-Depends: debhelper (>= 7.0.0~), config-package-dev (>= 4.15~)
> +Standards-Version: 3.9.2
> +
> +Package: debathena-conffile-example
> +Architecture: all
> +Depends: ${misc:Depends}
> +Provides: ${diverted-files}
> +Conflicts: ${diverted-files}
> +Description: Example config-package-dev package
> + This is an example config-package-dev package.
>
> Added: trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-conffile-example-1.0/debian/copyright
> ===================================================================
> --- trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-conffile-example-1.0/debian/copyright (rev 0)
> +++ trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-conffile-example-1.0/debian/copyright 2013-03-07 22:59:53 UTC (rev 25844)
> @@ -0,0 +1,25 @@
> +Example config-package-dev package.
> +
> +Author: Tim Abbott <tabbott@mit.edu>
> +
> +Copyright © 2008 Tim Abbott <tabbott@mit.edu>
> +Copyright © 2012 Geoffrey Thomas <geofft@mit.edu>
> +
> +Permission is hereby granted, free of charge, to any person obtaining
> +a copy of this software and associated documentation files (the
> +"Software"), to deal in the Software without restriction, including
> +without limitation the rights to use, copy, modify, merge, publish,
> +distribute, sublicense, and/or sell copies of the Software, and to
> +permit persons to whom the Software is furnished to do so, subject to
> +the following conditions:
> +
> +The above copyright notice and this permission notice shall be
> +included in all copies or substantial portions of the Software.
> +
> +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
> +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
> +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
> +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
> +LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
> +OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
> +WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
>
> Added: trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-conffile-example-1.0/debian/debathena-conffile-example.displace
> ===================================================================
> --- trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-conffile-example-1.0/debian/debathena-conffile-example.displace (rev 0)
> +++ trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-conffile-example-1.0/debian/debathena-conffile-example.displace 2013-03-07 22:59:53 UTC (rev 25844)
> @@ -0,0 +1 @@
> +/etc/issue.net.debathena
>
> Added: trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-conffile-example-1.0/debian/debathena-conffile-example.install
> ===================================================================
> --- trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-conffile-example-1.0/debian/debathena-conffile-example.install (rev 0)
> +++ trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-conffile-example-1.0/debian/debathena-conffile-example.install 2013-03-07 22:59:53 UTC (rev 25844)
> @@ -0,0 +1 @@
> +files/* /
>
> Added: trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-conffile-example-1.0/debian/rules
> ===================================================================
> --- trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-conffile-example-1.0/debian/rules (rev 0)
> +++ trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-conffile-example-1.0/debian/rules 2013-03-07 22:59:53 UTC (rev 25844)
> @@ -0,0 +1,4 @@
> +#!/usr/bin/make -f
> +
> +%:
> + dh $@ --with config-package
>
>
> Property changes on: trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-conffile-example-1.0/debian/rules
> ___________________________________________________________________
> Added: svn:executable
> + *
>
> Added: trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-conffile-example-1.0/debian/source/format
> ===================================================================
> --- trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-conffile-example-1.0/debian/source/format (rev 0)
> +++ trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-conffile-example-1.0/debian/source/format 2013-03-07 22:59:53 UTC (rev 25844)
> @@ -0,0 +1 @@
> +3.0 (native)
>
> Added: trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-conffile-example-1.0/files/etc/issue.net.debathena
> ===================================================================
> --- trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-conffile-example-1.0/files/etc/issue.net.debathena (rev 0)
> +++ trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-conffile-example-1.0/files/etc/issue.net.debathena 2013-03-07 22:59:53 UTC (rev 25844)
> @@ -0,0 +1 @@
> +Debian Linux running debathena-conffile-example version 1.0
>
> Added: trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-conffile-example-1.1/debian/changelog
> ===================================================================
> --- trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-conffile-example-1.1/debian/changelog (rev 0)
> +++ trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-conffile-example-1.1/debian/changelog 2013-03-07 22:59:53 UTC (rev 25844)
> @@ -0,0 +1,12 @@
> +debathena-conffile-example (1.1) unstable; urgency=low
> +
> + * Remove /etc/sysctl.d/10-ptrace.conf if it exists. Once again,
> + convenience trumps security.
> +
> + -- Geoffrey Thomas <geofft@mit.edu> Thu, 13 Dec 2012 16:46:39 -0800
> +
> +debathena-conffile-example (1.0) unstable; urgency=low
> +
> + * Initial release.
> +
> + -- Geoffrey Thomas <geofft@mit.edu> Wed, 08 Aug 2012 18:37:54 -0700
>
> Added: trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-conffile-example-1.1/debian/compat
> ===================================================================
> --- trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-conffile-example-1.1/debian/compat (rev 0)
> +++ trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-conffile-example-1.1/debian/compat 2013-03-07 22:59:53 UTC (rev 25844)
> @@ -0,0 +1 @@
> +7
>
> Added: trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-conffile-example-1.1/debian/control
> ===================================================================
> --- trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-conffile-example-1.1/debian/control (rev 0)
> +++ trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-conffile-example-1.1/debian/control 2013-03-07 22:59:53 UTC (rev 25844)
> @@ -0,0 +1,14 @@
> +Source: debathena-conffile-example
> +Section: config
> +Priority: extra
> +Maintainer: Geoffrey Thomas <geofft@mit.edu>
> +Build-Depends: debhelper (>= 7.0.50~), config-package-dev (>= 4.15~)
> +Standards-Version: 3.9.2
> +
> +Package: debathena-conffile-example
> +Architecture: all
> +Depends: ${misc:Depends}
> +Provides: ${diverted-files}
> +Conflicts: ${diverted-files}
> +Description: Example config-package-dev package
> + This is an example config-package-dev package.
>
> Added: trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-conffile-example-1.1/debian/copyright
> ===================================================================
> --- trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-conffile-example-1.1/debian/copyright (rev 0)
> +++ trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-conffile-example-1.1/debian/copyright 2013-03-07 22:59:53 UTC (rev 25844)
> @@ -0,0 +1,25 @@
> +Example config-package-dev package.
> +
> +Author: Tim Abbott <tabbott@mit.edu>
> +
> +Copyright © 2008 Tim Abbott <tabbott@mit.edu>
> +Copyright © 2012 Geoffrey Thomas <geofft@mit.edu>
> +
> +Permission is hereby granted, free of charge, to any person obtaining
> +a copy of this software and associated documentation files (the
> +"Software"), to deal in the Software without restriction, including
> +without limitation the rights to use, copy, modify, merge, publish,
> +distribute, sublicense, and/or sell copies of the Software, and to
> +permit persons to whom the Software is furnished to do so, subject to
> +the following conditions:
> +
> +The above copyright notice and this permission notice shall be
> +included in all copies or substantial portions of the Software.
> +
> +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
> +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
> +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
> +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
> +LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
> +OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
> +WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
>
> Added: trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-conffile-example-1.1/debian/debathena-conffile-example.displace
> ===================================================================
> --- trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-conffile-example-1.1/debian/debathena-conffile-example.displace (rev 0)
> +++ trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-conffile-example-1.1/debian/debathena-conffile-example.displace 2013-03-07 22:59:53 UTC (rev 25844)
> @@ -0,0 +1 @@
> +/etc/issue.net.debathena
>
> Added: trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-conffile-example-1.1/debian/debathena-conffile-example.install
> ===================================================================
> --- trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-conffile-example-1.1/debian/debathena-conffile-example.install (rev 0)
> +++ trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-conffile-example-1.1/debian/debathena-conffile-example.install 2013-03-07 22:59:53 UTC (rev 25844)
> @@ -0,0 +1 @@
> +files/* /
>
> Added: trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-conffile-example-1.1/debian/rules
> ===================================================================
> --- trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-conffile-example-1.1/debian/rules (rev 0)
> +++ trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-conffile-example-1.1/debian/rules 2013-03-07 22:59:53 UTC (rev 25844)
> @@ -0,0 +1,10 @@
> +#!/usr/bin/make -f
> +
> +%:
> + dh $@ --with config-package
> +
> +override_dh_configpackage:
> + dh_configpackage
> +ifneq ($(wildcard /etc/sysctl.d/10-ptrace.conf),)
> + dh_configpackage --hide /etc/sysctl.d/10-ptrace.conf
> +endif
>
>
> Property changes on: trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-conffile-example-1.1/debian/rules
> ___________________________________________________________________
> Added: svn:executable
> + *
>
> Added: trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-conffile-example-1.1/debian/source/format
> ===================================================================
> --- trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-conffile-example-1.1/debian/source/format (rev 0)
> +++ trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-conffile-example-1.1/debian/source/format 2013-03-07 22:59:53 UTC (rev 25844)
> @@ -0,0 +1 @@
> +3.0 (native)
>
> Added: trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-conffile-example-1.1/debian/transform_legal.debathena
> ===================================================================
> --- trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-conffile-example-1.1/debian/transform_legal.debathena (rev 0)
> +++ trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-conffile-example-1.1/debian/transform_legal.debathena 2013-03-07 22:59:53 UTC (rev 25844)
> @@ -0,0 +1,6 @@
> +#!/bin/sh
> +
> +cat
> +echo
> +echo "Use of Athena facilities is restricted to authorized holders of Athena"
> +echo "accounts (MIT students, faculty, staff, and other authorized guests.)"
>
>
> Property changes on: trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-conffile-example-1.1/debian/transform_legal.debathena
> ___________________________________________________________________
> Added: svn:executable
> + *
>
> Added: trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-conffile-example-1.1/files/etc/issue.net.debathena
> ===================================================================
> --- trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-conffile-example-1.1/files/etc/issue.net.debathena (rev 0)
> +++ trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-conffile-example-1.1/files/etc/issue.net.debathena 2013-03-07 22:59:53 UTC (rev 25844)
> @@ -0,0 +1 @@
> +Debian Linux running debathena-conffile-example version 1.0
>
> Added: trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-cron-example-1.0/debian/changelog
> ===================================================================
> --- trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-cron-example-1.0/debian/changelog (rev 0)
> +++ trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-cron-example-1.0/debian/changelog 2013-03-07 22:59:53 UTC (rev 25844)
> @@ -0,0 +1,5 @@
> +debathena-cron-example (1.0) unstable; urgency=low
> +
> + * Initial release.
> +
> + -- Geoffrey Thomas <geofft@mit.edu> Mon, 17 Sep 2012 23:55:40 -0700
>
> Added: trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-cron-example-1.0/debian/compat
> ===================================================================
> --- trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-cron-example-1.0/debian/compat (rev 0)
> +++ trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-cron-example-1.0/debian/compat 2013-03-07 22:59:53 UTC (rev 25844)
> @@ -0,0 +1 @@
> +7
>
> Added: trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-cron-example-1.0/debian/control
> ===================================================================
> --- trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-cron-example-1.0/debian/control (rev 0)
> +++ trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-cron-example-1.0/debian/control 2013-03-07 22:59:53 UTC (rev 25844)
> @@ -0,0 +1,14 @@
> +Source: debathena-cron-example
> +Section: config
> +Priority: extra
> +Maintainer: Geoffrey Thomas <geofft@mit.edu>
> +Build-Depends: debhelper (>= 7.0.0~), config-package-dev (>= 4.15~)
> +Standards-Version: 3.9.2
> +
> +Package: debathena-cron-example
> +Architecture: all
> +Depends: ${misc:Depends}, logcheck
> +Provides: ${diverted-files}
> +Conflicts: ${diverted-files}
> +Description: Example config-package-dev package
> + This is an example config-package-dev package.
>
> Added: trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-cron-example-1.0/debian/copyright
> ===================================================================
> --- trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-cron-example-1.0/debian/copyright (rev 0)
> +++ trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-cron-example-1.0/debian/copyright 2013-03-07 22:59:53 UTC (rev 25844)
> @@ -0,0 +1,25 @@
> +Example config-package-dev package.
> +
> +Author: Tim Abbott <tabbott@mit.edu>
> +
> +Copyright © 2008 Tim Abbott <tabbott@mit.edu>
> +Copyright © 2012 Geoffrey Thomas <geofft@mit.edu>
> +
> +Permission is hereby granted, free of charge, to any person obtaining
> +a copy of this software and associated documentation files (the
> +"Software"), to deal in the Software without restriction, including
> +without limitation the rights to use, copy, modify, merge, publish,
> +distribute, sublicense, and/or sell copies of the Software, and to
> +permit persons to whom the Software is furnished to do so, subject to
> +the following conditions:
> +
> +The above copyright notice and this permission notice shall be
> +included in all copies or substantial portions of the Software.
> +
> +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
> +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
> +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
> +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
> +LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
> +OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
> +WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
>
> Added: trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-cron-example-1.0/debian/debathena-cron-example.cron.d
> ===================================================================
> --- trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-cron-example-1.0/debian/debathena-cron-example.cron.d (rev 0)
> +++ trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-cron-example-1.0/debian/debathena-cron-example.cron.d 2013-03-07 22:59:53 UTC (rev 25844)
> @@ -0,0 +1,9 @@
> +# /etc/cron.d/logcheck: crontab entries for the logcheck package
> +
> +PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
> +MAILTO=root
> +
> +@reboot logcheck if [ -x /usr/sbin/logcheck ]; then nice -n10 /usr/sbin/logcheck -R; fi
> +* * * * * logcheck if [ -x /usr/sbin/logcheck ]; then nice -n10 /usr/sbin/logcheck; fi
> +
> +# EOF
>
> Added: trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-cron-example-1.0/debian/debathena-cron-example.hide
> ===================================================================
> --- trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-cron-example-1.0/debian/debathena-cron-example.hide (rev 0)
> +++ trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-cron-example-1.0/debian/debathena-cron-example.hide 2013-03-07 22:59:53 UTC (rev 25844)
> @@ -0,0 +1 @@
> +/etc/cron.d/logcheck
>
> Added: trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-cron-example-1.0/debian/rules
> ===================================================================
> --- trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-cron-example-1.0/debian/rules (rev 0)
> +++ trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-cron-example-1.0/debian/rules 2013-03-07 22:59:53 UTC (rev 25844)
> @@ -0,0 +1,4 @@
> +#!/usr/bin/make -f
> +
> +%:
> + dh $@ --with=config-package
>
>
> Property changes on: trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-cron-example-1.0/debian/rules
> ___________________________________________________________________
> Added: svn:executable
> + *
>
> Added: trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-cron-example-1.0/debian/source/format
> ===================================================================
> --- trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-cron-example-1.0/debian/source/format (rev 0)
> +++ trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-cron-example-1.0/debian/source/format 2013-03-07 22:59:53 UTC (rev 25844)
> @@ -0,0 +1 @@
> +3.0 (native)
>
> Added: trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-transform-example-1.0/debian/changelog
> ===================================================================
> --- trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-transform-example-1.0/debian/changelog (rev 0)
> +++ trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-transform-example-1.0/debian/changelog 2013-03-07 22:59:53 UTC (rev 25844)
> @@ -0,0 +1,5 @@
> +debathena-transform-example (1.0) unstable; urgency=low
> +
> + * Initial release.
> +
> + -- Geoffrey Thomas <geofft@mit.edu> Mon, 17 Sep 2012 23:45:47 -0700
>
> Added: trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-transform-example-1.0/debian/compat
> ===================================================================
> --- trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-transform-example-1.0/debian/compat (rev 0)
> +++ trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-transform-example-1.0/debian/compat 2013-03-07 22:59:53 UTC (rev 25844)
> @@ -0,0 +1 @@
> +7
>
> Added: trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-transform-example-1.0/debian/control
> ===================================================================
> --- trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-transform-example-1.0/debian/control (rev 0)
> +++ trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-transform-example-1.0/debian/control 2013-03-07 22:59:53 UTC (rev 25844)
> @@ -0,0 +1,14 @@
> +Source: debathena-transform-example
> +Section: config
> +Priority: extra
> +Maintainer: Geoffrey Thomas <geofft@mit.edu>
> +Build-Depends: debhelper (>= 7.0.0~), config-package-dev (>= 4.15), lynx
> +Standards-Version: 3.9.2
> +
> +Package: debathena-transform-example
> +Architecture: all
> +Depends: ${misc:Depends}, lynx
> +Provides: ${diverted-files}
> +Conflicts: ${diverted-files}
> +Description: Example config-package-dev package
> + This is an example config-package-dev package.
>
> Added: trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-transform-example-1.0/debian/copyright
> ===================================================================
> --- trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-transform-example-1.0/debian/copyright (rev 0)
> +++ trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-transform-example-1.0/debian/copyright 2013-03-07 22:59:53 UTC (rev 25844)
> @@ -0,0 +1,25 @@
> +Example config-package-dev package.
> +
> +Author: Tim Abbott <tabbott@mit.edu>
> +
> +Copyright © 2008 Tim Abbott <tabbott@mit.edu>
> +Copyright © 2012 Geoffrey Thomas <geofft@mit.edu>
> +
> +Permission is hereby granted, free of charge, to any person obtaining
> +a copy of this software and associated documentation files (the
> +"Software"), to deal in the Software without restriction, including
> +without limitation the rights to use, copy, modify, merge, publish,
> +distribute, sublicense, and/or sell copies of the Software, and to
> +permit persons to whom the Software is furnished to do so, subject to
> +the following conditions:
> +
> +The above copyright notice and this permission notice shall be
> +included in all copies or substantial portions of the Software.
> +
> +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
> +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
> +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
> +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
> +LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
> +OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
> +WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
>
> Added: trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-transform-example-1.0/debian/debathena-transform-example.transform
> ===================================================================
> --- trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-transform-example-1.0/debian/debathena-transform-example.transform (rev 0)
> +++ trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-transform-example-1.0/debian/debathena-transform-example.transform 2013-03-07 22:59:53 UTC (rev 25844)
> @@ -0,0 +1 @@
> +/etc/lynx-cur/lynx.cfg.debathena perl -0pe 's|^#STARTFILE:.*$|$&\nSTARTFILE:http://web.mit.edu/|m or die'
>
> Added: trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-transform-example-1.0/debian/rules
> ===================================================================
> --- trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-transform-example-1.0/debian/rules (rev 0)
> +++ trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-transform-example-1.0/debian/rules 2013-03-07 22:59:53 UTC (rev 25844)
> @@ -0,0 +1,4 @@
> +#!/usr/bin/make -f
> +
> +%:
> + dh $@ --with=config-package
>
>
> Property changes on: trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-transform-example-1.0/debian/rules
> ___________________________________________________________________
> Added: svn:executable
> + *
>
> Added: trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-transform-example-1.0/debian/source/format
> ===================================================================
> --- trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-transform-example-1.0/debian/source/format (rev 0)
> +++ trunk/debathena/debathena/config-package-dev/examples/debhelper/debathena-transform-example-1.0/debian/source/format 2013-03-07 22:59:53 UTC (rev 25844)
> @@ -0,0 +1 @@
> +3.0 (native)
>
