dpatch/0000755000000000000000000000000011624150743007212 5ustar dpatch/config.mk0000644000000000000000000000101211621425704011001 0ustar # -*- Makefile -*- # configuration options for the dpatch makefiles DPATCH_REVISION = $(shell cd ${top_srcdir}; dpkg-parsechangelog | \ grep "^Version: " | sed -e "s,^Version: ,,") prefix = /usr sysconfdir = /etc exec_prefix = ${prefix} bindir = ${exec_prefix}/bin datadir = ${prefix}/share pkgdatadir = ${datadir}/dpatch mandir = ${datadir}/man man1dir = ${mandir}/man1 man7dir = ${mandir}/man7 docdir = ${datadir}/doc/dpatch sampledir = ${docdir}/examples # arch-tag: 6822d126-9fd3-4ea3-949c-e29c6801b122 dpatch/debhelper/0000755000000000000000000000000011621612301011132 5ustar dpatch/debhelper/dpatch.pm0000644000000000000000000000043611621612301012736 0ustar #!/usr/bin/perl use warnings; use strict; use Debian::Debhelper::Dh_Lib; insert_before("dh_auto_configure", "dh_dpatch_patch"); insert_before("dh_clean", "dh_dpatch_unpatch"); # Eval to avoid problem with debhelper < 7.3.12 eval { add_command("dh_dpatch_patch", "patch"); }; 1; dpatch/debhelper/dh_dpatch_patch0000644000000000000000000000175111621612301014156 0ustar #!/usr/bin/perl -w =head1 NAME dh_dpatch_patch - apply patches listed in debian/patches/00list =cut use strict; use Debian::Debhelper::Dh_Lib; =head1 SYNOPSIS B [S>] =head1 DESCRIPTION dh_dpatch_patch simply calls B . All patches listed in B are then applied in the current directory. The command does not fail if the patches have already been applied. =head1 EXAMPLES dh_dpatch_patch is usually called indirectly in a rules file via the dh command. %: dh --with dpatch $@ It can also be direcly called at the start of the build (or configure) rule. build: dh_dpatch_patch ./configure $(MAKE) =cut init(); complex_doit('dpatch apply-all || test $? = 2'); =head1 SEE ALSO L, L. This program is meant to be used together with debhelper. =head1 AUTHOR Hideki Yamane , stolen from dh_dpatch_quilt written by Raphael Hertzog =cut dpatch/debhelper/dh_dpatch_unpatch0000644000000000000000000000200611621612301014513 0ustar #!/usr/bin/perl -w =head1 NAME dh_dpatch_unpatch - unapply patches listed in debian/patched =cut use strict; use Debian::Debhelper::Dh_Lib; =head1 SYNOPSIS B [S>] =head1 DESCRIPTION dh_dpatch_unpatch simply calls B. All patches listed in B are then unapplied in the current directory. The command does not fail if the patches have already been unapplied. =head1 EXAMPLES dh_dpatch_unpatch is usually called indirectly in a rules file via the dh command. %: dh --with dpatch $@ It can also be direcly called in the clean rule. clean: dh_testdir dh_testroot [ ! -f Makefile ] || $(MAKE) clean dh_dpatch_unpatch dh_clean =cut init(); complex_doit('dpatch deapply-all || test $? = 2'); =head1 SEE ALSO L, L. This program is meant to be used together with debhelper. =head1 AUTHOR Hideki Yamane , stolen from dh_quilt_unpatch written by Raphael Hertzog =cut dpatch/tools/0000755000000000000000000000000011621612301010340 5ustar dpatch/tools/shpp.awk0000755000000000000000000000376011621425704012040 0ustar #!/usr/bin/nawk -f # shpp.awk -- Simple preprocessor for shell scripts # # Copyright (C) 2003 Miles Bader # # 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 of the License, or # (at your option) any later version. # # Written by Miles Bader BEGIN { if ("srcdir" in ENVIRON) srcdir = ENVIRON["srcdir"] else srcdir = "." } function include_file(file, escape_single_quotes ,hdr_comment_skip_state) { file = srcdir "/" file hdr_comment_skip_state = 2 while ((getline 0) { if (hdr_comment_skip_state) { if ($0 ~ /^(#:|[^#]|$)/) hdr_comment_skip_state = 0 else { if ($0 ~ /^# *$/) hdr_comment_skip_state = 1 if (hdr_comment_skip_state == 1) continue } } process_line(escape_single_quotes) } close (file) } # Process the input line in $0; destroys $0! function process_line(escape_single_quotes, file,val,var) { if ($1 == "#:include") { file = $2 print "# (---- beginning of " file " ----)" include_file(file, escape_single_quotes) print "# (---- end of " file " ----)" } else if ($1 == "#:var-include") { var = $2 file = $3 print "# (---- " var " defined from " file " ----)" printf ("%s='", var) include_file(file, 1) print "'" print "# (---- end of " var " defined from " file " ----)" } else if ($1 == "#:local-var" || $1 == "#:export-var") { if ($2 in ENVIRON) { val = ENVIRON[$2] # Escape any single quotes gsub (/'/, "'\\''", val) if ($1 == "#:export-var") printf ("%s='%s'; export %s\n", $2, val, $2) else printf ("%s='%s'\n", $2, val) } } else { if (escape_single_quotes) gsub (/'/, "'\\''") # Note we strip arch-tag: lines from the destination if ($0 !~ /^#* *arch-tag:/) print } } { process_line(0) } # arch-tag: 7f61e98c-a589-4905-a0a1-338a68eb133d dpatch/tools/git-tag.sh0000755000000000000000000000021511621612301012231 0ustar VERSION=$(dpkg-parsechangelog | sed -n 's/^Version: //p') git tag -s -u algernon@madhouse-project.org -m "dpatch release $VERSION" $VERSION dpatch/Makefile0000644000000000000000000000104611621425704010652 0ustar top_srcdir = . include config.mk all .DEFAULT: ${MAKE} -C compat $@ ${MAKE} -C dpatch $@ ${MAKE} -C dpep $@ ${MAKE} -C samples $@ ${MAKE} -C scripts $@ tla-release: mkdir dpatch-${DPATCH_REVISION} for file in $$(tla inventory -s | sort); do \ install -d dpatch-${DPATCH_REVISION}/$$(dirname $$file); \ cp -p $$file dpatch-${DPATCH_REVISION}/$$file ;\ done tar cf - dpatch-${DPATCH_REVISION} | gzip -9fc >dpatch-${DPATCH_REVISION}.tar.gz rm -rf dpatch-${DPATCH_REVISION} .PHONY: all # arch-tag: d6597b23-ddec-4898-89e9-b45d313f9d1d dpatch/dpatch/0000755000000000000000000000000011714165276010464 5ustar dpatch/dpatch/dpatch.shpp0000644000000000000000000001215311621425704012615 0ustar #! /bin/bash ## dpatch.shpp -*- shell-script -*- ## ## Main dpatch control code. ## 'dpatch.shpp' generates 'dpatch'. set -e set -o pipefail DPATCH_OPTION_FORCE=0 DPATCH_OPTION_STRICT=0 DPATCH_OPTION_CPP=0 DPATCH_OPTION_CHDIR=0 DPATCH_WORKDIR=./ #:local-var SYSCONFDIR if [ -e "${SYSCONFDIR}/dpatch.conf" ]; then . "${SYSCONFDIR}/dpatch.conf" fi if [ -e "${HOME}/.dpatch.conf" ]; then . "${HOME}/.dpatch.conf" fi #:include dpatch_help.shpp #:include dpatch_lowlevel.shpp #:include dpatch_patchset.shpp #:include dpatch_args.shpp #:include dpatch_requisites.shpp #:include dpatch_template.shpp if [ $# -eq 0 ]; then dpatch_help exit 1 fi while [ $# -gt 0 ]; do case $1 in --with-cpp) DPATCH_CLI_OPTION_CPP=1 ;; --force|-F) DPATCH_OPTION_FORCE=1 ;; --strict|-S) DPATCH_OPTION_STRICT=1 ;; --chdir|-c) DPATCH_OPTION_CHDIR=1 ;; --help|-h|--version|-V|--license) break ;; --workdir|-d) case $2 in /*) DPATCH_WORKDIR=$2 ;; *) DPATCH_WORKDIR=$(pwd)/$2 ;; esac shift ;; -*) echo "dpatch: Unsupported global option: $1" >&2 exit 1 ;; *) break ;; esac shift || true done # Source debian/patches/00options here, as we need to know $DPATCH_WORKDIR first if [ -e "$DPATCH_WORKDIR/debian/patches/00options" ]; then . "$DPATCH_WORKDIR/debian/patches/00options" fi # For each option we support both in the CLI and in 00options, the CLI should # set "DPATCH_CLI_OPTION_FOO", and the real option should be # "DPATCH_OPTION_FOO". After sourcing 00options, one must check for each CLI # option for an override (we do want CLI options overriding 00options right?) if [ "$DPATCH_CLI_OPTION_CPP" = 1 ]; then DPATCH_OPTION_CPP=1 unset DPATCH_CLI_OPTION_CPP fi # Check that we have everything we need, up until this point. if ! dpatch_requisites; then echo "dpatch: aborting" >&2 exit 1 fi command=$1; shift argc=$(dpatch_arg_count "$@") cmd_help=$(dpatch_arg_cmd_help "$@") cmd_mapped=$(dpatch_command_map ${command}) case ${command} in ## Help commands help|--help|-h) dpatch_help_do "$@" exit $? ;; version|--version|-V) dpatch_args_check ${cmd_help} ${argc} 0 0 dpatch_version "$@" exit $? ;; license|--license) dpatch_license exit $? ;; ## Template patch-template) dpatch_args_check ${cmd_help} ${argc} -1 2 dpatch_patch_template "$@" exit $? ;; ## User-defined call to patches call) dpatch_args_check ${cmd_help} ${argc} 1 -1 dpatch_patchset_do ${cmd_mapped} 1 "$@" exit $? ;; call-until|call-up-to) dpatch_args_check ${cmd_help} ${argc} 1 1 dpatch_patchset_do ${cmd_mapped} 0 "$@" exit $? ;; call-all) dpatch_args_check ${cmd_help} ${argc} 0 0 dpatch_patchset_do ${cmd_mapped} 0 "$@" exit $? ;; ## Applying of patches patch|apply) dpatch_args_check ${cmd_help} ${argc} 1 -1 dpatch_patchset_do ${cmd_mapped} 1 "$@" exit $? ;; apply-until|apply-up-to|patch-until|patch-up-to) dpatch_args_check ${cmd_help} ${argc} 1 1 dpatch_patchset_do ${cmd_mapped} 0 "$@" exit $? ;; apply-all|patch-all) dpatch_args_check ${cmd_help} ${argc} 0 0 dpatch_patchset_do ${cmd_mapped} 0 "$@" exit $? ;; ## Deapplying of patches unpatch|deapply) dpatch_args_check ${cmd_help} ${argc} 1 -1 dpatch_patchset_do ${cmd_mapped} 1 "$@" exit $? ;; deapply-until|deapply-up-to|unpatch-until|unpatch-up-to) dpatch_args_check ${cmd_help} ${argc} 1 1 dpatch_patchset_do ${cmd_mapped} 0 "$@" exit $? ;; deapply-all|unpatch-all) dpatch_args_check ${cmd_help} ${argc} 0 0 dpatch_patchset_do ${cmd_mapped} 0 "$@" exit $? ;; ## Listing patches list) dpatch_args_check ${cmd_help} ${argc} 1 -1 dpatch_patchset_do ${cmd_mapped} 1 "$@" exit $? ;; list-all) dpatch_args_check ${cmd_help} ${argc} 0 0 dpatch_patchset_do ${cmd_mapped} 0 "$@" exit $? ;; list-up-to|list-until) dpatch_args_check ${cmd_help} ${argc} 1 1 dpatch_patchset_do ${cmd_mapped} 0 "$@" exit $? ;; ## Getting patch info/meta-data cat) dpatch_args_check ${cmd_help} ${argc} 1 -1 dpatch_patchset_do ${cmd_mapped} 1 "$@" exit $? ;; cat-all) dpatch_args_check ${cmd_help} ${argc} 0 0 dpatch_patchset_do ${cmd_mapped} 0 "$@" exit $? ;; cat-up-to|cat-until) dpatch_args_check ${cmd_help} ${argc} 1 1 dpatch_patchset_do ${cmd_mapped} 0 "$@" exit $? ;; ## Getting patch status status) dpatch_args_check ${cmd_help} ${argc} 1 -1 dpatch_patchset_do ${cmd_mapped} 1 "$@" exit $? ;; status-all) dpatch_args_check ${cmd_help} ${argc} 0 0 dpatch_patchset_do ${cmd_mapped} 0 "$@" exit $? ;; status-up-top|status-until) dpatch_args_check ${cmd_help} ${argc} 1 1 dpatch_patchset_do ${cmd_mapped} 0 "$@" exit $? ;; ## Showing patch logs log) dpatch_args_check ${cmd_help} ${argc} 1 -1 dpatch_patchset_do ${cmd_mapped} 1 "$@" exit $? ;; log-all) dpatch_args_check ${cmd_help} ${argc} 0 0 dpatch_patchset_do ${cmd_mapped} 0 "$@" exit $? ;; log-up-to|log-until) dpatch_args_check ${cmd_help} ${argc} 1 1 dpatch_patchset_do ${cmd_mapped} 0 "$@" exit $? ;; ## Catch-all *) dpatch_help exit 1 ;; esac ## arch-tag: 2dce883d-27ed-45fb-8ef0-ea4582699471 dpatch/dpatch/dpatch-run.shpp0000644000000000000000000000027011621425704013414 0ustar ## dpatch-run.shpp -*- shell-script -*- ## ## A she-bang wrapper around dpatch.lib.sh. ## set -e . /usr/share/dpatch/dpatch.lib.sh # arch-tag: f5c653d2-3a79-47e1-9163-aea36d2debdf dpatch/dpatch/dpatch_help.shpp0000644000000000000000000002212511621612301013614 0ustar ## dpatch_help.shpp -*- shell-script -*- ## ## Help messages for dpatch. dpatch_help_apply="dpatch apply -- apply the given patches Usage: dpatch apply [] dpatch apply-all [] dpatch apply-until [] Aliases: apply, patch Options: --stampdir=, -s= Put stamps into instead of debian/patched. --quiet, -q Do not print anything. --help, -h This help message. --verbose, -v Disables hiding of the scriptlet output. Applies one or more \`dpatches' to the working tree (the current directory, if not told otherwise). By default the specified patches will be applied in the exact same order they were specified. Calling \`apply-all' applies all available \`dpatches'. Using \`apply-until' makes it possible to apply all patches up to, and including the specified one." dpatch_help_deapply="dpatch deapply -- deapply the given patches Usage: dpatch deapply [] dpatch deapply-all [] dpatch deapply-until [] Aliases: deapply, unpatch Options: --stampdir=, -s= Use the stamps in instead of debian/patched. --quiet, -q Do not print anything. --help, -h This help message. --verbose, -v Disables hiding of the scriptlet output. Deapplies one or more \`dpatches' to the working tree (the current directory, if not told otherwise). By default the specified patches will be deapplied in the exact same order they were specified. Pay attention to this order: you generally should deapply in reverse order (compared to the apply order, that is)! Calling \`deapply-all' deapplies all available \`dpatches'. Using \`deapply-until' makes it possible to deapply all patches up to, and including the specified one. Note that this works on a patch list whose order is reversed, take that into account when using this command." dpatch_help_custom="dpatch call -- call dpatches with a given argument Usage: dpatch call --argument= dpatch call-all --argument= dpatch call-until --argument= Options: --argument=, -a= Call patches with as argument. --quiet, -q Do not print anything. --help, -h This help message. Call a \`dpatch' with a user-specified argument. All arguments with a \`pkg-' prefix is guaranteed to be unused by dpatch itself, and are reserved for use with this very command. The \`call-all' command will run each and every available \`dpatch' with the specified argument. Using \`call-until' will do the same, but only up to, and including the specified patch." dpatch_help_status="dpatch status -- print the status of the given patches Usage: dpatch status [] dpatch status-all [] dpatch status-until [] Options: --stampdir=, -s= Use the stamps in instead of debian/patched. --quiet, -q Do not print anything. --help, -h This help message. The \`status' command prints the status of the given patches - whether they are applied to the working tree or not. Use the \`status-all' command to get the status of all available patches, and \`status-until' to get the status of all patches up to and including the specified one." dpatch_help_log="dpatch log -- print the log of a given patching attempt Usage: dpatch log [] dpatch log-all [] dpatch log-until [] Options: --stampdir=, -s= Use the stamps in instead of debian/patched. --quiet, -q Do not print anything, only the logs themselves. --help, -h This help message. The \`log' command displays the output of a patching attempt (that is, the result of a dpatch apply). It is almost similar to \`cat debian/patched/foo'. Use the \`log-all' command to view the output of all patching attempts, and \`log-until' to view the output of attempts up to and including the specified one." dpatch_help_list="dpatch list -- list patches Usage: dpatch list dpatch list-all dpatch list-until This command does not take any options (except --help, of course). List the name of the given patches. These commands are not really useful, except \`list-all', which lists all available patches." dpatch_help_cat="dpatch cat -- get patch meta-information Usage: dpatch cat [] dpatch cat-all [] dpatch cat-until [] Options: --no-meta, -nm, --desc-only, -d Only print the patch description. --author-only, -a Only print the author of the patch. --no-desc, -nd Do not print the patch description. --quiet, -q Do not print anything. --help, -h This help message. Print meta-information about a \`dpatch', such as its name, author and description (any of which can be disabled with the appropriate option). The \`cat-all' command prints the meta-information for all available patches, while \`cat-until' prints them only up to and including the specified patch." dpatch_help_patch_template="dpatch patch-template -- generate a template dpatch Usage: dpatch patch-template [] [] [] Options: --prepend, -p Prepend the template to STDIN. --help, -h This help message. Print a quasi-standard \`dpatch\ script template, based on the information give on the command-line. When prepending the template to STDIN, the contents of the standard input will be printed right after the template." dpatch_help_help="dpatch help -- offer some help Usage: dpatch help [] Attempt to give a little more detailed help about dpatch itself, or about a given dpatch command." dpatch_help_version="dpatch version -- print dpatch version number. Usage: dpatch version Prints the dpatch version number and exits." dpatch_help_UNKNOWN="Unknown command: \`$2' If this command is documented somewhere, please file a bug. Otherwise check if you made a typo, or something. :)" dpatch_help () { cat <] [] [] Global Options: --workdir, -d Do everything in the given directory. --strict, -S Work in strict mode, exiting on warnings too. --force, -F Force applying or deapplying a patch. Commands: apply (apply-all, apply-until) Apply the given set of patches, all of them, or up to, and including the specified one. deapply (deapply-all, deapply-until) Deapply a given set of patches, all of them, or up to, and including the specified one. call (call-all, call-until) Call a given set of patches with a custom argument, all of them, or up to, and including the specified one. cat (cat-all, cat-until) Show the meta-information of a given set of patches, all of them, or up to, and including the specified one. list (list-all, list-until) List the name of a given set of patches, all of them, or up to and including the specified one. status (status-all, status-up-to) Show the status (applied or not) of a given set of patches, all of them, or up to and including the specified one. log (log-all, log-up-to) Display the log of the patch attempt, all attempts, or up to and including the specified one. patch-template Generate a quasi-standard dpatch template. help This help screen. version Print version number and exit. You can get more information about the various commands by issuing one of the dpatch --help OR dpatch help commands. EOF } # dpatch_help_cmd dpatch_help_cmd () { local cmd cmd=$(dpatch_command_map $1) if eval [ ! -z \"\$dpatch_help_${cmd}\" ]; then eval echo \"\$dpatch_help_${cmd}\" if [ "${cmd}" = "UNKNOWN" ]; then return 1 fi return 0 else echo "dpatch: There is no help for \`${cmd}' yet." >&2 return 1 fi } # dpatch_help_do [] dpatch_help_do () { if [ ! -z "$1" ]; then dpatch_help_cmd $1 return $? else dpatch_help return 0 fi } dpatch_version() { local \ #:local-var DPATCH_REVISION while [ $# -ne 0 ]; do case $1 in --help|-h) dpatch_help_do version return $? ;; -*) echo "dpatch: Invalid option for dpatch_patch_version: $1" >&2 return 1 ;; esac shift || true done cat < .\" .\" Permission is granted to make and distribute verbatim copies of this .\" manual provided the copyright notice and this permission notice are .\" preserved on all copies. .\" .\" Permission is granted to copy and distribute modified versions of this .\" manual under the conditions for verbatim copying, provided that the .\" entire resulting derived work is distributed under the terms of a .\" permission notice identical to this one. .\" .\" Permission is granted to copy and distribute translations of this .\" manual into another language, under the above conditions for modified .\" versions, except that this permission notice may be stated in a .\" translation approved by the Author. .TH DPATCH 1 "Dec 13 2011" "DPATCH 2" "dpatch" .SH "NAME" dpatch \- patch maintenance system for Debian .SH "SYNOPSIS" .BI "dpatch [" options ] " command " [ command\-arguments ] .SH "DESCRIPTION" \fBdpatch\fR is an easy to use patch system for Debian packages, somewhat similar to the dbs package, but much simpler to use. It lets you store patches and other simple customization templates in \fIdebian/patches\fR and otherwise does not require much reorganization of your source tree. To get the patches applied at build time you simply need to include a makefile snippet and then depend on the \fBpatch/unpatch\fR target in the \fBbuild\fR or \fBclean\fR stage of \fIdebian/rules\fR. For added flexibility, you can call \fI/usr/bin/dpatch\fR directly too. .SH WARNING .B dpatch is deprecated, please switch to the `3.0 (quilt)' Debian source package format instead. See .I http://wiki.debian.org/Projects/DebSrc3.0#FAQ for a short guide on how to do it. .SH "GLOBAL OPTIONS" There are a few options which change the overall behaviour of dpatch, and have an effect on not only one, but most of the available commands. These global options are: .TP .BI "\-\-workdir (\-d) " DIRECTORY By default, dpatch applies patches to the source tree it was run from. With this option, one can change that, and tell dpatch to work on a different tree, although taking the dpatches from the current one. Note that this will only pass a second argument to dpatch scriptlets, and will not change to the specified directory. To do that, use the \fB\-\-chdir\fR option explained below. .TP .B \-\-chdir (\-c) When using a different working directory than the current one, change there before trying to apply patches. This should be used together with the \fB\-\-workdir\fR option. .TP .B \-\-strict (\-S) Enable strict mode, which means that dpatch will bail out early even on warnings (like when trying to apply a patch which is already applied - normally it will simply skip it). .TP .B \-\-force (\-F) Force the application or deapplication of patches, even if dpatch would normally skip them because the operation was already done earlier. .TP .B \-\-with\-cpp Force the use of cpp. Overrides use of .B "DPATCH_OPTION_CPP=1" option in .I "debian/patches/00options" file. .SH "COMMANDS" .SS "Patch handling commands" There is a generic syntax for all patch handling commands, namely that, that the command itself takes a list of dpatch names to work with, then does what it is meant to do on all of them, in the exact same order it was specified on the command line. Then, there is a version of each patch handling command with an \fB\-all\fR suffix, which does not take any arguments, and performs the necessary action for each and every available dpatch. The last variation is a command with a \fB\-until\fR or \fB\-up\-to\fR suffix, which takes only one argument: the name of a dpatch. The appropriate action will be performed on all dpatches up to and including this specified one. .P .BI "apply [" options ] .br .BI "patch [" options ] .RS Applies one or more dpatches to the working tree (the current directory, if not told otherwise). By default the specified patches will be applied in the exact same order they were specified. .B Options .RS .BI \-\-stampdir= directory ", \-s=" directory .RS Put stamp files into \fIdirectory\fR instead of the default \fIdebian/patched\fR. .RE .B \-\-help (\-h) .RS Print a short help message about the command. .RE .B \-\-quiet (\-q) .RS Forces the command to not print anything. .RE .B \-\-verbose (\-v) .RS Disables hiding of the scriptlet output. .RE .RE .RE .P .BI "deapply [" options ] .br .BI "unpatch [" options ] .RS Deapplies one or more dpatches to the working tree (the current directory, if not told otherwise). By default the specified patches will be deapplied in the reverse order they were specified as one generally should deapply in reverse order (compared to the apply order, that is). .B Options .RS .BI \-\-stampdir= directory ", \-s=" directory .RS Use stamp files in \fIdirectory\fR instead of the default \fIdebian/patched\fR. .RE .B \-\-help (\-h) .RS Print a short help message about the command. .RE .B \-\-quiet (\-q) .RS Forces the command to not print anything. .RE .B \-\-verbose (\-v) .RS Disables hiding of the scriptlet output. .RE .RE .RE .TP .BI "cat [" options ] Print meta-\information about a dpatch, such as its name, author and description (any of which can be disabled with the appropriate option). .RS .B Options .RS .B \-\-no\-meta, \-\-desc-only (\-nm, \-d) .RS Only print the patch description. .RE .B \-\-author\-only (\-a) .RS Only print the author of the patch. .RE .B \-\-no\-desc, (\-nd) .RS Do not print the patch description. .RE .B \-\-help (\-h) .RS Print a short help message about the command. .RE .B \-\-quiet (\-q) .RS Forces the command to not print anything. .RE .RE .RE .TP .BI "list [" options ] List the name of the given patches. This commands is not really useful, except the \fBlist\-all\fR variant, which lists all available patches. .RS .B Options .RS .B \-\-help (\-h) .RS Print a short help message about the command. .RE .RE .RE .TP .BI "status [" options ] Prints the status of the given patches - whether they are applied to the working tree or not. .RS .B Options .RS .BI \-\-stampdir= directory ", \-s=" directory .RS Use stamp files in \fIdirectory\fR instead of the default \fIdebian/patched\fR. .RE .B \-\-help (\-h) .RS Print a short help message about the command. .RE .B \-\-quiet (\-q) .RS Forces the command to not print anything. .RE .RE .RE .TP .BI "log [" options ] Displays the log of the given patching attempts. .RS .B Options .RS .BI \-\-stampdir= directory ", \-s=" directory .RS Use stamp files in \fIdirectory\fR instead of the default \fIdebian/patched\fR. .RE .B \-\-help (\-h) .RS Print a short help message about the command. .RE .B \-\-quiet (\-q) .RS Forces the command to not print anything, but the logs without extra sugar on top. .RE .RE .RE .TP .BI "call [" options ] Call a dpatch with a user\-specified argument. All arguments with a \fBpkg\-\fR prefix is guaranteed to be unused by dpatch itself, and are reserved for use with this very command. This command is most useful for extracting custom meta\-information from dpatch scriptlets. .RS .B Options .RS .BI \-\-argument= "arg " (\-a= arg) .RS Call patches with \fIarg\fR as argument. .RE .B \-\-help (\-h) .RS Print a short help message about the command. .RE .B \-\-quiet (\-q) .RS Forces the command to not print anything. .RE .RE .RE .SS "Miscellaneous commands" .TP .BI "patch\-template [" options "] [" patchname "] [" description ] Print a quasi\-standard dpatch script template, based on the information give on the command\-line. If a \fIdescription\fR given, it will be folded at about 72 characters into multiple lines appropriately. When prepending the template to STDIN, the contents of the standard input will be printed right after the template. .RS .B Options .RS .B \-\-prepend (\-p) .RS Prepend the template to STDIN. .RE .B \-\-help (\-h) .RS Print a short help message about the command. .RE .RE .RE .TP .BI "help (\-\-help, \-h) [" command ] Attempt to give a little more detailed help about dpatch itself, or about a given dpatch command. .TP .B version Prints the dpatch version number and exits. .SH "DPATCH IN DEBIAN PACKAGES" There are two different ways to use dpatch in \fIdebian/rules\fR: calling it directly, or including \fBdpatch.make\fR(7). Only the former method will be described here \- the latter has its own manual page. \fINOTE\fR: The following examples also require adding the \fB.NOTPARALLEL\fR flag to the head of \fIdebian/rules\fR since the dependency lists rely on the order of the execution. Without \fB.NOTPARALLEL\fR, they execution order may be wrong with multiple make threads (the \fI-j\fR option). In most situations, one will want to run dpatch as soon during the build process, as possible. How that can be accomplished depends heavily on the existing \fIdebian/rules\fR. However, in common practice most packages have a \fBbuild\fR (or \fBbuild\-stamp\fR), \fBconfig.status\fR, or \fBconfigure\fR (or \fBconfigure\-stamp\fR) target. The easiest way to make dpatching the very first thing, one only has to write a rule that calls dpatch, and add it to the list of prerequisites for the appropriate target (see above). Deapplying dpatches can be easy or a bit more tricky. If nothing in the \fBclean\fR rule touches files modified by dpatches (creating incompatible changes), you can safely add \fBunpatch\fR to the list of the \fBclean\fR rules dependencies. If the patches might affect the build system, they should be deapplied after the source tree has been cleaned. To do this, rename the \fBclean\fR target to, say, \fBclean\-patched\fR, write a rule that calls dpatch to deapply the dpatches, and make a new \fBclean\fR rule that has \fBclean\-patched\fR and \fBunpatch\fR as its prerequisites. Let us look at an example! First, let us look at the relevant parts of the original \fIdebian/rules\fR of our imaginary package: .RS .sp .nf config.status: configure ./configure \-\-prefix=/usr \-\-mandir=/usr/share build: config.status ${MAKE} clean: $(testdir) $(testroot) ${MAKE} distclean rm \-rf debian/imaginary\-package debian/files debian/substvars .fi .sp .RE After dpatchifying, this would look like this: .RS .sp .nf config.status: patch configure ./configure \-\-prefix=/usr \-\-mandir=/usr/share build: config.status ${MAKE} clean: clean\-patched unpatch clean\-patched: $(testdir) $(testroot) ${MAKE} distclean rm \-rf debian/imaginary\-package debian/files debian/substvars patch: patch\-stamp patch\-stamp: dpatch apply\-all dpatch cat\-all >patch\-stamp unpatch: dpatch deapply\-all rm \-rf patch\-stamp debian/patched .fi .sp .RE .SS "Adding dpatch scriptlets to a package" When using dpatch, one surely wants to tell the system what dpatches to apply, and which ones to discard. In the most common situation, one only needs to list the names of the dpatches (the filenames relative to \fIdebian/patches\fR) in \fIdebian/patches/00list\fR. They usually have the extension .B ".dpatch" and the extension can be omitted, thus a file .B "debian/patches/01_one_patch.dpatch" is written as .B "01_one_patch" inside .B "debian/patches/00list" However, there may be situations where something more flexible is needed, like applying the same patch on only two architectures, say, \fBm68k\fR and \fBpowerpc\fR. One solve this in at least two very different ways: One is to list the same patch in both \fIdebian/patches/00list.m68k\fR and \fIdebian/patches/00list.powerpc\fR, the other is to use \fBDPATCH_OPTION_CPP=1\fR in \fIdebian/patches/00options\fR. 00list file is passed through .B cpp command with .B DEB_BUILD_ARCH variable set to the architecture, and .BI "DEB_BUILD_ARCH_" "architecture" being set to 1. With cpp, our sample \fIdebian/patches/00list\fR might look like this: .RS .sp .nf 01_manpage_typo #if defined(DEB_BUILD_ARCH_m68k) || defined(DEB_BUILD_ARCH_powerpc) /* This patch fixes a random build\-time breakage on Macintosh boxen. */ 02_macintosh_foo #endif .fi .SS "Creating dpatch scriptlets" There are many ways to create dpatch scriptlets. They are simple, executable files, which follow a standardised calling convention (documented in \fBdpatch\fR(7)). You can fire up your $EDITOR, or use \fBdpatch\-edit\-patch\fR, and you should be all set. For most cases, where the dpatch file is only to apply a simple patch, there is an even easier way: .RS .sp .nf dpatch patch\-template \-p "01_some_patch" "A random patch" \\ debian/patches/01_some_patch.dpatch .fi .sp .RE .SH "FILES" .TP .I debian/patches/00list .RS The list of patches to apply, deapply, or otherwise fiddle with. .RE .TP .I debian/patches/00list.\fBarch\fI .RS List of patches to work with - additionally to the common list in \fIdebian/patches/00list\fR -, when building on the \fBarch\fR architecture. .RE .TP .I /etc/dpatch.conf .RS System-wide configuration file for dpatch, for setting global options permanently. .RE .TP .I ~/.dpatch.conf .RS Per-user configuration file, for setting global options permanently. .RE .SH "AUTHORS" .B dpatch was written by Joerg Jaspert, David B Harris, Gergely Nagy, Junichi Uekawa and others. This manual page was written by Gergely Nagy, and updated by Junichi Uekawa .SH "SEE ALSO" .BR "dpatch" "(7), " .BR "dpatch.make" "(7), " .BR "dpatch\-edit\-patch" "(1), " .BR "dpatch\-list\-patch" "(1), " .BR "dpatch\-convert\-diffgz" "(1)" .\" arch-tag: a45571c1-b231-43cd-8fe5-00be30315328 dpatch/dpatch/dpatch_lowlevel.shpp0000644000000000000000000002505711621612301014524 0ustar ## dpatch_lowlevel.shpp -*- shell-script -*- ## ## Low level patch handling interface for dpatch. ## # dpatch_patch_apply dpatch_patch_apply () { local patch patchdir stamp ext args o_q pwd patchname stampdir wd local redir o_v o_ns pwd=$(pwd) args=$1 patchname=$2 stampdir=${DPATCH_WORKDIR}/debian/patched if [ ${DPATCH_WORKDIR} != "./" ]; then wd=${DPATCH_WORKDIR} fi redir=">" set -- ${args} while [ $# -ne 0 ]; do case $1 in --quiet|-q) o_q=1 ;; --stampdir=*|-s=*) local p p=$(echo ${1} | cut -d= -f2-) case $p in /*) stampdir=$p ;; *) stampdir=${pwd}/$p ;; esac shift ;; --no-stamp) o_ns=1 ;; --verbose|-v) redir="| tee" o_v=1 ;; -*) echo "dpatch: Invalid option for dpatch_patch_apply: $1" >&2 return 1 ;; *) break;; esac shift || true done patchdir=${patchname%/*} test -d ${stampdir} || install -d ${stampdir} test "x${patchdir}" = "x${patchname}" || \ install -d ${stampdir}/${patchdir} stamp=${stampdir}/${patchname%%.dpatch}.dpatch test -e ${pwd}/debian/patches/${patchname} || ext=.dpatch patch=${pwd}/debian/patches/${patchname}${ext} if [ ! -f ${patch} ]; then if [ -z "${o_q}" ]; then echo "${patchname} does not exist." fi return 1 fi test -x ${patch} || chmod +x ${patch} if test -f ${stamp} && [ ${DPATCH_OPTION_FORCE} -eq 0 ]; then if [ -z "${o_q}" ]; then echo "${patchname} already applied to ${DPATCH_WORKDIR} ." fi if [ ${DPATCH_OPTION_STRICT} -ne 0 ]; then return 1 fi else if [ -z "${o_q}" ]; then echo -n "applying patch ${patchname} to ${DPATCH_WORKDIR} ..." if [ ! -z "${o_v}" ]; then echo fi fi if [ ${DPATCH_OPTION_CHDIR} -ne 0 ]; then cd ${DPATCH_WORKDIR} fi if eval ${patch} -patch ${wd} ${redir} ${stamp}.new 2>&1; then if [ -z "${o_ns}" ]; then mv ${stamp}.new ${stamp} touch ${stamp} else rm -f ${stamp}.new fi if [ -z "${o_q}" ]; then if [ -z "${o_v}" ]; then echo " ok." else echo fi fi else if [ -z "${o_ns}" ]; then mv ${stamp}.new ${stamp}.failed { printf "md5sum: "; md5sum ${patch}; } >> ${stamp}.failed touch ${stamp}.failed else rm -f ${stamp}.new fi if [ -z "${o_q}" ]; then if [ -z "${o_v}" ]; then echo " failed." else echo fi fi if [ ${DPATCH_OPTION_CHDIR} -ne 0 ]; then cd ${pwd} fi return 1 fi fi if [ ${DPATCH_OPTION_CHDIR} -ne 0 ]; then cd ${pwd} fi return 0 } # dpatch_patch_deapply dpatch_patch_deapply () { local patch stamp ext args o_q pwd patchname stampdir wd local redir o_v pwd=$(pwd) args=$1 patchname=$2 stampdir=${DPATCH_WORKDIR}/debian/patched if [ ${DPATCH_WORKDIR} != "./" ]; then wd=${DPATCH_WORKDIR} fi redir=">" set -- ${args} while [ $# -ne 0 ]; do case $1 in --quiet|-q) o_q=1 ;; --stampdir=*|-s=*) local p p=$(echo ${1} | cut -d= -f2-) case $p in /*) stampdir=$p ;; *) stampdir=${pwd}/$p ;; esac shift ;; --verbose|-v) redir="| tee" o_v=1 ;; -*) echo "dpatch: Invalid option for dpatch_patch_deapply: $1" >&2 return 1 ;; *) break;; esac shift || true done stamp=${stampdir}/${patchname%%.dpatch}.dpatch test -e ${pwd}/debian/patches/${patchname} || ext=.dpatch patch=${pwd}/debian/patches/${patchname}${ext} if [ ! -f ${patch} ]; then if [ -z "${o_q}" ]; then echo "${patchname} does not exist." >&2 fi return 1 fi test -x ${patch} || chmod +x ${patch} if test -f ${stamp} || [ ${DPATCH_OPTION_FORCE} -ne 0 ]; then if [ -z "${o_q}" ]; then echo -n "reverting patch ${patchname} from ${DPATCH_WORKDIR} ..." if [ ! -z "${o_v}" ]; then echo fi fi if [ ${DPATCH_OPTION_CHDIR} -ne 0 ]; then cd ${DPATCH_WORKDIR} fi if eval ${patch} -unpatch ${wd} ${redir} /dev/null 2>&1; then rm -f ${stamp} if [ -z "${o_q}" ]; then if [ -z "${o_v}" ]; then echo " ok." else echo fi fi else if [ -z "${o_q}" ]; then if [ -z "${o_v}" ]; then echo " failed." else echo fi fi if [ ${DPATCH_OPTION_CHDIR} -ne 0 ]; then cd ${pwd} fi return 1 fi elif test -f ${stamp}.failed; then if [ -z "${o_q}" ]; then echo "attempting to revert failed patch ${patchname} from ${DPATCH_WORKDIR}:" if [ "$(tail -n1 ${stamp}.failed | grep ^md5sum: | cut -f2- -d" ")" \ = "$(md5sum ${patch})" ]; then echo -n " md5sums match, proceeding ..." else echo echo " patch md5sum has changed since failed apply, aborting" echo " please clean this up manually, by reverting the changes" echo " and removing debian/patched/${patchname%%.dpatch}.dpatch.failed" return 1 fi if [ ! -z "${o_v}" ]; then echo fi fi if [ ${DPATCH_OPTION_CHDIR} -ne 0 ]; then cd ${DPATCH_WORKDIR} fi eval ${patch} -unpatch ${wd} ${redir} /dev/null 2>&1 || true rm -f ${stamp}.failed if [ -z "${o_q}" ]; then if [ -z "${o_v}" ]; then echo " done (neither success nor failure guaranteed)" else echo fi fi else if [ -z "${o_q}" ]; then echo "${patchname} not applied to ${DPATCH_WORKDIR} ." if [ ${DPATCH_OPTION_STRICT} -ne 0 ]; then return 1 fi fi fi if [ ${DPATCH_OPTION_CHDIR} -ne 0 ]; then cd ${pwd} fi return 0 } # dpatch_patch_status dpatch_patch_status () { local patch stamp ext args o_q patchname pwd stampdir pwd=$(pwd) args=$1 patchname=$2 stampdir=${DPATCH_WORKDIR}/debian/patched set -- ${args} while [ $# -ne 0 ]; do case $1 in --quiet|-q) o_q=1 ;; --stampdir=*|-s=*) local p p=$(echo ${1} | cut -d= -f2-) case $p in /*) stampdir=$p ;; *) stampdir=${pwd}/$p ;; esac shift ;; -*) echo "dpatch: Invalid option for dpatch_patch_status: $1" >&2 return 1 ;; *) break;; esac shift || true done stamp=${stampdir}/${patchname%%.dpatch}.dpatch test -e ${pwd}/debian/patches/${patchname} || ext=.dpatch patch=${pwd}/debian/patches/${patchname}${ext} if [ ! -f ${patch} ]; then if [ -z "${o_q}" ]; then echo "${patchname} does not exist." >&2 fi return 1 fi if test -f ${stamp}; then if [ -z "${o_q}" ]; then echo "${patchname} already applied to ${DPATCH_WORKDIR} ." else return 11 fi else if [ -z "${o_q}" ]; then echo "${patchname} not applied to ${DPATCH_WORKDIR} ." fi fi return 0 } # dpatch_patch_log dpatch_patch_log () { local patch stamp ext args o_q patchname pwd stampdir pwd=$(pwd) args=$1 patchname=$2 stampdir=${DPATCH_WORKDIR}/debian/patched set -- ${args} while [ $# -ne 0 ]; do case $1 in --quiet|-q) o_q=1 ;; --stampdir=*|-s=*) local p p=$(echo ${1} | cut -d= -f2-) case $p in /*) stampdir=$p ;; *) stampdir=${pwd}/$p ;; esac shift ;; -*) echo "dpatch: Invalid option for dpatch_patch_log: $1" >&2 return 1 ;; *) break;; esac shift || true done stamp=${stampdir}/${patchname%%.dpatch}.dpatch test -e ${pwd}/debian/patches/${patchname} || ext=.dpatch patch=${pwd}/debian/patches/${patchname}${ext} if [ ! -f ${patch} ]; then if [ -z "${o_q}" ]; then echo "${patchname} does not exist." >&2 fi return 1 fi if test -f ${stamp}; then if [ -z "${o_q}" ]; then echo "${patchname}:" sed -e "s,^,| ,g" < ${stamp} echo else cat ${stamp} fi fi return 0 } # dpatch_patch_custom dpatch_patch_custom () { local patch ext args o_q o_a pwd patchname wd rv pwd=$(pwd) args=$1 patchname=$2 if [ ${DPATCH_WORKDIR} != "./" ]; then wd=${DPATCH_WORKDIR} fi set -- ${args} while [ $# -ne 0 ]; do case $1 in --quiet|-q) o_q=1 ;; --argument=*|-a=*) o_a=$(echo $1 | cut -d= -f2-) ;; -*) echo "dpatch: Invalid option for dpatch_patch_custom: $1" >&2 return 1 ;; *) break;; esac shift || true done if [ -z "${o_a}" ]; then echo "dpatch: No argument supplied for dpatch call!" >&2 return 1 fi test -e ${pwd}/debian/patches/${patchname} || ext=.dpatch patch=${pwd}/debian/patches/${patchname}${ext} if [ ! -f ${patch} ]; then if [ -z "${o_q}" ]; then echo "${patchname} does not exist." >&2 fi return 1 fi test -x ${patch} || chmod +x ${patch} if [ ${DPATCH_OPTION_CHDIR} -ne 0 ]; then cd ${DPATCH_WORKDIR} fi if ${patch} -${o_a} ${wd}; then rv=0 else rv=1 fi if [ ${DPATCH_OPTION_CHDIR} -ne 0 ]; then cd ${pwd} fi return ${rv} } # dpatch_patch_cat dpatch_patch_cat () { local patch ext author args o_nm o_nd o_a sp o_q args=$1 patch=$2 sp=" " set -- ${args} while [ $# -ne 0 ]; do case $1 in --quiet|-q) o_q=1 ;; --no-meta|-nm|--desc-only|-d) o_nm=1 o_a="" ;; --author-only|-a) o_a=1 o_nd=1 ;; --no-desc|-nd) o_nd=1 ;; -*) echo "dpatch: Invalid option for dpatch_patch_cat: $1" >&2 return 1 ;; *) break;; esac shift || true done test -e debian/patches/${patch} || ext=.dpatch patch=debian/patches/${patch}${ext} if [ ! -f ${patch} ]; then if [ -z "${o_q}" ]; then echo "${patch} does not exist." >&2 fi return 1 fi author=$(sed -n "s,^#* *.*dpatch by *,,p" ${patch}) if [ -z "${o_nm}" ] && [ -z "${o_a}" ]; then echo "${patch} (${author}):" else if [ ! -z "${o_a}" ]; then echo ${author} return 0 fi sp="" fi if [ -z "${o_nd}" ]; then sed -n "s/^#* *DP: */${sp}/p" ${patch} echo fi return 0 } # dpatch_patch_list dpatch_patch_list () { if [ ! -z "${args}" ]; then echo "dpatch: dpatch_patch_list does not take any options." >&2 return 1 fi echo "${2%.dpatch}" return 0 } # dpatch_command_map dpatch_command_map () { local cmd_o cmd cmd_o=$1 case ${cmd_o} in call|call-until|call-up-to|call-all) cmd=custom ;; patch|apply|patch-until|apply-until|patch-up-to|apply-up-to|patch-all|apply-all) cmd=apply ;; unpatch|deapply|unpatch-until|deapply-until|unpatch-up-to|deapply-up-to|unpatch-all|deapply-all) cmd=deapply ;; list|list-all|list-up-to|list-until) cmd=list ;; cat|cat-all|cat-up-to|cat-until) cmd=cat ;; status|status-all|status-up-to|status-until) cmd=status ;; log|log-all|log-up-to|log-until) cmd=log ;; patch-template) cmd=patch_template ;; help|--help|-h) cmd=help ;; version|--version|-V) cmd=version ;; *) cmd=UNKNOWN ;; esac echo ${cmd} } ## arch-tag: 841ef943-8c27-4094-a413-576f76c2b8f9 dpatch/dpatch/Makefile0000644000000000000000000000160411621425704012115 0ustar top_srcdir := .. DPATCH_SRCS := $(shell sed -n s/^\#:include//p dpatch.shpp) include ../config.mk all: dpatch dpatch-run dpatch.lib.sh dpatch: dpatch.shpp ../debian/changelog ${DPATCH_SRCS} DPATCH_REVISION="${DPATCH_REVISION}" \ SYSCONFDIR="${sysconfdir}" ../tools/shpp.awk dpatch chmod +x dpatch dpatch-run: dpatch-run.shpp ../tools/shpp.awk dpatch-run dpatch.lib.sh: dpatch.lib.shpp ../tools/shpp.awk dpatch.lib.sh clean: rm -f dpatch dpatch-run dpatch.lib.sh install: all install --mode 0755 dpatch ${DESTDIR}${bindir}/ install --mode 0644 dpatch.1 ${DESTDIR}${man1dir}/ install --mode 0644 dpatch.7 ${DESTDIR}${man7dir}/ install --mode 0644 dpatch-run ${DESTDIR}${pkgdatadir}/ install --mode 0644 dpatch.lib.sh ${DESTDIR}${pkgdatadir}/ .PHONY: all clean install .SUFFIXES: # arch-tag: ae9d044e-94e2-4692-9a3d-fbff280e147e dpatch/dpatch/dpatch_args.shpp0000644000000000000000000000210211621425704013622 0ustar ## dpatch_args.shpp -*- shell-script -*- ## ## Argument handling helper functions for dpatch. ## # dpatch_args_check dpatch_args_check () { local minargs maxargs argc ch ch=$1 argc=$2 minargs=$3 maxargs=$4 if [ $ch -eq 1 ]; then return 0 fi if test ${argc} -gt ${maxargs} && test ${maxargs} -ne -1; then echo "dpatch: Wrong number of arguments: ${argc} (expecting at most ${maxargs})." >&2 exit 1 fi if test ${argc} -lt ${minargs} && test ${minargs} -ne -1; then echo "dpatch: Wrong number of arguments: ${argc} (expecting at least ${minargs})." >&2 exit 1 fi } # dpatch_arg_count dpatch_arg_count () { local argc h argc=0 while [ $# -ne 0 ]; do case $1 in -*) ;; *) argc=$(expr ${argc} + 1) ;; esac shift || true done echo ${argc} return 0 } # dpatch_arg_cmd_help dpatch_arg_cmd_help () { local h=0 while [ $# -ne 0 ]; do case $1 in --help|-h) h=1 ;; esac shift || true done echo ${h} return 0; } ## arch-tag: e31ccb46-5f55-40fd-8678-3b9fd7ff0581 dpatch/dpatch/dpatch.70000644000000000000000000000520511671675726012031 0ustar .\" -*- nroff -*- .\" This manual is for dpatch, a patch maintenance system for Debian .\" .\" Copyright (C) 2003 Gergely Nagy .\" .\" Permission is granted to make and distribute verbatim copies of this .\" manual provided the copyright notice and this permission notice are .\" preserved on all copies. .\" .\" Permission is granted to copy and distribute modified versions of this .\" manual under the conditions for verbatim copying, provided that the .\" entire resulting derived work is distributed under the terms of a .\" permission notice identical to this one. .\" .\" Permission is granted to copy and distribute translations of this .\" manual into another language, under the above conditions for modified .\" versions, except that this permission notice may be stated in a .\" translation approved by the Author. .TH DPATCH 7 "Dec 13 2011" "DPATCH 2" "dpatch" .SH "NAME" debian/patches/script.dpatch \- self applying patch .SH "SYNOPSIS" .BI "debian/patches/script.dpatch " "\-patch " [ directory ] .br .BI "debian/patches/script.dpatch " "\-unpatch " [ directory ] .br .BI "debian/patches/script.dpatch " \-pkg\- "custom [" directory ] .SH "DESCRIPTION" A \fBdpatch\fR is a program that modifies the source tree in a given \fIdirectory\fR. How it does that is entirely up to the person writing it. It can be a script that calls \fBpatch\fR(1) with the appropriate options, a complicated perl script that does some deep magic, or anything else. The only requirement is that it \fBMUST\fR accept the \fI\-patch\fR and \fI\-unpatch\fR options, followed by the destination (or working) directory, when specified. For the sake of compatibility, the second argument is only present when a working directory was explicitly set with \fBdpatch \-\-workdir\fR. For some of the \fBdpatch\fR(1) features to work, the script should follow a common style: there should be a line near the top of the file with the following format: "\fIfilename\fR \-\- \fIauthor\fR <\fIemail\fR>". And one or more "# DP: \fIdescription\fR" lines. These will be used by \fBdpatch cat\fR for example. .SH WARNING .B dpatch is deprecated, please switch to the `3.0 (quilt)' Debian source package format instead. See .I http://wiki.debian.org/Projects/DebSrc3.0#FAQ for a short guide on how to do it. .SH "EXAMPLES" One can find \fBdpatch\fR examples under \fI/usr/share/doc/dpatch/examples/\fR. .SH "AUTHOR" This manual page was written by Gergely Nagy. .SH "SEE ALSO" .BR "dpatch" "(1), " .BR "dpatch.make" "(7), " .BR "dpatch\-edit\-patch" "(1), " .BR "dpatch\-list\-patch" "(1), " .BR "dpatch\-convert\-diffgz" "(1)" .\" arch-tag: 58cb8407-3f7d-4c2c-a4ba-d797dabbb4ef dpatch/dpatch/dpatch_requisites.shpp0000644000000000000000000000072411621425704015073 0ustar ## dpatch_requisites.shpp -*- shell-script -*- ## ## Sanity checks for dpatch ## # dpatch_requisites dpatch_requisites() { local DPATCH_REQUISITES_FAILED if [ "$DPATCH_OPTION_CPP" = 1 ]; then if [ ! -x /usr/bin/cpp ]; then echo "dpatch: /usr/bin/cpp not found, aborting!" >&2 echo " (consider installing the cpp package)" >&2 DPATCH_REQUISITES_FAILED=1 fi fi return $DPATCH_REQUISITES_FAILED } ## arch-tag: 438d1388-ff63-442e-9b70-67ef4d2b47a7 dpatch/dpatch/dpatch_patchset.shpp0000644000000000000000000000367211621612301014505 0ustar ## dpatch_patchset.shpp -*- shell-script -*- ## ## Patchset handling functions for dpatch. ## # dpatch_pathset_do [] dpatch_patchset_do () { local patchlist patchlist_all patchlist_arch patch cpatch cmd args local is_single DEB_BUILD_ARCH=${DEB_BUILD_ARCH:-$(dpkg-architecture -qDEB_BUILD_ARCH)} DEB_BUILD_ARCH_CPP=$(echo ${DEB_BUILD_ARCH} | tr "-" "_") cmd=$1; shift || true is_single=$1; shift || true while [ $# -ne 0 ]; do case $1 in --help|-h) dpatch_help_do ${cmd} return $? ;; -*) args="${args} $1" ;; *) break ;; esac shift || true done patch="${1%%.dpatch}"; if [ $# -ne 0 ]; then shift || true fi if test $# -gt 0 || test $is_single -eq 1; then patchlist="$patch $@" patch="" else if [ "${DPATCH_OPTION_CPP}" = "0" ]; then if test -f debian/patches/00list; then patchlist_all="$(grep -v ^\# debian/patches/00list || :)" fi if test -f debian/patches/00list.${DEB_BUILD_ARCH}; then patchlist_arch="$(grep -v ^\# debian/patches/00list.${DEB_BUILD_ARCH} || :)" fi else if [ -f debian/patches/00list ]; then patchlist_all="$(cpp -P -DDEB_BUILD_ARCH_${DEB_BUILD_ARCH_CPP}=1 \ -DDEB_BUILD_ARCH=\"${DEB_BUILD_ARCH}\" \ debian/patches/00list || :)" fi if [ -f debian/patches/00list.${DEB_BUILD_ARCH} ]; then patchlist_arch="$(cpp -P -DDEB_BUILD_ARCH_${DEB_BUILD_ARCH_CPP}=1 \ -DDEB_BUILD_ARCH=\"${DEB_BUILD_ARCH}\" \ debian/patches/00list.${DEB_BUILD_ARCH} || :)" fi fi patchlist="${patchlist_all} ${patchlist_arch}" fi if test "x$cmd" = "xdeapply"; then patchlist=$(echo ${patchlist} | tr ' ' '\n' | tac) fi for cpatch in ${patchlist}; do cpatch="${cpatch%%.dpatch}" dpatch_patch_${cmd} "${args}" "${cpatch}" if test $? -ne 0; then return $? fi if test "x${cpatch}" = "x${patch}"; then return 0 fi done } ## arch-tag: 8ce6157c-c059-48f1-aa5c-a0a217596f66 dpatch/dpatch/dpatch_template.shpp0000644000000000000000000000167311621425704014515 0ustar ## dpatch_template.shpp -*- shell-script -*- ## ## Template handling helper functions for dpatch ## # dpatch_patch_template [] dpatch_patch_template () { local pname pdesc o_p while [ $# -ne 0 ]; do case $1 in --help|-h) dpatch_help_do patch-template return $? ;; --prepend|-p) o_p=1 ;; -*) echo "dpatch: Invalid option for dpatch_patch_template: $1" >&2 return 1 ;; *) break ;; esac shift || true done pname=${1:-99-unnamed} pdesc=${2:-No description.} cat < ## ## All lines beginning with \`## DP:' are a description of the patch. EOF echo "${pdesc}" | fold -s -w 72 | sed -e "s,^,## DP: ,g" cat <&2 exit 1 fi [ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts patch_opts="${patch_opts:--g0 -f --no-backup-if-mismatch} ${workdir:+-d ${workdir}}" DPATCH_SOURCE="${patch}" DPATCH_WORKDIR="${workdir}" case "${action}" in -patch) dpatch_lib_patch ${patch_opts} < ${patch};; -unpatch) dpatch_lib_unpatch ${patch_opts} < ${patch};; *) echo "$(basename ${patch}): script expects -patch|-unpatch as argument" >&2 exit 1;; esac exit 0 # arch-tag: e1bd0fd7-d4e2-4dfb-b81a-e8c062a8c055 dpatch/dpatch/devel-docs/0000755000000000000000000000000011621425704012501 5ustar dpatch/dpatch/devel-docs/01-cli+calling.txt0000644000000000000000000001075411621425704015643 0ustar CLI parsing and calling conventions in dpatch ============================================= Probably the most scary part of dpatch is the CLI parser. It is scary and complex since it involves quite a few parts of the code, and is spread over almost every single function. There are four parts of every single command line call: global options, command, command options and command arguments. They must be given in this order, options and arguments do not mix. Also, to keep the parser simple and distributed (more on this later) options and their value must be passed to dpatch as a single positional parameter. Now, lets step closer to the code and inspect the call chain! First, dpatch tries to find all the global options, and set the appropriate variables based on them. As soon as it finds a non-option, it exits the loop. And this is where things get interesting! To understand what is going on and why, let me explain some calling conventions (that is, a life of a command call)! All commands that deal with patches have a low-level primitive in dpatch_lowlevel.shpp. This primitive implements the command for one and only one patch. It has no idea of patch sequences or whatnot. Though, this one handles the command-specific options. Then, there is the main entry point, dpatch_patchset_do in dpatch_patchset.shpp, which feeds the options it received and one by one, each patch in a sequence to the appropriate low-level function. Now, lets get back to a higher level, where dpatch just finished parsing the global options. The next element is assumed to be the name of the command, so dpatch calls a mapping function that maps known commands to the appropriate low-level handler. Note that `foo', `foo-until' and `foo-all' are all handled by dpatch_patchset_do and dpatch_patch_foo! The only difference is the number of arguments accepted and the way the patch sequence is constructed from them. To ease our job, before calling dpatch_patchset_do, we save all the command-specific options, and count the remaining arguments, and scream if they are not in the allowed range. To make things clear, let us look at an example! Lets suppose we issued a `dpatch --workdir=/foo patch --quiet 01 02 03' command! First, dpatch notices the --workdir option, and acts appropriately. Then notices that "patch" is not an option, so it quits parsing command-line options. The first positional parameter ("patch", as global options were already shifted away) is the command name. Good! Now lets save the command options, in this case, "--quiet". Then, check if we have arguments in the allowed range, which we do, as `patch' takes at least one argument, and has no upper limit. So, we call dpatch_patchset_do, telling it that we want to use the lowlevel function for `patch', pass the command options as a single string, tell the function that it should not modify the patch sequence, and finally supply the list too. From this point on, dpatch_patchset_do's job is straightforward. For a slightly different case, lets look at what happens if we issue the `dpatch --workdir=/foo patch-until 04' command! Up to the point where we count the command arguments, we are on the same code path. We even have the right number of arguments. However, now we ask dpatch_patchset_do to do modify the patch sequence for us. There is an assumption in dpatch_patchset_do that must be mentioned here. There are four ways a patch sequence can be handled: * When one patch was supplied and patch sequence modification was not permitted, the sequence is left intact (`patch' with a single argument). * When one patch was supplied and patch sequence modification is needed, the list of patches is determined, and all patches after the specified one are deleted from the list (`patch-until' case). * When multiple patches were supplied, the sequence is left intact (`patch' with multiple arguments). * When no patches were supplied, we treat this case as if all available patches were supplied (`patch-all' case). Well, that was it for starters. I hope I could shed some light on the mysteries of dpatch internals. However, I will summarise what we learned in this session: Low-level routines are never ever called directly. All interaction with them goes through dpatch_patchset_do which sanitises the patch sequence, and passes each patch individually to the low-level functions. Options are also parsed in a similar fashion, at different levels in the call hierarchy. In our next lesson, I will talk about coding style. Maybe. # arch-tag: e04983df-1399-4e03-bbd9-0a6579e16fee dpatch/history/0000755000000000000000000000000011621425704010712 5ustar dpatch/history/dbharris/0000755000000000000000000000000011621425704012510 5ustar dpatch/history/dbharris/ChangeLog.dbharris--2.00000644000000000000000000011476511621425704016447 0ustar # do not edit -- automatically generated by arch changelog # arch-tag: automatic-ChangeLog--dbharris@eelf.ddts.net--2004-debian/dpatch--dbharris--2.0 # 2004-03-17 04:17:40 GMT David B Harris patch-41 Summary: And add changelog for previous commit Revision: dpatch--dbharris--2.0--patch-41 modified files: debian/changelog history/dbharris/ChangeLog.dbharris--2.0 2004-03-17 04:16:57 GMT David B Harris patch-40 Summary: Crap, fix typo Revision: dpatch--dbharris--2.0--patch-40 modified files: dpep/dpatch-edit-patch history/dbharris/ChangeLog.dbharris--2.0 2004-03-17 02:25:54 GMT David B Harris patch-39 Summary: Merge with public alioth repo Revision: dpatch--dbharris--2.0--patch-39 Patches applied: * dpatch@packages.qa.debian.org--archive/dpatch--mainline--2.0--patch-83 Bugger, forgot to update changelog modified files: debian/changelog history/dbharris/ChangeLog.dbharris--2.0 history/dpatch/ChangeLog.mainline--2.0 new patches: dpatch@packages.qa.debian.org--archive/dpatch--mainline--2.0--patch-83 2004-03-17 02:19:35 GMT David B Harris patch-38 Summary: Merge with public alioth repo Revision: dpatch--dbharris--2.0--patch-38 Patches applied: * dpatch@packages.qa.debian.org--archive/dpatch--mainline--2.0--patch-82 Merge with David's dbharris@eelf.ddts.net--2004-debian modified files: history/dbharris/ChangeLog.dbharris--2.0 history/dpatch/ChangeLog.mainline--2.0 new patches: dpatch@packages.qa.debian.org--archive/dpatch--mainline--2.0--patch-82 2004-03-17 01:55:09 GMT David B Harris patch-37 Summary: Merge with Gergely's dpatch--mainline--2.0 Revision: dpatch--dbharris--2.0--patch-37 modified files: history/dbharris/ChangeLog.dbharris--2.0 2004-03-16 04:16:46 GMT David B Harris patch-36 Summary: Change my Uploaders: email address from my private one to dbharris@debian.org Revision: dpatch--dbharris--2.0--patch-36 modified files: debian/changelog debian/control history/dbharris/ChangeLog.dbharris--2.0 2004-03-01 18:35:05 GMT David B Harris patch-35 Summary: If editing the first patch in 00list, don't apply it to the source tree Revision: dpatch--dbharris--2.0--patch-35 Don't mistakenly apply patch in source tree (which it will if you're editing the first patch in 00list). (Closes: #235596) modified files: debian/changelog dpep/dpatch-edit-patch history/dbharris/ChangeLog.dbharris--2.0 2004-03-01 18:17:51 GMT David B Harris patch-34 Summary: Attempt to revert half-applied patch if it's still the same Revision: dpatch--dbharris--2.0--patch-34 This is a multi-functional commit, I'm afraid: 1) Don't create stampfile if the patch failed to apply; instead, create stampfile.failed 2) Add md5sum of the patch to stampfile.failed (see below :) 3) When reverting a failed patch, if the md5sum matches, ignore failure (a half-applied patch will be successfully unapplied, even though patch will exit with $? > 0) modified files: debian/changelog dpatch/dpatch_lowlevel.shpp history/dbharris/ChangeLog.dbharris--2.0 2004-03-01 07:19:00 GMT David B Harris patch-33 Summary: Merge with Gergely's dpatch--mainline--2.0--patch-81 Revision: dpatch--dbharris--2.0--patch-33 Patches applied: * dpatch@packages.qa.debian.org--archive/dpatch--mainline--2.0--patch-81 Finalised changelog for 2.0.6 modified files: debian/changelog history/dbharris/ChangeLog.dbharris--2.0 history/dpatch/ChangeLog.mainline--2.0 new patches: dpatch@packages.qa.debian.org--archive/dpatch--mainline--2.0--patch-81 2004-02-23 11:09:27 GMT David B Harris patch-32 Summary: Whitespace change to test commit email Revision: dpatch--dbharris--2.0--patch-32 modified files: README history/dbharris/ChangeLog.dbharris--2.0 2004-02-23 11:08:51 GMT David B Harris patch-31 Summary: Whitespace change to test commit email Revision: dpatch--dbharris--2.0--patch-31 modified files: README history/dbharris/ChangeLog.dbharris--2.0 2004-02-23 11:07:10 GMT David B Harris patch-30 Summary: Whitespace change to test commit email Revision: dpatch--dbharris--2.0--patch-30 modified files: README history/dbharris/ChangeLog.dbharris--2.0 2004-02-23 11:06:19 GMT David B Harris patch-29 Summary: Whitespace change to test commit email Revision: dpatch--dbharris--2.0--patch-29 modified files: README history/dbharris/ChangeLog.dbharris--2.0 2004-02-23 11:00:29 GMT David B Harris patch-28 Summary: Whitespace change to test commit email Revision: dpatch--dbharris--2.0--patch-28 modified files: README history/dbharris/ChangeLog.dbharris--2.0 2004-02-23 10:59:58 GMT David B Harris patch-27 Summary: Whitespace change to test commit email Revision: dpatch--dbharris--2.0--patch-27 modified files: README history/dbharris/ChangeLog.dbharris--2.0 2004-02-23 10:54:34 GMT David B Harris patch-26 Summary: Merge with Gergely's dpatch@packages.qa.debian.org--archive/dpatch--mainline--2.0--patch-80 Revision: dpatch--dbharris--2.0--patch-26 Patches applied: * dpatch@packages.qa.debian.org--archive/dpatch--mainline--2.0--patch-79 Star-merged with Dave * dpatch@packages.qa.debian.org--archive/dpatch--mainline--2.0--patch-80 Made dpep executable modified files: dpep/dpatch-edit-patch history/dbharris/ChangeLog.dbharris--2.0 history/dpatch/ChangeLog.mainline--2.0 new patches: dpatch@packages.qa.debian.org--archive/dpatch--mainline--2.0--patch-79 dpatch@packages.qa.debian.org--archive/dpatch--mainline--2.0--patch-80 2004-02-23 10:23:36 GMT David B Harris patch-25 Summary: Use 'grep -F' instead of 'egrep -F'. The latter is seriously broken. Revision: dpatch--dbharris--2.0--patch-25 modified files: debian/changelog dpep/dpatch-edit-patch history/dbharris/ChangeLog.dbharris--2.0 2004-02-23 10:12:38 GMT David B Harris patch-24 Summary: Merge with Gergely's dpatch@packages.qa.debian.org--archive/dpatch--mainline--2.0--patch-76 Revision: dpatch--dbharris--2.0--patch-24 Patches applied: * dpatch@packages.qa.debian.org--archive/dpatch--mainline--2.0--patch-77 Fixed a typo * dpatch@packages.qa.debian.org--archive/dpatch--mainline--2.0--patch-78 Fixed dpatch *-until modified files: debian/changelog dpatch/dpatch_patchset.shpp dpep/dpatch-edit-patch history/dbharris/ChangeLog.dbharris--2.0 history/dpatch/ChangeLog.mainline--2.0 new patches: dpatch@packages.qa.debian.org--archive/dpatch--mainline--2.0--patch-77 dpatch@packages.qa.debian.org--archive/dpatch--mainline--2.0--patch-78 2004-02-23 09:37:26 GMT David B Harris patch-23 Summary: Merge with Gergely, dpatch@packages.qa.debian.org--archive/dpatch--mainline--2.0--patch-76 Revision: dpatch--dbharris--2.0--patch-23 Patches applied: * dpatch@packages.qa.debian.org--archive/dpatch--mainline--2.0--patch-74 Star-merged with Dave * dpatch@packages.qa.debian.org--archive/dpatch--mainline--2.0--patch-75 Added a --no-stamp option to dpatch apply * dpatch@packages.qa.debian.org--archive/dpatch--mainline--2.0--patch-76 dpep changed to use dpatch apply --no-stamp modified files: debian/changelog dpatch/dpatch_lowlevel.shpp dpep/dpatch-edit-patch history/dbharris/ChangeLog.dbharris--2.0 history/dpatch/ChangeLog.mainline--2.0 new patches: dpatch@packages.qa.debian.org--archive/dpatch--mainline--2.0--patch-74 dpatch@packages.qa.debian.org--archive/dpatch--mainline--2.0--patch-75 dpatch@packages.qa.debian.org--archive/dpatch--mainline--2.0--patch-76 2004-02-23 06:11:10 GMT David B Harris patch-22 Summary: Use '$PATCH -apply' for the patch we're editing instead of 'dpatch apply $PATCH' Revision: dpatch--dbharris--2.0--patch-22 dpep/dpatch-edit-patch: When editing a pre-existing patch, don't use '/usr/bin/dpatch apply $PATCH' to apply it, as this creates stampfiles in the diff, which is a Bad Thing. Use '$PATCH -appy' instead for now, will work on a "cleaner" solution later. modified files: debian/changelog dpep/dpatch-edit-patch history/dbharris/ChangeLog.dbharris--2.0 2004-02-20 17:49:23 GMT David B Harris patch-21 Summary: Merge with Gergely, dpatch@packages.qa.debian.org--archive/dpatch--mainline--2.0--patch-73 Revision: dpatch--dbharris--2.0--patch-21 Patches applied: * dpatch@packages.qa.debian.org--archive/dpatch--mainline--2.0--patch-69 Simplify .dpatch nuking in dpatch_patch_list() * dpatch@packages.qa.debian.org--archive/dpatch--mainline--2.0--patch-70 Star-merged with Dave * dpatch@packages.qa.debian.org--archive/dpatch--mainline--2.0--patch-71 debian/changelog fixation * dpatch@packages.qa.debian.org--archive/dpatch--mainline--2.0--patch-72 TODO update * dpatch@packages.qa.debian.org--archive/dpatch--mainline--2.0--patch-73 Documentation for developers, step one new files: dpatch/devel-docs/.arch-ids/=id dpatch/devel-docs/01-cli+calling.txt modified files: TODO debian/changelog dpatch/dpatch_lowlevel.shpp history/dbharris/ChangeLog.dbharris--2.0 history/dpatch/ChangeLog.mainline--2.0 new directories: dpatch/devel-docs dpatch/devel-docs/.arch-ids new patches: dpatch@packages.qa.debian.org--archive/dpatch--mainline--2.0--patch-69 dpatch@packages.qa.debian.org--archive/dpatch--mainline--2.0--patch-70 dpatch@packages.qa.debian.org--archive/dpatch--mainline--2.0--patch-71 dpatch@packages.qa.debian.org--archive/dpatch--mainline--2.0--patch-72 dpatch@packages.qa.debian.org--archive/dpatch--mainline--2.0--patch-73 2004-02-17 22:21:18 GMT David B Harris patch-20 Summary: Star-merge with Gergely, and take advantage of the new stipping stuff in 'dpatch list*' Revision: dpatch--dbharris--2.0--patch-20 Patches applied: * dpatch@packages.qa.debian.org--archive/dpatch--mainline--2.0--patch-68 Strip .dpatch$ in dpatch list* output modified files: dpatch/dpatch_lowlevel.shpp dpep/dpatch-edit-patch history/dbharris/ChangeLog.dbharris--2.0 history/dpatch/ChangeLog.mainline--2.0 new patches: dpatch@packages.qa.debian.org--archive/dpatch--mainline--2.0--patch-68 2004-02-17 21:59:22 GMT David B Harris patch-19 Summary: Fix mistake in changelog Revision: dpatch--dbharris--2.0--patch-19 modified files: debian/changelog history/dbharris/ChangeLog.dbharris--2.0 2004-02-17 20:40:25 GMT David B Harris patch-18 Summary: Use 'debian/rules clean unpatch' in dpep, closes: #212312 Revision: dpatch--dbharris--2.0--patch-18 Use 'debian/rules clean unpatch' to clean the source tree before replication - this allows for one to ship a regular-style source package (with all the patches applied to the tree) even if dpatch is used. Thanks, Ryan Underwood. (Closes: #212312) modified files: debian/changelog dpep/dpatch-edit-patch history/dbharris/ChangeLog.dbharris--2.0 2004-02-17 19:56:55 GMT David B Harris patch-17 Summary: Merge with Gergely, dpatch--mainline--2.0--patch-67 Revision: dpatch--dbharris--2.0--patch-17 Patches applied: * dpatch@packages.qa.debian.org--archive/dpatch--mainline--2.0--patch-61 Star-merged with Dave * dpatch@packages.qa.debian.org--archive/dpatch--mainline--2.0--patch-62 Star-merged with Dave * dpatch@packages.qa.debian.org--archive/dpatch--mainline--2.0--patch-63 Added Dave's changelogs * dpatch@packages.qa.debian.org--archive/dpatch--mainline--2.0--patch-64 Fixed an old-posixism (head -1 vs head -n 1) * dpatch@packages.qa.debian.org--archive/dpatch--mainline--2.0--patch-65 Fixed a typo and a wrapped line * dpatch@packages.qa.debian.org--archive/dpatch--mainline--2.0--patch-66 Makefilification (sic) * dpatch@packages.qa.debian.org--archive/dpatch--mainline--2.0--patch-67 Finalise 2.0.5 new files: dpep/Makefile history/dbharris/.arch-ids/=id history/dbharris/ChangeLog.dbharris--2.0 history/dbharris/ChangeLog.dpep-port--2.0 modified files: Makefile config.mk debian/changelog debian/rules dpep/dpatch-edit-patch history/dpatch/ChangeLog.mainline--2.0 new directories: history/dbharris history/dbharris/.arch-ids new patches: dpatch@packages.qa.debian.org--archive/dpatch--mainline--2.0--patch-61 dpatch@packages.qa.debian.org--archive/dpatch--mainline--2.0--patch-62 dpatch@packages.qa.debian.org--archive/dpatch--mainline--2.0--patch-63 dpatch@packages.qa.debian.org--archive/dpatch--mainline--2.0--patch-64 dpatch@packages.qa.debian.org--archive/dpatch--mainline--2.0--patch-65 dpatch@packages.qa.debian.org--archive/dpatch--mainline--2.0--patch-66 dpatch@packages.qa.debian.org--archive/dpatch--mainline--2.0--patch-67 2004-02-17 09:26:09 GMT David B Harris patch-16 Summary: Clarify/fix a few things in the changelog Revision: dpatch--dbharris--2.0--patch-16 modified files: debian/changelog 2004-02-17 09:07:59 GMT David B Harris patch-15 Summary: Port dpatch-edit-patch to use dpatch(1) calls for everything Revision: dpatch--dbharris--2.0--patch-15 Okay, I've ported dpep to use /usr/bin/dpatch wherever possible - which was pretty much everything. A few things of note that could be added: o Normalise 'dpatch list*' output, to strip all leading/trailing whitespace, in addition to removing any .dpatch extensions if they exist. o Get 'dpatch patch-template' to honour debian/patches/00options' DPEP_OPTION_EXEC_TEMPLATE=1 - debian/patches/00options should be made executable and be passed the basename of the patch (no .dpatch) in addition to the description. Its output will be the patch header, and is used by dpatch-edit-patch As it stands, however, I think we should upload this version and get some testing (I've gone through every combination of usage options and patch/list layouts that I can think of, but you never know...). modified files: debian/changelog dpep/dpatch-edit-patch dpep/dpatch-edit-patch.functions new patches: dbharris@eelf.ddts.net--2004-debian/dpatch--dpep-port--1.0--base-0 dbharris@eelf.ddts.net--2004-debian/dpatch--dpep-port--1.0--patch-1 dbharris@eelf.ddts.net--2004-debian/dpatch--dpep-port--1.0--patch-2 dbharris@eelf.ddts.net--2004-debian/dpatch--dpep-port--1.0--patch-3 dbharris@eelf.ddts.net--2004-debian/dpatch--dpep-port--1.0--patch-4 dbharris@eelf.ddts.net--2004-debian/dpatch--dpep-port--1.0--patch-5 2004-02-17 08:36:55 GMT David B Harris patch-14 Summary: Fix thinko in dpep, so that the interactive shell works as documented Revision: dpatch--dbharris--2.0--patch-14 Fix bug where if the interactive subshell exited with *anything* other than 0, the script would abort (and not clean up, at that). The intention is to only abort if the shell exits with code 230. modified files: debian/changelog dpep/dpatch-edit-patch 2004-02-17 07:58:32 GMT David B Harris patch-13 Summary: Add @DPATCH@ to the end of the hardcoded template Revision: dpatch--dbharris--2.0--patch-13 This is needed for dpatch-edit-patch (and should be there anyhoo). modified files: debian/changelog dpatch/dpatch_template.shpp 2004-02-17 04:51:35 GMT David B Harris patch-12 Summary: Merge with Gergely Revision: dpatch--dbharris--2.0--patch-12 Patches applied: * dpatch@packages.qa.debian.org--archive/dpatch--mainline--2.0--patch-59 Star-merged with Dave * dpatch@packages.qa.debian.org--archive/dpatch--mainline--2.0--patch-60 debian/changelog fixation modified files: debian/changelog history/dpatch/ChangeLog.mainline--2.0 new patches: dpatch@packages.qa.debian.org--archive/dpatch--mainline--2.0--patch-59 dpatch@packages.qa.debian.org--archive/dpatch--mainline--2.0--patch-60 2004-02-17 04:25:07 GMT David B Harris patch-11 Summary: Put stampfile in place even if patching fails Revision: dpatch--dbharris--2.0--patch-11 I was working on a source tree and I ran into kind of a bitch of a problem - I had a bad patch, and it failed to apply cleanly. No probs. Fix the patch, 'debian/rules unpatch; debian/rules patch' ... and it failed. WTF? Turns out that if the patch failed to apply, the stamp file was left ast ${stampfile}.new - it wasn't moved to the proper ${stampfile}. I don't know whether this was deliberate or not, but it causes quite a problem - a half-applied dpatch won't be un-half-applied with 'debian/rules unpatch', and a 'debian/rules patch', even with a dpatch, wouldn't succeed. modified files: debian/changelog dpatch/dpatch_lowlevel.shpp 2004-02-15 22:45:41 GMT David B Harris patch-10 Summary: Add debian/changelog entry for dbharris@eelf.ddts.net--2004-debian/dpatch--dbharris--2.0--patch-8 Revision: dpatch--dbharris--2.0--patch-10 modified files: debian/changelog 2004-02-15 22:42:51 GMT David B Harris patch-9 Summary: Merge with Gergely Revision: dpatch--dbharris--2.0--patch-9 Patches applied: * dpatch@packages.qa.debian.org--archive/dpatch--mainline--2.0--patch-52 star-merged with Dave * dpatch@packages.qa.debian.org--archive/dpatch--mainline--2.0--patch-53 debian/changelog update * dpatch@packages.qa.debian.org--archive/dpatch--mainline--2.0--patch-54 dpatch-convert-diffgz fix and improvements * dpatch@packages.qa.debian.org--archive/dpatch--mainline--2.0--patch-55 Prerequisite update * dpatch@packages.qa.debian.org--archive/dpatch--mainline--2.0--patch-56 dpatch/Makefile simplification * dpatch@packages.qa.debian.org--archive/dpatch--mainline--2.0--patch-57 debian/changelog fix and finalisation * dpatch@packages.qa.debian.org--archive/dpatch--mainline--2.0--patch-58 Fixed debian/rules modified files: debian/changelog debian/rules dpatch/Makefile history/dpatch/ChangeLog.mainline--2.0 scripts/dpatch-convert-diffgz new patches: dpatch@packages.qa.debian.org--archive/dpatch--mainline--2.0--patch-52 dpatch@packages.qa.debian.org--archive/dpatch--mainline--2.0--patch-53 dpatch@packages.qa.debian.org--archive/dpatch--mainline--2.0--patch-54 dpatch@packages.qa.debian.org--archive/dpatch--mainline--2.0--patch-55 dpatch@packages.qa.debian.org--archive/dpatch--mainline--2.0--patch-56 dpatch@packages.qa.debian.org--archive/dpatch--mainline--2.0--patch-57 dpatch@packages.qa.debian.org--archive/dpatch--mainline--2.0--patch-58 2004-02-15 22:39:43 GMT David B Harris patch-8 Summary: Add note about Build-Depends and CPP proprocessing of 00list Revision: dpatch--dbharris--2.0--patch-8 Add a note in the manpage that if one is preprocessing 00list with CPP, it cpp should be added to Build-Depends or Build-Depends-Indep. modified files: dpatch/dpatch.1 2004-02-15 00:19:41 GMT David B Harris patch-7 Summary: Remove --with-cpp documentation, add support for debian/patches/00options Revision: dpatch--dbharris--2.0--patch-7 Remove the documentation for --with-cpp, and instead mention 'DPATCH_OPTION_CPP=1' for debian/patches/00options. Also, add support for debian/patches/00options. Additionally, move requisites-checking to its own function, and move it after options (not command) checking. I'll let a more thorough treatment of debian/patches/00options be written by somebody who knows groff better than I :| new files: dpatch/dpatch_requisites.shpp modified files: dpatch/dpatch.1 dpatch/dpatch.shpp dpatch/dpatch_help.shpp 2004-01-29 22:26:01 GMT David B Harris patch-6 Summary: Merge against dpatch@packages.qa.debian.org/dpatch--mainline--2.0--patch-51 Revision: dpatch--dbharris--2.0--patch-6 Patches applied: * dpatch@packages.qa.debian.org--archive/dpatch--mainline--2.0--patch-48 Bumped version * dpatch@packages.qa.debian.org--archive/dpatch--mainline--2.0--patch-49 Fix empty 00list handling * dpatch@packages.qa.debian.org--archive/dpatch--mainline--2.0--patch-50 Merge with David * dpatch@packages.qa.debian.org--archive/dpatch--mainline--2.0--patch-51 changelog update modified files: debian/changelog dpatch/dpatch_patchset.shpp history/dpatch/ChangeLog.mainline--2.0 new patches: dpatch@packages.qa.debian.org--archive/dpatch--mainline--2.0--patch-48 dpatch@packages.qa.debian.org--archive/dpatch--mainline--2.0--patch-49 dpatch@packages.qa.debian.org--archive/dpatch--mainline--2.0--patch-50 dpatch@packages.qa.debian.org--archive/dpatch--mainline--2.0--patch-51 2004-01-29 22:22:32 GMT David B Harris patch-5 Summary: Bugger, forgot to add changelog entry for last commit Revision: dpatch--dbharris--2.0--patch-5 modified files: debian/changelog 2004-01-27 17:10:15 GMT David B Harris patch-4 Summary: Use 'head -n1' instead of 'head -1', closes: #229941 Revision: dpatch--dbharris--2.0--patch-4 modified files: dpep/dpatch-edit-patch 2004-01-24 23:06:59 GMT David B Harris patch-3 Summary: Prefix dpep/ to dpatch-edit-patch source file references Revision: dpatch--dbharris--2.0--patch-3 This should have been done with dpatch--dbharris--2.0--patch-1, but I was just playing around and it didn't cross my mind. modified files: debian/rules 2004-01-24 23:03:13 GMT David B Harris patch-2 Summary: Merge to dpatch--mainline--2.0--patch-47 Revision: dpatch--dbharris--2.0--patch-2 2004-01-23 21:07:31 GMT David B Harris patch-1 Summary: Move dpatch-edit-patch files to dpep/ Revision: dpatch--dbharris--2.0--patch-1 Move all dpatch-edit-patch files to dpep/ for a cleaner tree. Note dpep/ was chosen instead of dpatch-edit-patch/ for easier tab-competion. new files: dpep/.arch-ids/=id renamed files: dpatch-edit-patch ==> dpep/dpatch-edit-patch dpatch-edit-patch.1 ==> dpep/dpatch-edit-patch.1 dpatch-edit-patch.functions ==> dpep/dpatch-edit-patch.functions dpatch_edit_patch.bash_completion.d ==> dpep/dpatch_edit_patch.bash_completion.d new directories: dpep dpep/.arch-ids 2004-01-23 21:00:11 GMT David B Harris base-0 Summary: tag of dpatch@packages.qa.debian.org--archive/dpatch--mainline--2.0--patch-47 Revision: dpatch--dbharris--2.0--base-0 (automatically generated log message) new patches: algernon@bonehunter.rulez.org--tla/dpatch--mainline--1--base-0 algernon@bonehunter.rulez.org--tla/dpatch--mainline--1--patch-1 algernon@bonehunter.rulez.org--tla/dpatch--mainline--1--patch-2 algernon@bonehunter.rulez.org--tla/dpatch--mainline--1--patch-3 algernon@bonehunter.rulez.org--tla/dpatch--mainline--1--patch-4 algernon@bonehunter.rulez.org--tla/dpatch--mainline--1--patch-5 algernon@bonehunter.rulez.org--tla/dpatch--mainline--1--patch-6 algernon@bonehunter.rulez.org--tla/dpatch--mainline--1--patch-7 algernon@bonehunter.rulez.org--tla/dpatch--mainline--1--patch-8 algernon@bonehunter.rulez.org--tla/dpatch--mainline--1--patch-9 algernon@bonehunter.rulez.org--tla/dpatch--mainline--1--patch-10 algernon@bonehunter.rulez.org--tla/dpatch--mainline--1--patch-11 algernon@bonehunter.rulez.org--tla/dpatch--mainline--1--patch-12 algernon@bonehunter.rulez.org--tla/dpatch--mainline--1--patch-13 algernon@bonehunter.rulez.org--tla/dpatch--mainline--1--patch-14 algernon@bonehunter.rulez.org--tla/dpatch--mainline--1--patch-15 algernon@bonehunter.rulez.org--tla/dpatch--mainline--1--patch-16 algernon@bonehunter.rulez.org--tla/dpatch--mainline--1--patch-17 algernon@bonehunter.rulez.org--tla/dpatch--mainline--1--patch-18 algernon@bonehunter.rulez.org--tla/dpatch--mainline--1--patch-19 algernon@bonehunter.rulez.org--tla/dpatch--mainline--1--patch-20 algernon@bonehunter.rulez.org--tla/dpatch--mainline--1--patch-21 algernon@bonehunter.rulez.org--tla/dpatch--mainline--1--patch-22 algernon@bonehunter.rulez.org--tla/dpatch--mainline--1--patch-23 algernon@bonehunter.rulez.org--tla/dpatch--mainline--1--patch-24 algernon@bonehunter.rulez.org--tla/dpatch--mainline--1--patch-25 algernon@bonehunter.rulez.org--tla/dpatch--mainline--1--patch-26 algernon@bonehunter.rulez.org--tla/dpatch--mainline--1--patch-27 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--base-0 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-1 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-2 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-3 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-4 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-5 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-6 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-7 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-8 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-9 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-10 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-11 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-12 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-13 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-14 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-15 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-16 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-17 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-18 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-19 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-20 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-21 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-22 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-23 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-24 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-25 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-26 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-27 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-28 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-29 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-30 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-31 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-32 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-33 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-34 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-35 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-36 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-37 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-38 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-39 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-40 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-41 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-42 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-43 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-44 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-45 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-46 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-47 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-48 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-49 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-50 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-51 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-52 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-53 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-54 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-55 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-56 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-57 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-58 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-59 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-60 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-61 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-62 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-63 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-64 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-65 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-66 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-67 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-68 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-69 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-70 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-71 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-72 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-73 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-74 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-75 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-76 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-77 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-78 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-79 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-80 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-81 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-82 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-83 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-84 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-85 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-86 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-87 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-88 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-89 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-90 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-91 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-92 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-93 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-94 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-95 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-96 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-97 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-98 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-99 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-100 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-101 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-102 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-103 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-104 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-105 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-106 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-107 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-108 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-109 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-110 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-111 david@eelf.ddts.net--debian/dpatch--eelf--0--base-0 david@eelf.ddts.net--debian/dpatch--eelf--0--patch-1 dpatch@packages.qa.debian.org--archive/dpatch--mainline--2.0--base-0 dpatch@packages.qa.debian.org--archive/dpatch--mainline--2.0--patch-1 dpatch@packages.qa.debian.org--archive/dpatch--mainline--2.0--patch-2 dpatch@packages.qa.debian.org--archive/dpatch--mainline--2.0--patch-3 dpatch@packages.qa.debian.org--archive/dpatch--mainline--2.0--patch-4 dpatch@packages.qa.debian.org--archive/dpatch--mainline--2.0--patch-5 dpatch@packages.qa.debian.org--archive/dpatch--mainline--2.0--patch-6 dpatch@packages.qa.debian.org--archive/dpatch--mainline--2.0--patch-7 dpatch@packages.qa.debian.org--archive/dpatch--mainline--2.0--patch-8 dpatch@packages.qa.debian.org--archive/dpatch--mainline--2.0--patch-9 dpatch@packages.qa.debian.org--archive/dpatch--mainline--2.0--patch-10 dpatch@packages.qa.debian.org--archive/dpatch--mainline--2.0--patch-11 dpatch@packages.qa.debian.org--archive/dpatch--mainline--2.0--patch-12 dpatch@packages.qa.debian.org--archive/dpatch--mainline--2.0--patch-13 dpatch@packages.qa.debian.org--archive/dpatch--mainline--2.0--patch-14 dpatch@packages.qa.debian.org--archive/dpatch--mainline--2.0--patch-15 dpatch@packages.qa.debian.org--archive/dpatch--mainline--2.0--patch-16 dpatch@packages.qa.debian.org--archive/dpatch--mainline--2.0--patch-17 dpatch@packages.qa.debian.org--archive/dpatch--mainline--2.0--patch-18 dpatch@packages.qa.debian.org--archive/dpatch--mainline--2.0--patch-19 dpatch@packages.qa.debian.org--archive/dpatch--mainline--2.0--patch-20 dpatch@packages.qa.debian.org--archive/dpatch--mainline--2.0--patch-21 dpatch@packages.qa.debian.org--archive/dpatch--mainline--2.0--patch-22 dpatch@packages.qa.debian.org--archive/dpatch--mainline--2.0--patch-23 dpatch@packages.qa.debian.org--archive/dpatch--mainline--2.0--patch-24 dpatch@packages.qa.debian.org--archive/dpatch--mainline--2.0--patch-25 dpatch@packages.qa.debian.org--archive/dpatch--mainline--2.0--patch-26 dpatch@packages.qa.debian.org--archive/dpatch--mainline--2.0--patch-27 dpatch@packages.qa.debian.org--archive/dpatch--mainline--2.0--patch-28 dpatch@packages.qa.debian.org--archive/dpatch--mainline--2.0--patch-29 dpatch@packages.qa.debian.org--archive/dpatch--mainline--2.0--patch-30 dpatch@packages.qa.debian.org--archive/dpatch--mainline--2.0--patch-31 dpatch@packages.qa.debian.org--archive/dpatch--mainline--2.0--patch-32 dpatch@packages.qa.debian.org--archive/dpatch--mainline--2.0--patch-33 dpatch@packages.qa.debian.org--archive/dpatch--mainline--2.0--patch-34 dpatch@packages.qa.debian.org--archive/dpatch--mainline--2.0--patch-35 dpatch@packages.qa.debian.org--archive/dpatch--mainline--2.0--patch-36 dpatch@packages.qa.debian.org--archive/dpatch--mainline--2.0--patch-37 dpatch@packages.qa.debian.org--archive/dpatch--mainline--2.0--patch-38 dpatch@packages.qa.debian.org--archive/dpatch--mainline--2.0--patch-39 dpatch@packages.qa.debian.org--archive/dpatch--mainline--2.0--patch-40 dpatch@packages.qa.debian.org--archive/dpatch--mainline--2.0--patch-41 dpatch@packages.qa.debian.org--archive/dpatch--mainline--2.0--patch-42 dpatch@packages.qa.debian.org--archive/dpatch--mainline--2.0--patch-43 dpatch@packages.qa.debian.org--archive/dpatch--mainline--2.0--patch-44 dpatch@packages.qa.debian.org--archive/dpatch--mainline--2.0--patch-45 dpatch@packages.qa.debian.org--archive/dpatch--mainline--2.0--patch-46 dpatch@packages.qa.debian.org--archive/dpatch--mainline--2.0--patch-47 dpatch@packages.qa.debian.org--archive/dpatch--refactor--0--base-0 dpatch@packages.qa.debian.org--archive/dpatch--refactor--0--patch-1 dpatch@packages.qa.debian.org--archive/dpatch--refactor--0--patch-2 dpatch@packages.qa.debian.org--archive/dpatch--refactor--0--patch-3 dpatch@packages.qa.debian.org--archive/dpatch--refactor--0--patch-4 dpatch@packages.qa.debian.org--archive/dpatch--refactor--0--patch-5 dpatch@packages.qa.debian.org--archive/dpatch--refactor--0--patch-6 dpatch@packages.qa.debian.org--archive/dpatch--refactor--0--patch-7 dpatch@packages.qa.debian.org--archive/dpatch--refactor--0--patch-8 dpatch@packages.qa.debian.org--archive/dpatch--refactor--0--patch-9 dpatch@packages.qa.debian.org--archive/dpatch--refactor--0--patch-10 dpatch/history/dbharris/ChangeLog.dpep-port--2.00000644000000000000000000000023211621425704016542 0ustar # do not edit -- automatically generated by arch changelog # arch-tag: automatic-ChangeLog--dbharris@eelf.ddts.net--2004-debian/dpatch--dpep-port--2.0 # dpatch/history/dpatch/0000755000000000000000000000000011621425704012155 5ustar dpatch/history/dpatch/ChangeLog.refactor--00000644000000000000000000005627211621425704015761 0ustar # do not edit -- automatically generated by arch changelog # arch-tag: automatic-ChangeLog--dpatch@packages.qa.debian.org--archive/dpatch--refactor--0 # 2003-11-14 11:15:41 GMT Gergely Nagy patch-10 Summary: Merge with Algernon Revision: dpatch--refactor--0--patch-10 Patches applied: * algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-111 Workdir support modified a bit * algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-110 TODO update * algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-109 When running with --with-cpp, define DEB_BUILD_ARCH too * algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-108 Documented the dpatch.make variables * algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-107 Implemented --stampdir * algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-106 Use ${DEB_SOURCE_PACKAGE} in dpatch.make, if available * algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-105 Check for cpp before using it * algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-104 TODO * algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-103 Standardised error messages * algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-102 Bail out early in dpatch-convert-diffgz if filterdiff is not found * algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-101 Documented --strict and --force * algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-100 Implemented --force * algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-99 Implemented --strict * algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-98 Fixed `dpatch call' example * algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-97 dpatch.make(7) * algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-96 dpatch.1 fixes * algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-95 Made `all' .PHONY * algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-94 Heavy manual page updates * algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-93 Minor man page formatting changes * algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-92 ChangeLog-foo * algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-91 Better version number detection * algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-90 debian/ update * algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-89 make tla-release * algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-88 star-merge with the master repository new files: TODO compat/dpatch.make.7 history/dpatch/.arch-ids/=id modified files: ChangeLog Makefile compat/Makefile compat/dpatch.make config.mk debian/NEWS debian/changelog debian/control debian/rules dpatch/Makefile dpatch/dpatch.1 dpatch/dpatch.shpp dpatch/dpatch_args.shpp dpatch/dpatch_help.shpp dpatch/dpatch_lowlevel.shpp dpatch/dpatch_patchset.shpp dpatch/dpatch_template.shpp history/algernon/ChangeLog.refactor--0 scripts/dpatch-convert-diffgz renamed files: ChangeLog ==> history/dpatch/ChangeLog.refactor--0 new directories: history/dpatch history/dpatch/.arch-ids new patches: algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-88 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-89 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-90 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-91 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-92 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-93 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-94 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-95 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-96 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-97 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-98 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-99 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-100 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-101 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-102 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-103 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-104 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-105 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-106 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-107 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-108 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-109 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-110 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-111 2003-10-19 18:56:36 GMT Gergely Nagy patch-9 Summary: star-merged with algernon Revision: dpatch--refactor--0--patch-9 Patches applied: * algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-87 Document patch-template in dpatch help * algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-86 Whitespace cleanup * algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-85 patch-template syntax change * algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-84 Compress manual pages in the .deb * algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-83 Install dpatch.1 * algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-82 A manual page * algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-81 Minor help message fixes * algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-80 dpatch status -q should exit 11 when the patch is already applied * algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-79 Implement dpatch version --help & friends * algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-78 Fixed patch-template argument handling * algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-77 Fixed dpatch patch-template --help * algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-76 Fold patch description * algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-75 Fix $@ passing * algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-74 Fixed dpatch status-all * algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-73 Fix dpatch deapply-{until,all} * algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-72 More detailed help messages * algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-71 Documented dpatch help * algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-70 Documented dpatch status new files: dpatch/dpatch.1 modified files: ChangeLog debian/rules dpatch/Makefile dpatch/dpatch.shpp dpatch/dpatch_args.shpp dpatch/dpatch_help.shpp dpatch/dpatch_lowlevel.shpp dpatch/dpatch_patchset.shpp dpatch/dpatch_template.shpp history/algernon/ChangeLog.refactor--0 new patches: algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-70 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-71 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-72 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-73 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-74 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-75 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-76 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-77 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-78 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-79 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-80 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-81 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-82 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-83 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-84 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-85 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-86 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-87 2003-10-17 17:38:35 GMT Gergely Nagy patch-8 Summary: Star-merge with algernon@bonehunter.rulez.org--tla/dpatch--refactor--0 Revision: dpatch--refactor--0--patch-8 Patches applied: * algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-69 Include more changelogs in the debian package * algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-68 ChangeLog re-added * algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-67 Star-merge with dpatch@packages.qa.debian.org--archive/dpatch--refactor--0 * algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-66 ChangeLog moving foo * algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-65 Add full arch revision to dpatch version * algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-64 ChangeLog g algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-63 Implemented dpatch license * algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-62 dpatch.shpp comment updates * algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-61 Implemented dpatch status * algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-60 Output formatting fixes * algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-59 Document --workdir * algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-58 Implemented --workdir * algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-57 Made dpatch help --help work, for consistency's sake * algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-56 Help gives a warning upon dpatch help somerandomstuff * algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-55 Implemented dpatch help help * algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-54 Added help text for dpatch patch-template * algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-53 Documented aliases new files: ChangeLog history/.arch-ids/=id history/algernon/.arch-ids/=id history/algernon/ChangeLog.mainline--1 history/algernon/ChangeLog.refactor--0 modified files: debian/rules dpatch/Makefile dpatch/dpatch.shpp dpatch/dpatch_help.shpp dpatch/dpatch_lowlevel.shpp new directories: history history/.arch-ids history/algernon history/algernon/.arch-ids new patches: algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-53 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-54 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-55 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-56 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-57 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-58 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-59 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-60 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-61 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-62 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-63 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-64 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-65 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-66 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-67 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-68 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-69 2003-10-12 17:22:05 GMT Gergely Nagy patch-7 Summary: Star-merge with algernon@bonehunter.rulez.org--tla/dpatch--refactor--0 Revision: dpatch--refactor--0--patch-7 Patches applied: * algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-40 samples/ * algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-41 debian/rules update * algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-42 debian/changelog-foo * algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-43 Fixed unsupported global option error * algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-44 Made dpatch --help work * algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-45 Made dpatch --version work too * algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-46 dpatch help support * algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-47 Print a friendly error message when the patch does not exist * algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-48 help message updates * algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-49 Added command mapping to dpatch_help_do * algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-50 dpatch_command_map * algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-51 Fixed dpatch help * algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-52 Fixed dpatch help patch-template new files: samples/.arch-ids/=id samples/Makefile modified files: Makefile config.mk debian/changelog debian/rules dpatch/dpatch.shpp dpatch/dpatch_help.shpp dpatch/dpatch_lowlevel.shpp dpatch/dpatch_patchset.shpp renamed files: .arch-ids/sample.00template.id ==> samples/.arch-ids/sample.00template.id .arch-ids/sample.rules.id ==> samples/.arch-ids/sample.rules.id .arch-ids/sample.rules2.id ==> samples/.arch-ids/sample.rules2.id sample.00template ==> samples/sample.00template sample.rules ==> samples/sample.rules sample.rules2 ==> samples/sample.rules2 new directories: samples samples/.arch-ids new patches: algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-40 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-41 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-42 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-43 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-44 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-45 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-46 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-47 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-48 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-49 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-50 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-51 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-52 2003-10-03 22:17:52 GMT Gergely Nagy patch-6 Summary: Improved build system and debianisation (merge) Revision: dpatch--refactor--0--patch-6 Patches applied: * algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-36 Improved build system * algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-37 *Sigh* add some tags... * algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-38 Build system fixes * algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-39 debian/rules update new files: compat/Makefile config.mk scripts/Makefile modified files: Makefile debian/rules dpatch/Makefile new patches: algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-36 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-37 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-38 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-39 2003-10-03 21:48:14 GMT Gergely Nagy patch-5 Summary: Merged in --with-cpp support Revision: dpatch--refactor--0--patch-5 Patches applied: * algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-35 dpatch --with-cpp modified files: dpatch/dpatch.shpp dpatch/dpatch_help.shpp dpatch/dpatch_patchset.shpp new patches: algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-35 2003-10-03 21:43:53 GMT David B Harris patch-4 Summary: Test commit, removing whitespace added previously Revision: dpatch--refactor--0--patch-4 modified files: sample.00template 2003-10-03 21:41:48 GMT David B Harris patch-3 Summary: Remove test directory Revision: dpatch--refactor--0--patch-3 removed files: test/.arch-ids/=id removed directories: test test/.arch-ids 2003-10-03 21:39:42 GMT David B Harris patch-2 Summary: Test commit, creating a new directory Revision: dpatch--refactor--0--patch-2 new files: test/.arch-ids/=id new directories: test test/.arch-ids 2003-10-03 21:38:36 GMT David B Harris patch-1 Summary: test Revision: dpatch--refactor--0--patch-1 modified files: sample.00template 2003-10-03 19:09:21 GMT Gergely Nagy base-0 Summary: tag of algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-34 Revision: dpatch--refactor--0--base-0 (automatically generated log message) new patches: algernon@bonehunter.rulez.org--tla/dpatch--mainline--1--base-0 algernon@bonehunter.rulez.org--tla/dpatch--mainline--1--patch-1 algernon@bonehunter.rulez.org--tla/dpatch--mainline--1--patch-2 algernon@bonehunter.rulez.org--tla/dpatch--mainline--1--patch-3 algernon@bonehunter.rulez.org--tla/dpatch--mainline--1--patch-4 algernon@bonehunter.rulez.org--tla/dpatch--mainline--1--patch-5 algernon@bonehunter.rulez.org--tla/dpatch--mainline--1--patch-6 algernon@bonehunter.rulez.org--tla/dpatch--mainline--1--patch-7 algernon@bonehunter.rulez.org--tla/dpatch--mainline--1--patch-8 algernon@bonehunter.rulez.org--tla/dpatch--mainline--1--patch-9 algernon@bonehunter.rulez.org--tla/dpatch--mainline--1--patch-10 algernon@bonehunter.rulez.org--tla/dpatch--mainline--1--patch-11 algernon@bonehunter.rulez.org--tla/dpatch--mainline--1--patch-12 algernon@bonehunter.rulez.org--tla/dpatch--mainline--1--patch-13 algernon@bonehunter.rulez.org--tla/dpatch--mainline--1--patch-14 algernon@bonehunter.rulez.org--tla/dpatch--mainline--1--patch-15 algernon@bonehunter.rulez.org--tla/dpatch--mainline--1--patch-16 algernon@bonehunter.rulez.org--tla/dpatch--mainline--1--patch-17 algernon@bonehunter.rulez.org--tla/dpatch--mainline--1--patch-18 algernon@bonehunter.rulez.org--tla/dpatch--mainline--1--patch-19 algernon@bonehunter.rulez.org--tla/dpatch--mainline--1--patch-20 algernon@bonehunter.rulez.org--tla/dpatch--mainline--1--patch-21 algernon@bonehunter.rulez.org--tla/dpatch--mainline--1--patch-22 algernon@bonehunter.rulez.org--tla/dpatch--mainline--1--patch-23 algernon@bonehunter.rulez.org--tla/dpatch--mainline--1--patch-24 algernon@bonehunter.rulez.org--tla/dpatch--mainline--1--patch-25 algernon@bonehunter.rulez.org--tla/dpatch--mainline--1--patch-26 algernon@bonehunter.rulez.org--tla/dpatch--mainline--1--patch-27 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--base-0 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-1 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-2 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-3 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-4 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-5 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-6 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-7 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-8 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-9 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-10 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-11 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-12 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-13 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-14 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-15 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-16 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-17 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-18 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-19 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-20 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-21 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-22 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-23 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-24 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-25 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-26 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-27 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-28 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-29 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-30 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-31 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-32 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-33 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-34 david@eelf.ddts.net--debian/dpatch--eelf--0--base-0 david@eelf.ddts.net--debian/dpatch--eelf--0--patch-1 dpatch/history/dpatch/ChangeLog.mainline--2.00000644000000000000000000030200111621425704016070 0ustar # do not edit -- automatically generated by arch changelog # arch-tag: automatic-ChangeLog--dpatch@packages.qa.debian.org--archive/dpatch--mainline--2.0 # 2006-11-15 12:32:02 GMT Junichi Uekawa patch-159 Summary: 2.0.21 Revision: dpatch--mainline--2.0--patch-159 2.0.21 modified files: debian/changelog history/dpatch/ChangeLog.mainline--2.0 2006-11-15 12:23:35 GMT Junichi Uekawa patch-158 Summary: Revision: dpatch--mainline--2.0--patch-158 Keywords: 398495: fix 711 permission after dpatch-edit-patch modified files: debian/changelog dpep/dpatch-edit-patch history/dpatch/ChangeLog.mainline--2.0 2006-11-14 21:53:22 GMT Junichi Uekawa patch-157 Summary: 398452: fix broken example in manpage Revision: dpatch--mainline--2.0--patch-157 398452: fix broken example in manpage modified files: debian/changelog dpatch/dpatch.1 history/dpatch/ChangeLog.mainline--2.0 samples/rules/rules.new.dh tests/log/02_create_patch.sh.log tests/log/03_edit_patch.sh.log tests/log/04_add_new_patch.sh.log tests/log/05_edit_with_patched.sh.log tests/log/06_dpatch_edit_patch_description.sh.log tests/log/07_dpatch_edit_patch_description_preserve.sh.log tests/log/14_dpatch_edit_patch_without_DPATCH.sh.log 2006-06-02 14:20:29 GMT Junichi Uekawa patch-156 Summary: release 2.0.20 Revision: dpatch--mainline--2.0--patch-156 release 2.0.20 modified files: debian/changelog history/dpatch/ChangeLog.mainline--2.0 2006-06-02 14:15:59 GMT Junichi Uekawa patch-155 Summary: touch patch-stamp in example debian/rules Revision: dpatch--mainline--2.0--patch-155 touch patch-stamp in example debian/rules modified files: debian/changelog history/dpatch/ChangeLog.mainline--2.0 samples/rules/rules.new.dh tests/log/02_create_patch.sh.log tests/log/03_edit_patch.sh.log tests/log/04_add_new_patch.sh.log tests/log/05_edit_with_patched.sh.log tests/log/06_dpatch_edit_patch_description.sh.log tests/log/07_dpatch_edit_patch_description_preserve.sh.log tests/log/14_dpatch_edit_patch_without_DPATCH.sh.log 2006-06-02 14:10:40 GMT Junichi Uekawa patch-154 Summary: add epoch support Revision: dpatch--mainline--2.0--patch-154 add epoch support modified files: debian/changelog dpep/dpatch-edit-patch history/dpatch/ChangeLog.mainline--2.0 scripts/dpatch-get-origtargz tests/log/02_create_patch.sh.log tests/log/14_dpatch_edit_patch_without_DPATCH.sh.log 2006-03-25 05:48:38 GMT Junichi Uekawa patch-153 Summary: update and re-run testsuite to release Revision: dpatch--mainline--2.0--patch-153 update and re-run testsuite to release modified files: debian/changelog history/dpatch/ChangeLog.mainline--2.0 tests/log/02_create_patch.sh.log tests/log/14_dpatch_edit_patch_without_DPATCH.sh.log 2006-03-21 22:45:51 GMT Junichi Uekawa patch-152 Summary: update SEE ALSO to include all commands in this package in manpage Revision: dpatch--mainline--2.0--patch-152 update SEE ALSO to include all commands in this package in manpage modified files: compat/dpatch.make.7 debian/changelog dpatch/dpatch.1 dpatch/dpatch.7 dpep/dpatch-edit-patch.1 history/dpatch/ChangeLog.mainline--2.0 scripts/dpatch-convert-diffgz.1 scripts/dpatch-get-origtargz.1 scripts/dpatch-list-patch.1 2006-03-21 22:18:17 GMT Junichi Uekawa patch-151 Summary: fix spelling mistake Revision: dpatch--mainline--2.0--patch-151 fix spelling mistake modified files: debian/changelog dpatch/dpatch.1 history/dpatch/ChangeLog.mainline--2.0 2006-02-11 14:34:24 GMT Junichi Uekawa patch-150 Summary: release 2.0.18 Revision: dpatch--mainline--2.0--patch-150 release 2.0.18 modified files: debian/changelog history/dpatch/ChangeLog.mainline--2.0 tests/log/02_create_patch.sh.log tests/log/14_dpatch_edit_patch_without_DPATCH.sh.log 2006-02-11 14:26:09 GMT Junichi Uekawa patch-149 Summary: fix obvious typo, list-up-tp -> list-up-to Revision: dpatch--mainline--2.0--patch-149 fix obvious typo, list-up-tp -> list-up-to modified files: debian/changelog dpatch/dpatch_lowlevel.shpp history/dpatch/ChangeLog.mainline--2.0 2006-02-11 14:22:17 GMT Junichi Uekawa patch-148 Summary: fix obvious typo, list-up-tp -> list-up-to Revision: dpatch--mainline--2.0--patch-148 fix obvious typo, list-up-tp -> list-up-to modified files: debian/changelog history/dpatch/ChangeLog.mainline--2.0 2006-02-11 14:18:15 GMT Junichi Uekawa patch-147 Summary: 341103: locale dependent diff output is fixed, diff is now called with LC_ALL=C Revision: dpatch--mainline--2.0--patch-147 341103: locale dependent diff output is fixed, diff is now called with LC_ALL=C modified files: debian/changelog dpep/dpatch-edit-patch history/dpatch/ChangeLog.mainline--2.0 tests/log/02_create_patch.sh.log tests/log/14_dpatch_edit_patch_without_DPATCH.sh.log 2006-02-11 14:12:36 GMT Junichi Uekawa patch-146 Summary: 328400: make documentation consistent about what patch names are Revision: dpatch--mainline--2.0--patch-146 328400: make documentation consistent about what patch names are modified files: debian/changelog dpatch/dpatch.1 history/dpatch/ChangeLog.mainline--2.0 tests/log/02_create_patch.sh.log tests/log/14_dpatch_edit_patch_without_DPATCH.sh.log 2006-01-27 23:21:48 GMT Junichi Uekawa patch-145 Summary: set distribution to unstable Revision: dpatch--mainline--2.0--patch-145 set distribution to unstable modified files: debian/changelog history/dpatch/ChangeLog.mainline--2.0 2006-01-27 23:18:30 GMT Junichi Uekawa patch-144 Summary: get-origtargz fix for symlink case Revision: dpatch--mainline--2.0--patch-144 get-origtargz fix for symlink case modified files: debian/changelog history/dpatch/ChangeLog.mainline--2.0 scripts/dpatch-get-origtargz tests/log/02_create_patch.sh.log tests/log/14_dpatch_edit_patch_without_DPATCH.sh.log 2006-01-27 22:50:19 GMT Junichi Uekawa patch-143 Summary: dpatch-edit-patch will modify the template and insert filename when @DPATCH@ does not exist, but it included a bogus filename; fix Revision: dpatch--mainline--2.0--patch-143 dpatch-edit-patch will modify the template and insert filename when @DPATCH@ does not exist, but it included a bogus filename; fix new files: tests/.arch-ids/14_dpatch_edit_patch_without_DPATCH.sh.id tests/14_dpatch_edit_patch_without_DPATCH.sh tests/log/.arch-ids/14_dpatch_edit_patch_without_DPATCH.sh.log.id tests/log/14_dpatch_edit_patch_without_DPATCH.sh.log modified files: debian/changelog dpep/dpatch-edit-patch dpep/dpatch-edit-patch.functions history/dpatch/ChangeLog.mainline--2.0 tests/06_dpatch_edit_patch_description.sh tests/log/02_create_patch.sh.log tests/log/06_dpatch_edit_patch_description.sh.log tests/test.log.summary 2005-12-15 23:19:05 GMT Junichi Uekawa patch-142 Summary: 2.0.16 Revision: dpatch--mainline--2.0--patch-142 2.0.16 modified files: debian/changelog history/dpatch/ChangeLog.mainline--2.0 tests/log/02_create_patch.sh.log 2005-12-15 23:09:38 GMT Junichi Uekawa patch-141 Summary: check for blank dpatch name in dpatch-edit-patch Revision: dpatch--mainline--2.0--patch-141 check for blank dpatch name in dpatch-edit-patch new files: tests/.arch-ids/13_dpatch-edit-patch-null.sh.id tests/13_dpatch-edit-patch-null.sh tests/log/.arch-ids/13_dpatch-edit-patch-null.sh.log.id tests/log/13_dpatch-edit-patch-null.sh.log modified files: debian/changelog dpep/dpatch-edit-patch history/dpatch/ChangeLog.mainline--2.0 tests/12_dpatch_with-cpp.sh tests/log/02_create_patch.sh.log tests/log/12_dpatch_with-cpp.sh.log tests/test.log.summary 2005-12-15 22:56:14 GMT Junichi Uekawa patch-140 Summary: document --with-cpp option, DEB_BUILD_ARCH define, DEB_BUILD_ARCH_architecture define, and add a testsuite for --with-cpp Revision: dpatch--mainline--2.0--patch-140 document --with-cpp option, DEB_BUILD_ARCH define, DEB_BUILD_ARCH_architecture define, and add a testsuite for --with-cpp new files: tests/.arch-ids/12_dpatch_with-cpp.sh.id tests/12_dpatch_with-cpp.sh tests/log/.arch-ids/12_dpatch_with-cpp.sh.log.id tests/log/12_dpatch_with-cpp.sh.log modified files: debian/changelog dpatch/dpatch.1 dpatch/dpatch.shpp history/dpatch/ChangeLog.mainline--2.0 tests/01_create_env.sh tests/log/01_create_env.sh.log tests/log/02_create_patch.sh.log tests/run-test.sh tests/test.log.summary renamed files: tests/log/.arch-ids/01_create_env.sh.id ==> tests/log/.arch-ids/01_create_env.sh.log.id tests/log/.arch-ids/02_create_patch.sh.id ==> tests/log/.arch-ids/02_create_patch.sh.log.id tests/log/.arch-ids/03_edit_patch.sh.id ==> tests/log/.arch-ids/03_edit_patch.sh.log.id tests/log/.arch-ids/04_add_new_patch.sh.id ==> tests/log/.arch-ids/04_add_new_patch.sh.log.id tests/log/.arch-ids/05_edit_with_patched.sh.id ==> tests/log/.arch-ids/05_edit_with_patched.sh.log.id tests/log/.arch-ids/06_dpatch_edit_patch_description.sh.id ==> tests/log/.arch-ids/06_dpatch_edit_patch_description.sh.log.id tests/log/.arch-ids/07_dpatch_edit_patch_description_preserve.sh.id ==> tests/log/.arch-ids/07_dpatch_edit_patch_description_preserve.sh.log.id tests/log/.arch-ids/08_dpatch_list_patch.sh.id ==> tests/log/.arch-ids/08_dpatch_list_patch.sh.log.id tests/log/.arch-ids/10_dpep_debianonly.sh.id ==> tests/log/.arch-ids/10_dpep_debianonly.sh.log.id tests/log/.arch-ids/11_dpep_debianonly_origtargz_in_upstream.sh.id ==> tests/log/.arch-ids/11_dpep_debianonly_origtargz_in_upstream.sh.log.id tests/log/01_create_env.sh ==> tests/log/01_create_env.sh.log tests/log/02_create_patch.sh ==> tests/log/02_create_patch.sh.log tests/log/03_edit_patch.sh ==> tests/log/03_edit_patch.sh.log tests/log/04_add_new_patch.sh ==> tests/log/04_add_new_patch.sh.log tests/log/05_edit_with_patched.sh ==> tests/log/05_edit_with_patched.sh.log tests/log/06_dpatch_edit_patch_description.sh ==> tests/log/06_dpatch_edit_patch_description.sh.log tests/log/07_dpatch_edit_patch_description_preserve.sh ==> tests/log/07_dpatch_edit_patch_description_preserve.sh.log tests/log/08_dpatch_list_patch.sh ==> tests/log/08_dpatch_list_patch.sh.log tests/log/10_dpep_debianonly.sh ==> tests/log/10_dpep_debianonly.sh.log tests/log/11_dpep_debianonly_origtargz_in_upstream.sh ==> tests/log/11_dpep_debianonly_origtargz_in_upstream.sh.log 2005-12-15 22:30:31 GMT Junichi Uekawa patch-139 Summary: remove bogus requirement to add cpp to build-depends Revision: dpatch--mainline--2.0--patch-139 remove bogus requirement to add cpp to build-depends modified files: debian/changelog dpatch/dpatch.1 history/dpatch/ChangeLog.mainline--2.0 tests/log/02_create_patch.sh 2005-11-03 04:50:18 GMT Junichi Uekawa patch-138 Summary: fix typo for 337160 Revision: dpatch--mainline--2.0--patch-138 fix typo for 337160 modified files: debian/changelog dpatch/dpatch.7 history/dpatch/ChangeLog.mainline--2.0 2005-10-10 05:24:51 GMT Junichi Uekawa patch-137 Summary: open up a new development Revision: dpatch--mainline--2.0--patch-137 open up a new development modified files: debian/changelog history/dpatch/ChangeLog.mainline--2.0 tests/log/02_create_patch.sh 2005-09-17 22:30:30 GMT Junichi Uekawa patch-136 Summary: update debian/changelog for 2.0.15 release Revision: dpatch--mainline--2.0--patch-136 update debian/changelog for 2.0.15 release modified files: debian/changelog history/dpatch/ChangeLog.mainline--2.0 2005-09-17 01:53:26 GMT Junichi Uekawa patch-135 Summary: remove reference to README file from manpages Revision: dpatch--mainline--2.0--patch-135 remove reference to README file from manpages modified files: debian/changelog history/dpatch/ChangeLog.mainline--2.0 scripts/dpatch-convert-diffgz.1 scripts/dpatch-list-patch.1 2005-08-06 06:54:41 GMT Junichi Uekawa patch-134 Summary: update SEE ALSO section of manpages Revision: dpatch--mainline--2.0--patch-134 * dpep/dpatch-edit-patch.1, scripts/dpatch-list-patch.1, scripts/dpatch-get-origtargz.1, scripts/dpatch-convert-diffgz.1: update SEE ALSO. * debian/changelog: close bug 320664 --This line, and those below, will be ignored-- Files to commit: This list might be incomplete or outdated if editing the log message was not invoked from an up-to-date changes buffer! modified files: debian/changelog dpep/dpatch-edit-patch.1 history/dpatch/ChangeLog.mainline--2.0 scripts/dpatch-convert-diffgz.1 scripts/dpatch-get-origtargz.1 scripts/dpatch-list-patch.1 2005-08-06 06:42:33 GMT Junichi Uekawa patch-133 Summary: apply 321320 for prettier .dpatch file diff output and update testsuite to check for output. Revision: dpatch--mainline--2.0--patch-133 * dpep/dpatch-edit-patch: apply 321320 patch; for prettier diff -u output * tests/02_create_patch.sh: changed to test the difference after dpatch-edit-patch. Prettier diffs do have diffs, since patch command will change the timestamp. * debian/changelog: open up new development. modified files: debian/changelog dpep/dpatch-edit-patch history/dpatch/ChangeLog.mainline--2.0 tests/02_create_patch.sh tests/log/02_create_patch.sh tests/log/08_dpatch_list_patch.sh tests/log/10_dpep_debianonly.sh tests/log/11_dpep_debianonly_origtargz_in_upstream.sh tests/run-test.sh 2005-07-19 15:45:32 GMT Marc Haber patch-132 Summary: prepare release Revision: dpatch--mainline--2.0--patch-132 modified files: debian/changelog history/dpatch/ChangeLog.mainline--2.0 2005-07-19 15:44:40 GMT Marc Haber patch-131 Summary: Standards-Version 3.6.2 Revision: dpatch--mainline--2.0--patch-131 modified files: debian/changelog debian/control history/dpatch/ChangeLog.mainline--2.0 2005-07-19 15:40:38 GMT Marc Haber patch-130 Summary: * Fix curl detection. (mh) (Closes: #317757) Revision: dpatch--mainline--2.0--patch-130 modified files: debian/changelog history/dpatch/ChangeLog.mainline--2.0 scripts/dpatch-get-origtargz tests/log/08_dpatch_list_patch.sh tests/log/10_dpep_debianonly.sh tests/log/11_dpep_debianonly_origtargz_in_upstream.sh 2005-07-17 19:28:39 GMT Junichi Uekawa (dancer on ibook) patch-129 Summary: add a note on requirements of the testsuite Revision: dpatch--mainline--2.0--patch-129 add a note on requirements of the testsuite modified files: history/dpatch/ChangeLog.mainline--2.0 tests/README 2005-07-16 16:33:21 GMT Junichi Uekawa (dancer on ibook) patch-128 Summary: apply changes for 315719 for --origtargzpath option, testsuite updated. Revision: dpatch--mainline--2.0--patch-128 apply changes for 315719 for --origtargzpath option, testsuite updated. modified files: debian/changelog dpep/dpatch-edit-patch dpep/dpatch-edit-patch.1 dpep/dpatch-edit-patch.functions history/dpatch/ChangeLog.mainline--2.0 scripts/dpatch-get-origtargz scripts/dpatch-get-origtargz.1 tests/08_dpatch_list_patch.sh tests/10_dpep_debianonly.sh tests/11_dpep_debianonly_origtargz_in_upstream.sh tests/log/02_create_patch.sh tests/log/03_edit_patch.sh tests/log/04_add_new_patch.sh tests/log/05_edit_with_patched.sh tests/log/06_dpatch_edit_patch_description.sh tests/log/07_dpatch_edit_patch_description_preserve.sh tests/log/08_dpatch_list_patch.sh tests/log/10_dpep_debianonly.sh tests/log/11_dpep_debianonly_origtargz_in_upstream.sh tests/run-test.sh tests/test.log.summary 2005-07-16 08:18:52 GMT Junichi Uekawa (dancer on ibook) patch-127 Summary: changes from mh on dpatch-edit-patch error handling when orig.tar.gz specified does not exist on --debianonly. Update testsuite. Update curl handling in getorigtargz from mh. Revision: dpatch--mainline--2.0--patch-127 changes from mh on dpatch-edit-patch error handling when orig.tar.gz specified does not exist on --debianonly. Update testsuite. Update curl handling in getorigtargz from mh. modified files: debian/changelog dpep/dpatch-edit-patch history/dpatch/ChangeLog.mainline--2.0 scripts/dpatch-get-origtargz tests/10_dpep_debianonly.sh tests/11_dpep_debianonly_origtargz_in_upstream.sh tests/log/02_create_patch.sh tests/log/03_edit_patch.sh tests/log/04_add_new_patch.sh tests/log/05_edit_with_patched.sh tests/log/06_dpatch_edit_patch_description.sh tests/log/07_dpatch_edit_patch_description_preserve.sh tests/log/08_dpatch_list_patch.sh tests/log/10_dpep_debianonly.sh tests/log/11_dpep_debianonly_origtargz_in_upstream.sh 2005-07-13 19:20:04 GMT Junichi Uekawa (dancer on ibook) patch-126 Summary: add another bug to close Revision: dpatch--mainline--2.0--patch-126 add another bug to close modified files: debian/changelog history/dpatch/ChangeLog.mainline--2.0 2005-07-12 10:16:01 GMT Junichi Uekawa (dancer on ibook) patch-125 Summary: update README on testsuite Revision: dpatch--mainline--2.0--patch-125 update README on testsuite modified files: history/dpatch/ChangeLog.mainline--2.0 tests/README 2005-07-11 11:43:15 GMT Junichi Uekawa (dancer on ibook) patch-124 Summary: testsuite improvement, and added tests for getorigtargz Revision: dpatch--mainline--2.0--patch-124 testsuite improvement, and added tests for getorigtargz new files: tests/.arch-ids/08_dpatch_list_patch.sh.id tests/.arch-ids/10_dpep_debianonly.sh.id tests/.arch-ids/11_dpep_debianonly_origtargz_in_upstream.sh.id tests/08_dpatch_list_patch.sh tests/10_dpep_debianonly.sh tests/11_dpep_debianonly_origtargz_in_upstream.sh tests/log/.arch-ids/01_create_env.sh.id tests/log/.arch-ids/02_create_patch.sh.id tests/log/.arch-ids/03_edit_patch.sh.id tests/log/.arch-ids/04_add_new_patch.sh.id tests/log/.arch-ids/05_edit_with_patched.sh.id tests/log/.arch-ids/06_dpatch_edit_patch_description.sh.id tests/log/.arch-ids/07_dpatch_edit_patch_description_preserve.sh.id tests/log/.arch-ids/08_dpatch_list_patch.sh.id tests/log/.arch-ids/10_dpep_debianonly.sh.id tests/log/.arch-ids/11_dpep_debianonly_origtargz_in_upstream.sh.id tests/log/.arch-ids/=id tests/log/01_create_env.sh tests/log/02_create_patch.sh tests/log/03_edit_patch.sh tests/log/04_add_new_patch.sh tests/log/05_edit_with_patched.sh tests/log/06_dpatch_edit_patch_description.sh tests/log/07_dpatch_edit_patch_description_preserve.sh tests/log/08_dpatch_list_patch.sh tests/log/10_dpep_debianonly.sh tests/log/11_dpep_debianonly_origtargz_in_upstream.sh removed files: tests/.arch-ids/test.log.id tests/test.log modified files: history/dpatch/ChangeLog.mainline--2.0 tests/01_create_env.sh tests/02_create_patch.sh tests/03_edit_patch.sh tests/04_add_new_patch.sh tests/05_edit_with_patched.sh tests/06_dpatch_edit_patch_description.sh tests/07_dpatch_edit_patch_description_preserve.sh tests/README tests/run-test.sh tests/test.log.summary new directories: tests/log tests/log/.arch-ids 2005-07-03 23:38:13 GMT Junichi Uekawa patch-123 Summary: checking before dpep starts off editing patches, to see if dpep will need to clean the working directory. If it finds that it really needs to clean the working directory, it asks the user to run dpep with --clean option. Added --stampdir option for dpep to know that a patch is applied. Revision: dpatch--mainline--2.0--patch-123 checking before dpep starts off editing patches, to see if dpep will need to clean the working directory. If it finds that it really needs to clean the working directory, it asks the user to run dpep with --clean option. Added --stampdir option for dpep to know that a patch is applied. modified files: debian/changelog dpep/dpatch-edit-patch dpep/dpatch-edit-patch.1 dpep/dpatch-edit-patch.functions history/dpatch/ChangeLog.mainline--2.0 tests/05_edit_with_patched.sh tests/run-test.sh tests/test.log tests/test.log.summary 2005-06-27 23:48:46 GMT Junichi Uekawa patch-122 Summary: fix dpatch-edit-patch -d option when 00template does not exist Revision: dpatch--mainline--2.0--patch-122 fix dpatch-edit-patch -d option when 00template does not exist modified files: debian/changelog dpep/dpatch-edit-patch dpep/dpatch-edit-patch.functions history/dpatch/ChangeLog.mainline--2.0 tests/06_dpatch_edit_patch_description.sh tests/test.log tests/test.log.summary 2005-06-20 23:36:20 GMT Junichi Uekawa patch-121 Summary: add testsuite summary file, test.log.summary to see the result easier. Added a testsuite for -d optio Revision: dpatch--mainline--2.0--patch-121 add testsuite summary file, test.log.summary to see the result easier. Added a testsuite for -d optio new files: tests/.arch-ids/06_dpatch_edit_patch_description.sh.id tests/.arch-ids/07_dpatch_edit_patch_description_preserve.sh.id tests/.arch-ids/test.log.summary.id tests/06_dpatch_edit_patch_description.sh tests/07_dpatch_edit_patch_description_preserve.sh tests/test.log.summary modified files: history/dpatch/ChangeLog.mainline--2.0 tests/04_add_new_patch.sh tests/run-test.sh tests/test.log 2005-06-19 01:20:29 GMT Junichi Uekawa patch-120 Summary: initial testsuite for dpatch added, commented out -pkg-info invocation from rules.new.dh which seems to be unimplemented Revision: dpatch--mainline--2.0--patch-120 initial testsuite for dpatch added, commented out -pkg-info invocation from rules.new.dh which seems to be unimplemented new files: tests/.arch-ids/01_create_env.sh.id tests/.arch-ids/02_create_patch.sh.id tests/.arch-ids/03_edit_patch.sh.id tests/.arch-ids/04_add_new_patch.sh.id tests/.arch-ids/05_edit_with_patched.sh.id tests/.arch-ids/=id tests/.arch-ids/README.id tests/.arch-ids/run-test.sh.id tests/.arch-ids/test.log.id tests/01_create_env.sh tests/02_create_patch.sh tests/03_edit_patch.sh tests/04_add_new_patch.sh tests/05_edit_with_patched.sh tests/README tests/run-test.sh tests/test.log modified files: debian/changelog history/dpatch/ChangeLog.mainline--2.0 samples/rules/rules.new.dh new directories: tests tests/.arch-ids 2005-06-18 22:40:41 GMT Marc Haber patch-119 Summary: fix dpatch-get-origtargz, apt-get source return code reversed fix dpep, find option/argument order fix typos Revision: dpatch--mainline--2.0--patch-119 modified files: debian/changelog dpep/dpatch-edit-patch history/dpatch/ChangeLog.mainline--2.0 scripts/dpatch-get-origtargz 2005-06-18 21:57:34 GMT Marc Haber patch-118 Summary: fix typo in dpep manpage Revision: dpatch--mainline--2.0--patch-118 modified files: dpep/dpatch-edit-patch.1 history/dpatch/ChangeLog.mainline--2.0 2005-06-18 10:40:59 GMT Marc Haber patch-117 Summary: fix typo in dpatch.7 manpage Revision: dpatch--mainline--2.0--patch-117 modified files: debian/changelog dpatch/dpatch.7 history/dpatch/ChangeLog.mainline--2.0 2005-06-06 21:34:36 GMT Marc Haber patch-116 Summary: prepare upload for unstable Revision: dpatch--mainline--2.0--patch-116 modified files: debian/changelog history/dpatch/ChangeLog.mainline--2.0 2005-05-17 13:04:36 GMT Marc Haber patch-115 Summary: prepare next version Revision: dpatch--mainline--2.0--patch-115 modified files: debian/changelog history/dpatch/ChangeLog.mainline--2.0 2005-05-17 12:01:50 GMT Marc Haber patch-114 Summary: prepare release Revision: dpatch--mainline--2.0--patch-114 modified files: debian/changelog history/dpatch/ChangeLog.mainline--2.0 2005-05-14 14:03:28 GMT Marc Haber patch-113 Summary: patch to address #209112, and some lintian issues Revision: dpatch--mainline--2.0--patch-113 modified files: debian/changelog debian/control dpep/Makefile dpep/dpatch-edit-patch dpep/dpatch-edit-patch.1 dpep/dpatch-edit-patch.functions history/dpatch/ChangeLog.mainline--2.0 2005-05-13 16:02:48 GMT Marc Haber patch-112 Summary: commit probable fixes for #275700, #306978, #305023 Revision: dpatch--mainline--2.0--patch-112 modified files: compat/dpatch.make debian/changelog dpatch/dpatch_lowlevel.shpp dpep/dpatch-edit-patch dpep/dpatch-edit-patch.1 history/dpatch/ChangeLog.mainline--2.0 2005-03-28 16:29:56 GMT Marc Haber patch-111 Summary: maintainer change, version number change Revision: dpatch--mainline--2.0--patch-111 modified files: debian/changelog debian/control history/dpatch/ChangeLog.mainline--2.0 2005-03-27 22:46:15 GMT Junichi Uekawa patch-110 Summary: Updated manual page dpatch.1 Updated debian/changelog to have target distribution UNRELEASED Revision: dpatch--mainline--2.0--patch-110 Keywords: modified files: debian/changelog history/dpatch/ChangeLog.mainline--2.0 scripts/dpatch-convert-diffgz.1 2005-01-25 10:54:36 GMT Gergely Nagy patch-109 Summary: Applied a big patch from Marc Haber Revision: dpatch--mainline--2.0--patch-109 * Marc Haber: + (dpatch-get-origtargz): New script to find upstream tarball, also available for third parties (for example a svn-buildpackage hook). (Closes: #291666) + (dpatch-edit-patch): Adapt to use external code + (dpatch-edit-patch): Allow replacing of dpatch-get-origtargz by a user-supplied hook script. Discussion of this feature is in BTS #291668. + (dpatch-edit-patch): Add config file debian/patches/00dpatch.conf where selected configuration variables can be set from within the package. (Closes: #291668). + (dpatch-edit-patch): re-work dpep parameter processing to use getopt. (Closes: #291665) Sorry, I don't care enough to document the changes in more detail, so I'm just pasting the debian/changelog entry. new files: scripts/dpatch-get-origtargz scripts/dpatch-get-origtargz.1 modified files: debian/changelog dpep/dpatch-edit-patch dpep/dpatch-edit-patch.1 dpep/dpatch-edit-patch.functions history/dpatch/ChangeLog.mainline--2.0 scripts/Makefile 2005-01-22 16:50:00 GMT Gergely Nagy patch-108 Summary: Reverted patch-107 Revision: dpatch--mainline--2.0--patch-108 patch-107 reverted, it's a VCS-specific hack, which I do not want to see, after all. modified files: dpep/dpatch-edit-patch.functions history/dpatch/ChangeLog.mainline--2.0 2005-01-16 15:27:23 GMT Gergely Nagy patch-107 Summary: Check .svn/deb-layout for orig.tar.gz location too Revision: dpatch--mainline--2.0--patch-107 * dpep/dpatch-edit-patch.functions (dpep_find_origtargz): After checking the .orig.tar.gz in ../, try looking into .svn/deb-layout too. Idea from Eduard Bloch. modified files: dpep/dpatch-edit-patch.functions history/dpatch/ChangeLog.mainline--2.0 2005-01-16 13:45:23 GMT Gergely Nagy patch-106 Summary: NEWS update Revision: dpatch--mainline--2.0--patch-106 * debian/NEWS: Added some words about the new features in 2.0.11. * debian/changelog: Finalised version to 2.0.11. modified files: debian/NEWS debian/changelog history/dpatch/ChangeLog.mainline--2.0 2005-01-16 13:32:52 GMT Gergely Nagy patch-105 Summary: Support --clean and --debianonly for dpep Revision: dpatch--mainline--2.0--patch-105 * dpep/dpatch-edit-patch.functions (dpep_usage): Mention --clean and --debianonly. (dpep_parse_options): Recognise and parse --clean, --debianonly and --help (heh, noone noticed this one was missing all this time? :) (dpep_cleanup): If REFDIR == SOURCEDIR, then don't delete it. (dpep_find_origtargz): New function. * dpep/dpatch-edit-patch: Made the default behaviour a copy-without-clean (but added a --clean option to restore the old mode of operation); added a --debianonly switch, that tries to retrieve the original tarball, and copy debian/ over it. * dpep/dpatch-edit-patch.1: Documented the new switches. * debian/control (Suggests): Added curl. * debian/changelog: Documented these changes. Patch from Marc Haber (with minor modifications). modified files: debian/changelog debian/control dpep/dpatch-edit-patch dpep/dpatch-edit-patch.1 dpep/dpatch-edit-patch.functions history/dpatch/ChangeLog.mainline--2.0 2005-01-14 21:44:23 GMT Gergely Nagy patch-104 Summary: Swap Joerg and myself in debian/control Revision: dpatch--mainline--2.0--patch-104 * debian/control (Maintainer): Removed Joerg, added myself. (Uploaders): Added Joerg, removed myself. * debian/changelog: Document this change, and add a silly joke. Jokes are good, mmmkay? modified files: debian/changelog debian/control history/dpatch/ChangeLog.mainline--2.0 2005-01-07 19:03:50 GMT Gergely Nagy patch-103 Summary: fixed tools/dpatch.hook Revision: dpatch--mainline--2.0--patch-103 * tools/dpatch.hook: In the `import' case, we were testing ${ARCH_CATEGORY} against a hardcoded `dpatch', instead of ${CATEGORY}. Fixed that. modified files: history/dpatch/ChangeLog.mainline--2.0 tools/dpatch.hook 2005-01-07 19:00:05 GMT Gergely Nagy patch-102 Summary: R.I.P README Revision: dpatch--mainline--2.0--patch-102 * README: Removed. Parts of it were updated, others are duplicated on the manual pages, which are kept up to date. * debian/rules {DOCS}: Removed README. * debian/changelog: Document this change. removed files: .arch-ids/README.id README modified files: debian/changelog debian/rules history/dpatch/ChangeLog.mainline--2.0 2005-01-07 18:53:53 GMT Gergely Nagy patch-101 Summary: README.arch update Revision: dpatch--mainline--2.0--patch-101 * README.arch: Alioth CVS is not updated anymore, and the [1] reference was missing, so removed it. modified files: README.arch history/dpatch/ChangeLog.mainline--2.0 2005-01-07 18:38:20 GMT Gergely Nagy patch-100 Summary: Copyright year updates Revision: dpatch--mainline--2.0--patch-100 * dpatch/dpatch.1: Add 2005 to the list of years, and update the date in the header. * dpep/dpatch-edit-patch.1: Update the date in the header. * debian/copyright: Add 2005 to the list of years. modified files: debian/copyright dpatch/dpatch.1 dpep/dpatch-edit-patch.1 history/dpatch/ChangeLog.mainline--2.0 2005-01-07 18:24:21 GMT Gergely Nagy patch-99 Summary: dpatch(1) updates Revision: dpatch--mainline--2.0--patch-99 * dpatch/dpatch.1 (DPATCH IN DEBIAN PACKAGES): Added a note about parallel builds and a workaround, and another about the clean target (it need not be as complicated as originally written). * debian/changelog: Record this change. Patch from Eduard Bloch. Closes Debian bug #271831. modified files: debian/changelog dpatch/dpatch.1 history/dpatch/ChangeLog.mainline--2.0 2005-01-07 17:29:09 GMT Gergely Nagy patch-98 Summary: Fix dpatch-edit-patch(1) Revision: dpatch--mainline--2.0--patch-98 * dpep/dpatch-edit-patch.1: Removed the section about 00template being executable. Patch from Nico Golde. * debian/changelog: Document this change. Closes Debian bug #254689. modified files: debian/changelog dpep/dpatch-edit-patch.1 history/dpatch/ChangeLog.mainline--2.0 2005-01-07 17:21:29 GMT Gergely Nagy patch-97 Summary: Fix 01_config.dpatch Revision: dpatch--mainline--2.0--patch-97 * samples/dpatch/01_config.dpatch: Fix syntax errors. Patch from Peter Eisentraut. * debian/changelog: Document the change. Fixes Debian bug #274533. modified files: debian/changelog history/dpatch/ChangeLog.mainline--2.0 samples/dpatch/01_config.dpatch 2004-10-07 08:07:52 GMT Gergely Nagy patch-96 Summary: Install NEWS.Debian Revision: dpatch--mainline--2.0--patch-96 * debian/rules (binary-dpatch): Install debian/NEWS. * debian/changelog: Updated to reflect the above change. Bug noticed by Peter Eisentraut. modified files: debian/changelog debian/rules history/dpatch/ChangeLog.mainline--2.0 2004-08-17 15:19:13 GMT Gergely Nagy patch-95 Summary: Added the Arch hook I use Revision: dpatch--mainline--2.0--patch-95 * tools/dpatch.hook: New file, that sends out those nice commit mails. new files: tools/dpatch.hook modified files: history/dpatch/ChangeLog.mainline--2.0 2004-08-17 14:56:43 GMT Gergely Nagy patch-94 Summary: Renamed the build-tools directory to tools/ Revision: dpatch--mainline--2.0--patch-94 * build-tools/: Renamed from this... * tools/: ..to this. modified files: dpatch/Makefile history/dpatch/ChangeLog.mainline--2.0 renamed files: build-tools/.arch-ids/=id ==> tools/.arch-ids/=id new directories: tools/.arch-ids removed directories: build-tools/.arch-ids renamed directories: build-tools ==> tools 2004-08-17 14:36:37 GMT Gergely Nagy patch-93 Summary: Made dpatch-edit-patch call dpatch deapply-all when cleaning Revision: dpatch--mainline--2.0--patch-93 * dpep/dpatch-edit-patch: Call dpatch deapply-all after calling debian/rules clean unpatch - this will make sure that all patches are deapplied, even when the deapplying target isn't called `unpatch' and `clean' does not clean up dpatches (which is perfectly legit). * debian/changelog: Updated accordingly. Fixes #260666, reported by Bastian Kleineidam. modified files: debian/changelog dpep/dpatch-edit-patch history/dpatch/ChangeLog.mainline--2.0 2004-08-15 12:14:06 GMT Gergely Nagy patch-92 Summary: Added a short note to the dpatch(1) manpage Revision: dpatch--mainline--2.0--patch-92 * dpatch/dpatch.1 (Creating dpatch scriptlets): Added a short note about dpatch patch-template. modified files: dpatch/dpatch.1 history/dpatch/ChangeLog.mainline--2.0 2004-08-15 12:08:18 GMT Gergely Nagy patch-91 Summary: Fixed dpatch.lib.shpp Revision: dpatch--mainline--2.0--patch-91 * dpatch/dpatch.lib.shpp: Changed the code to work both if called from dpatch-run, and when sourced. (dpatch_lib_patch): Invert the check, as it was intended to be. (dpatch_lib_unpatch): Likewise. modified files: dpatch/dpatch.lib.shpp history/dpatch/ChangeLog.mainline--2.0 2004-08-15 11:38:49 GMT Gergely Nagy patch-90 Summary: Extracted commonly used dpatch code into shell libraries Revision: dpatch--mainline--2.0--patch-90 * dpatch/dpatch.lib.shpp: New file. * dpatch/dpatch-run.shpp: Likewise. * dpatch/Makefile (all): Added dpatch-run and dpatch.lib.sh to the list of prerequisites. (clean): Clean them. (install): Install them. (dpatch-run): New target. (dpatch.lib.sh): Likewise. * dpatch/dpatch_template.shpp (dpatch_patch_template): Modified to use dpatch-run in the default template. * samples/dpatch/01_config.dpatch: Modified to use dpatch.lib.sh. * samples/sample.00template: Modified to use dpatch-run. * debian/NEWS: Added a few notes about this new feature. * debian/changelog: Updated. new files: dpatch/dpatch-run.shpp dpatch/dpatch.lib.shpp modified files: debian/NEWS debian/changelog dpatch/Makefile dpatch/dpatch_template.shpp history/dpatch/ChangeLog.mainline--2.0 samples/dpatch/01_config.dpatch samples/sample.00template 2004-08-14 20:34:20 GMT Gergely Nagy patch-89 Summary: Call patch with -g0 Revision: dpatch--mainline--2.0--patch-89 * dpatch/dpatch_template.shpp (dpatch_patch_template): Added -g0 to patch_opts. * samples/sample.00template: Likewise. * debian/changelog: Updated. Requested by John V. Belmonte. Fixes Debian Bug #259662. modified files: debian/changelog dpatch/dpatch_template.shpp history/dpatch/ChangeLog.mainline--2.0 samples/sample.00template 2004-08-14 20:26:32 GMT Gergely Nagy patch-88 Summary: Fixed dpatch-edit-patch local information leak Revision: dpatch--mainline--2.0--patch-88 * dpep/dpatch-edit-patch: Fixed local information leak. * debian/changelog: Updated to reflect this change. Patch from Darren Salt, fixing Debian Bug#240709. modified files: debian/changelog dpep/dpatch-edit-patch history/dpatch/ChangeLog.mainline--2.0 2004-08-14 20:15:59 GMT Gergely Nagy patch-87 Summary: debian/changelog update Revision: dpatch--mainline--2.0--patch-87 * debian/changelog: Updated for the upcoming 2.0.9 version. modified files: debian/changelog history/dpatch/ChangeLog.mainline--2.0 2004-08-14 20:01:21 GMT Gergely Nagy patch-86 Summary: Fixed dpatch deapply documentation Revision: dpatch--mainline--2.0--patch-86 * dpatch/dpatch.1: Fixed dpatch deapply documentation. By Nico Golde. modified files: dpatch/dpatch.1 history/dpatch/ChangeLog.mainline--2.0 2004-04-19 20:38:49 GMT Gergely Nagy patch-85 Summary: Fixed dpatch-convert-diffgz.1 Revision: dpatch--mainline--2.0--patch-85 * scripts/dpatch-convert-diffgz.1: Fixed formatting, patch from Helge Kreutzmann. * debian/changelog: Updated. Fixes Debian bug#242893. modified files: debian/changelog history/dpatch/ChangeLog.mainline--2.0 scripts/dpatch-convert-diffgz.1 2004-03-17 04:18:27 GMT David B Harris patch-84 Summary: Merge with dbharris@eelf.ddts.net--2004-debian/dpatch--dbharris--2.0 Revision: dpatch--mainline--2.0--patch-84 Patches applied: * dbharris@eelf.ddts.net--2004-debian/dpatch--dbharris--2.0--patch-38 Merge with public alioth repo * dbharris@eelf.ddts.net--2004-debian/dpatch--dbharris--2.0--patch-39 Merge with public alioth repo * dbharris@eelf.ddts.net--2004-debian/dpatch--dbharris--2.0--patch-40 Crap, fix typo * dbharris@eelf.ddts.net--2004-debian/dpatch--dbharris--2.0--patch-41 And add changelog for previous commit modified files: debian/changelog dpep/dpatch-edit-patch history/dbharris/ChangeLog.dbharris--2.0 history/dpatch/ChangeLog.mainline--2.0 new patches: dbharris@eelf.ddts.net--2004-debian/dpatch--dbharris--2.0--patch-38 dbharris@eelf.ddts.net--2004-debian/dpatch--dbharris--2.0--patch-39 dbharris@eelf.ddts.net--2004-debian/dpatch--dbharris--2.0--patch-40 dbharris@eelf.ddts.net--2004-debian/dpatch--dbharris--2.0--patch-41 2004-03-17 02:22:34 GMT David B Harris patch-83 Summary: Bugger, forgot to update changelog Revision: dpatch--mainline--2.0--patch-83 modified files: debian/changelog history/dpatch/ChangeLog.mainline--2.0 2004-03-17 02:12:19 GMT David B Harris patch-82 Summary: Merge with David's dbharris@eelf.ddts.net--2004-debian Revision: dpatch--mainline--2.0--patch-82 Patches applied: * dbharris@eelf.ddts.net--2004-debian/dpatch--dbharris--2.0--patch-26 Merge with Gergely's dpatch@packages.qa.debian.org--archive/dpatch--mainline--2.0--patch-80 * dbharris@eelf.ddts.net--2004-debian/dpatch--dbharris--2.0--patch-27 Whitespace change to test commit email * dbharris@eelf.ddts.net--2004-debian/dpatch--dbharris--2.0--patch-28 Whitespace change to test commit email * dbharris@eelf.ddts.net--2004-debian/dpatch--dbharris--2.0--patch-29 Whitespace change to test commit email * dbharris@eelf.ddts.net--2004-debian/dpatch--dbharris--2.0--patch-30 Whitespace change to test commit email * dbharris@eelf.ddts.net--2004-debian/dpatch--dbharris--2.0--patch-31 Whitespace change to test commit email * dbharris@eelf.ddts.net--2004-debian/dpatch--dbharris--2.0--patch-32 Whitespace change to test commit email * dbharris@eelf.ddts.net--2004-debian/dpatch--dbharris--2.0--patch-33 Merge with Gergely's dpatch--mainline--2.0--patch-81 * dbharris@eelf.ddts.net--2004-debian/dpatch--dbharris--2.0--patch-34 Attempt to revert half-applied patch if it's still the same * dbharris@eelf.ddts.net--2004-debian/dpatch--dbharris--2.0--patch-35 If editing the first patch in 00list, don't apply it to the source tree * dbharris@eelf.ddts.net--2004-debian/dpatch--dbharris--2.0--patch-36 Change my Uploaders: email address from my private one to dbharris@debian.org * dbharris@eelf.ddts.net--2004-debian/dpatch--dbharris--2.0--patch-37 Merge with Gergely's dpatch--mainline--2.0 modified files: debian/changelog debian/control dpatch/dpatch_lowlevel.shpp dpep/dpatch-edit-patch history/dbharris/ChangeLog.dbharris--2.0 history/dpatch/ChangeLog.mainline--2.0 new patches: dbharris@eelf.ddts.net--2004-debian/dpatch--dbharris--2.0--patch-26 dbharris@eelf.ddts.net--2004-debian/dpatch--dbharris--2.0--patch-27 dbharris@eelf.ddts.net--2004-debian/dpatch--dbharris--2.0--patch-28 dbharris@eelf.ddts.net--2004-debian/dpatch--dbharris--2.0--patch-29 dbharris@eelf.ddts.net--2004-debian/dpatch--dbharris--2.0--patch-30 dbharris@eelf.ddts.net--2004-debian/dpatch--dbharris--2.0--patch-31 dbharris@eelf.ddts.net--2004-debian/dpatch--dbharris--2.0--patch-32 dbharris@eelf.ddts.net--2004-debian/dpatch--dbharris--2.0--patch-33 dbharris@eelf.ddts.net--2004-debian/dpatch--dbharris--2.0--patch-34 dbharris@eelf.ddts.net--2004-debian/dpatch--dbharris--2.0--patch-35 dbharris@eelf.ddts.net--2004-debian/dpatch--dbharris--2.0--patch-36 dbharris@eelf.ddts.net--2004-debian/dpatch--dbharris--2.0--patch-37 2004-02-23 20:30:19 GMT Gergely Nagy patch-81 Summary: Finalised changelog for 2.0.6 Revision: dpatch--mainline--2.0--patch-81 * debian/changelog: Finalised for 2.0.6. modified files: debian/changelog history/dpatch/ChangeLog.mainline--2.0 2004-02-23 10:32:32 GMT Gergely Nagy patch-80 Summary: Made dpep executable Revision: dpatch--mainline--2.0--patch-80 * dpep/dpatch-edit-patch: Made it executable. modified files: dpep/dpatch-edit-patch history/dpatch/ChangeLog.mainline--2.0 2004-02-23 10:29:59 GMT Gergely Nagy patch-79 Summary: Star-merged with Dave Revision: dpatch--mainline--2.0--patch-79 Patches applied: * dbharris@eelf.ddts.net--2004-debian/dpatch--dbharris--2.0--patch-23 Merge with Gergely, dpatch@packages.qa.debian.org--archive/dpatch--mainline--2.0--patch-76 * dbharris@eelf.ddts.net--2004-debian/dpatch--dbharris--2.0--patch-24 Merge with Gergely's dpatch@packages.qa.debian.org--archive/dpatch--mainline--2.0--patch-76 * dbharris@eelf.ddts.net--2004-debian/dpatch--dbharris--2.0--patch-25 Use 'grep -F' instead of 'egrep -F'. The latter is seriously broken. modified files: debian/changelog dpep/dpatch-edit-patch history/dbharris/ChangeLog.dbharris--2.0 history/dpatch/ChangeLog.mainline--2.0 new patches: dbharris@eelf.ddts.net--2004-debian/dpatch--dbharris--2.0--patch-23 dbharris@eelf.ddts.net--2004-debian/dpatch--dbharris--2.0--patch-24 dbharris@eelf.ddts.net--2004-debian/dpatch--dbharris--2.0--patch-25 2004-02-23 10:11:22 GMT Gergely Nagy patch-78 Summary: Fixed dpatch *-until Revision: dpatch--mainline--2.0--patch-78 * dpatch/dpatch_patchset.shpp (dpatch_patchset_do): Normalise all patch names (strip .dpatch), so they can be safely compared. * debian/changelog: Note the fix. Also, bump urgency to high, due to this and the dpep fix. Bug noticed by David B Harris. modified files: debian/changelog dpatch/dpatch_patchset.shpp history/dpatch/ChangeLog.mainline--2.0 2004-02-23 09:57:45 GMT Gergely Nagy patch-77 Summary: Fixed a typo Revision: dpatch--mainline--2.0--patch-77 * dpep/dpatch-edit-patch: Fixed a typo (appy instead of apply). Thanks Dave! modified files: dpep/dpatch-edit-patch history/dpatch/ChangeLog.mainline--2.0 2004-02-23 09:35:11 GMT Gergely Nagy patch-76 Summary: dpep changed to use dpatch apply --no-stamp Revision: dpatch--mainline--2.0--patch-76 * dpep/dpatch-edit-patch: Changed Dave's last hotfix to do use dpatch apply, but with a --no-stamp option. * debian/changelog: Stole the appropriate changelog entry. >;) modified files: debian/changelog dpep/dpatch-edit-patch history/dpatch/ChangeLog.mainline--2.0 2004-02-23 09:26:35 GMT Gergely Nagy patch-75 Summary: Added a --no-stamp option to dpatch apply Revision: dpatch--mainline--2.0--patch-75 * dpatch/dpatch_lowlevel.shpp (dpatch_patch_apply): Added a --no-stamp option, for dpatch-edit-patch. Did not and will not document it though, as ordinary people should not need this. modified files: dpatch/dpatch_lowlevel.shpp history/dpatch/ChangeLog.mainline--2.0 2004-02-23 09:18:28 GMT Gergely Nagy patch-74 Summary: Star-merged with Dave Revision: dpatch--mainline--2.0--patch-74 Patches applied: * dbharris@eelf.ddts.net--2004-debian/dpatch--dbharris--2.0--patch-21 Merge with Gergely, dpatch@packages.qa.debian.org--archive/dpatch--mainline--2.0--patch-73 * dbharris@eelf.ddts.net--2004-debian/dpatch--dbharris--2.0--patch-22 Use '$PATCH -apply' for the patch we're editing instead of 'dpatch apply $PATCH' modified files: debian/changelog dpep/dpatch-edit-patch history/dbharris/ChangeLog.dbharris--2.0 history/dpatch/ChangeLog.mainline--2.0 new patches: dbharris@eelf.ddts.net--2004-debian/dpatch--dbharris--2.0--patch-21 dbharris@eelf.ddts.net--2004-debian/dpatch--dbharris--2.0--patch-22 2004-02-18 16:54:18 GMT Gergely Nagy patch-73 Summary: Documentation for developers, step one Revision: dpatch--mainline--2.0--patch-73 * dpatch/devel-docs/01-cli+calling.txt: A shortish attempt to explain the CLI parser and some calling conventions used in dpatch. new files: dpatch/devel-docs/.arch-ids/=id dpatch/devel-docs/01-cli+calling.txt modified files: history/dpatch/ChangeLog.mainline--2.0 new directories: dpatch/devel-docs dpatch/devel-docs/.arch-ids 2004-02-18 12:17:10 GMT Gergely Nagy patch-72 Summary: TODO update Revision: dpatch--mainline--2.0--patch-72 * TODO: Removed outdated entry wrt dpep porting. modified files: TODO history/dpatch/ChangeLog.mainline--2.0 2004-02-18 11:19:55 GMT Gergely Nagy patch-71 Summary: debian/changelog fixation Revision: dpatch--mainline--2.0--patch-71 * debian/changelog: Corrected the last version number to read 2.0.5+snapshot, and added an UNRELEASED tag. modified files: debian/changelog history/dpatch/ChangeLog.mainline--2.0 2004-02-18 11:17:10 GMT Gergely Nagy patch-70 Summary: Star-merged with Dave Revision: dpatch--mainline--2.0--patch-70 Patches applied: * dbharris@eelf.ddts.net--2004-debian/dpatch--dbharris--2.0--patch-17 Merge with Gergely, dpatch--mainline--2.0--patch-67 * dbharris@eelf.ddts.net--2004-debian/dpatch--dbharris--2.0--patch-18 Use 'debian/rules clean unpatch' in dpep, closes: #212312 * dbharris@eelf.ddts.net--2004-debian/dpatch--dbharris--2.0--patch-19 Fix mistake in changelog * dbharris@eelf.ddts.net--2004-debian/dpatch--dbharris--2.0--patch-20 Star-merge with Gergely, and take advantage of the new stipping stuff in 'dpatch list*' modified files: debian/changelog dpep/dpatch-edit-patch history/dbharris/ChangeLog.dbharris--2.0 history/dpatch/ChangeLog.mainline--2.0 new patches: dbharris@eelf.ddts.net--2004-debian/dpatch--dbharris--2.0--patch-17 dbharris@eelf.ddts.net--2004-debian/dpatch--dbharris--2.0--patch-18 dbharris@eelf.ddts.net--2004-debian/dpatch--dbharris--2.0--patch-19 dbharris@eelf.ddts.net--2004-debian/dpatch--dbharris--2.0--patch-20 2004-02-18 11:00:35 GMT Gergely Nagy patch-69 Summary: Simplify .dpatch nuking in dpatch_patch_list() Revision: dpatch--mainline--2.0--patch-69 * dpatch/dpatch_lowlevel.shpp (dpatch_patch_list): Simplified .dpatch suffix nuking, by using the shells ${foo%.dpatch} syntax instead of sed. modified files: dpatch/dpatch_lowlevel.shpp history/dpatch/ChangeLog.mainline--2.0 2004-02-17 22:17:07 GMT Gergely Nagy patch-68 Summary: Strip .dpatch$ in dpatch list* output Revision: dpatch--mainline--2.0--patch-68 * dpatch/dpatch_lowlevel.shpp (dpatch_patch_list): Strip ".dpatch$". modified files: dpatch/dpatch_lowlevel.shpp history/dpatch/ChangeLog.mainline--2.0 2004-02-17 17:51:38 GMT Gergely Nagy patch-67 Summary: Finalise 2.0.5 Revision: dpatch--mainline--2.0--patch-67 * debian/changelog: Finalised for 2.0.5. modified files: debian/changelog history/dpatch/ChangeLog.mainline--2.0 2004-02-17 14:46:23 GMT Gergely Nagy patch-66 Summary: Makefilification (sic) Revision: dpatch--mainline--2.0--patch-66 * dpep/Makefile: New file. * Makefile (all clean install): Descend into dpep too. * config.mk {pkgdatadir}: New variable. * debian/rules: Removed dpep stuff, they are handled by the "upstream" makefiles now. new files: dpep/Makefile modified files: Makefile config.mk debian/rules history/dpatch/ChangeLog.mainline--2.0 2004-02-17 14:33:47 GMT Gergely Nagy patch-65 Summary: Fixed a typo and a wrapped line Revision: dpatch--mainline--2.0--patch-65 * dpep/dpatch-edit-patch: Fixed a typo and a wrapped line. modified files: dpep/dpatch-edit-patch history/dpatch/ChangeLog.mainline--2.0 2004-02-17 14:27:47 GMT Gergely Nagy patch-64 Summary: Fixed an old-posixism (head -1 vs head -n 1) Revision: dpatch--mainline--2.0--patch-64 * dpep/dpatch-edit-patch: Use head -n 1, instead of head -1. modified files: dpep/dpatch-edit-patch history/dpatch/ChangeLog.mainline--2.0 2004-02-17 14:24:22 GMT Gergely Nagy patch-63 Summary: Added Dave's changelogs Revision: dpatch--mainline--2.0--patch-63 * history/dbharris/: New files. new files: history/dbharris/.arch-ids/=id history/dbharris/ChangeLog.dbharris--2.0 history/dbharris/ChangeLog.dpep-port--2.0 modified files: history/dpatch/ChangeLog.mainline--2.0 new directories: history/dbharris history/dbharris/.arch-ids 2004-02-17 14:19:06 GMT Gergely Nagy patch-62 Summary: Star-merged with Dave Revision: dpatch--mainline--2.0--patch-62 Patches applied: * dbharris@eelf.ddts.net--2004-debian/dpatch--dbharris--2.0--patch-14 Fix thinko in dpep, so that the interactive shell works as documented * dbharris@eelf.ddts.net--2004-debian/dpatch--dbharris--2.0--patch-15 Port dpatch-edit-patch to use dpatch(1) calls for everything * dbharris@eelf.ddts.net--2004-debian/dpatch--dbharris--2.0--patch-16 Clarify/fix a few things in the changelog * dbharris@eelf.ddts.net--2004-debian/dpatch--dpep-port--1.0--base-0 tag of dbharris@eelf.ddts.net--2004-debian/dpatch--dbharris--2.0--patch-13 * dbharris@eelf.ddts.net--2004-debian/dpatch--dpep-port--1.0--patch-1 Convert dpep to use 'dpatch patch-template' * dbharris@eelf.ddts.net--2004-debian/dpatch--dpep-port--1.0--patch-2 Convert dpep to use 'dpatch list-all' * dbharris@eelf.ddts.net--2004-debian/dpatch--dpep-port--1.0--patch-3 Port dpep to use 'dpatch apply*' * dbharris@eelf.ddts.net--2004-debian/dpatch--dpep-port--1.0--patch-4 Brown-paper-bag bug, a "| grep -E" was accidentally cut * dbharris@eelf.ddts.net--2004-debian/dpatch--dpep-port--1.0--patch-5 Another bug, deal for when 00templates isn't executable modified files: debian/changelog dpep/dpatch-edit-patch dpep/dpatch-edit-patch.functions history/dpatch/ChangeLog.mainline--2.0 new patches: dbharris@eelf.ddts.net--2004-debian/dpatch--dbharris--2.0--patch-14 dbharris@eelf.ddts.net--2004-debian/dpatch--dbharris--2.0--patch-15 dbharris@eelf.ddts.net--2004-debian/dpatch--dbharris--2.0--patch-16 dbharris@eelf.ddts.net--2004-debian/dpatch--dpep-port--1.0--base-0 dbharris@eelf.ddts.net--2004-debian/dpatch--dpep-port--1.0--patch-1 dbharris@eelf.ddts.net--2004-debian/dpatch--dpep-port--1.0--patch-2 dbharris@eelf.ddts.net--2004-debian/dpatch--dpep-port--1.0--patch-3 dbharris@eelf.ddts.net--2004-debian/dpatch--dpep-port--1.0--patch-4 dbharris@eelf.ddts.net--2004-debian/dpatch--dpep-port--1.0--patch-5 2004-02-17 08:35:33 GMT Gergely Nagy patch-61 Summary: Star-merged with Dave Revision: dpatch--mainline--2.0--patch-61 Patches applied: * dbharris@eelf.ddts.net--2004-debian/dpatch--dbharris--2.0--patch-11 Put stampfile in place even if patching fails * dbharris@eelf.ddts.net--2004-debian/dpatch--dbharris--2.0--patch-12 Merge with Gergely * dbharris@eelf.ddts.net--2004-debian/dpatch--dbharris--2.0--patch-13 Add @DPATCH@ to the end of the hardcoded template modified files: debian/changelog dpatch/dpatch_lowlevel.shpp dpatch/dpatch_template.shpp history/dpatch/ChangeLog.mainline--2.0 new patches: dbharris@eelf.ddts.net--2004-debian/dpatch--dbharris--2.0--patch-11 dbharris@eelf.ddts.net--2004-debian/dpatch--dbharris--2.0--patch-12 dbharris@eelf.ddts.net--2004-debian/dpatch--dbharris--2.0--patch-13 2004-02-15 23:10:53 GMT Gergely Nagy patch-60 Summary: debian/changelog fixation Revision: dpatch--mainline--2.0--patch-60 * debian/changelog: Renamed the duplicate 2.0.4 entry to 2.0.4+snapshot. modified files: debian/changelog history/dpatch/ChangeLog.mainline--2.0 2004-02-15 22:58:07 GMT Gergely Nagy patch-59 Summary: Star-merged with Dave Revision: dpatch--mainline--2.0--patch-59 Patches applied: * dbharris@eelf.ddts.net--2004-debian/dpatch--dbharris--2.0--patch-8 Add note about Build-Depends and CPP proprocessing of 00list * dbharris@eelf.ddts.net--2004-debian/dpatch--dbharris--2.0--patch-9 Merge with Gergely * dbharris@eelf.ddts.net--2004-debian/dpatch--dbharris--2.0--patch-10 Add debian/changelog entry for dbharris@eelf.ddts.net--2004-debian/dpatch--dbharris--2.0--patch-8 modified files: debian/changelog dpatch/dpatch.1 history/dpatch/ChangeLog.mainline--2.0 new patches: dbharris@eelf.ddts.net--2004-debian/dpatch--dbharris--2.0--patch-8 dbharris@eelf.ddts.net--2004-debian/dpatch--dbharris--2.0--patch-9 dbharris@eelf.ddts.net--2004-debian/dpatch--dbharris--2.0--patch-10 2004-02-15 12:13:48 GMT Gergely Nagy patch-58 Summary: Fixed debian/rules Revision: dpatch--mainline--2.0--patch-58 * debian/rules: Fixed dpep man page installation. modified files: debian/rules history/dpatch/ChangeLog.mainline--2.0 2004-02-15 11:59:00 GMT Gergely Nagy patch-57 Summary: debian/changelog fix and finalisation Revision: dpatch--mainline--2.0--patch-57 * debian/changelog: Removed a duplicate 2.0.3 entry, and finalised for 2.0.4. modified files: debian/changelog history/dpatch/ChangeLog.mainline--2.0 2004-02-15 11:41:33 GMT Gergely Nagy patch-56 Summary: dpatch/Makefile simplification Revision: dpatch--mainline--2.0--patch-56 * dpatch/Makefile {DPATCH_SRCS}: New variable. (dpatch): Replaced the explicit dpatch_*.shpp prerequisites with ${DPATCH_SRCS}. (.PHONY): Removed version, added all, clean and install. (.SUFFIXES): New, empty target. modified files: dpatch/Makefile history/dpatch/ChangeLog.mainline--2.0 2004-02-15 11:21:06 GMT Gergely Nagy patch-55 Summary: Prerequisite update Revision: dpatch--mainline--2.0--patch-55 * dpatch/Makefile (dpatch): Added dpatch_requisites.shpp to the list of prerequisites. modified files: dpatch/Makefile history/dpatch/ChangeLog.mainline--2.0 2004-02-15 11:18:32 GMT Gergely Nagy patch-54 Summary: dpatch-convert-diffgz fix and improvements Revision: dpatch--mainline--2.0--patch-54 * scripts/dpatch-convert-diffgz: Updated to use the new patch-template syntax (takes only two arguments), and packed the whole dpatch generation into a big pipeline. * debian/changelog: Added a note about this. modified files: debian/changelog history/dpatch/ChangeLog.mainline--2.0 scripts/dpatch-convert-diffgz 2004-02-15 10:47:59 GMT Gergely Nagy patch-53 Summary: debian/changelog update Revision: dpatch--mainline--2.0--patch-53 * debian/changelog: Added a note about Dave's 00options work. modified files: debian/changelog history/dpatch/ChangeLog.mainline--2.0 2004-02-15 10:42:01 GMT Gergely Nagy patch-52 Summary: star-merged with Dave Revision: dpatch--mainline--2.0--patch-52 Patches applied: * dbharris@eelf.ddts.net--2004-debian/dpatch--dbharris--2.0--patch-5 Bugger, forgot to add changelog entry for last commit * dbharris@eelf.ddts.net--2004-debian/dpatch--dbharris--2.0--patch-6 Merge against dpatch@packages.qa.debian.org/dpatch--mainline--2.0--patch-51 * dbharris@eelf.ddts.net--2004-debian/dpatch--dbharris--2.0--patch-7 Remove --with-cpp documentation, add support for debian/patches/00options new files: dpatch/dpatch_requisites.shpp modified files: debian/changelog dpatch/dpatch.1 dpatch/dpatch.shpp dpatch/dpatch_help.shpp history/dpatch/ChangeLog.mainline--2.0 new patches: dbharris@eelf.ddts.net--2004-debian/dpatch--dbharris--2.0--patch-5 dbharris@eelf.ddts.net--2004-debian/dpatch--dbharris--2.0--patch-6 dbharris@eelf.ddts.net--2004-debian/dpatch--dbharris--2.0--patch-7 2004-01-27 20:20:42 GMT Gergely Nagy patch-51 Summary: changelog update Revision: dpatch--mainline--2.0--patch-51 * debian/changelog: Added 229941 (head -1 vs head -n 1) log. modified files: debian/changelog history/dpatch/ChangeLog.mainline--2.0 2004-01-27 20:17:21 GMT Gergely Nagy patch-50 Summary: Merge with David Revision: dpatch--mainline--2.0--patch-50 Patches applied: * dbharris@eelf.ddts.net--2004-debian/dpatch--dbharris--2.0--patch-4 Use 'head -n1' instead of 'head -1', closes: #229941 * dbharris@eelf.ddts.net--2004-debian/dpatch--dbharris--2.0--patch-3 Prefix dpep/ to dpatch-edit-patch source file references * dbharris@eelf.ddts.net--2004-debian/dpatch--dbharris--2.0--patch-2 Merge to dpatch--mainline--2.0--patch-47 * dbharris@eelf.ddts.net--2004-debian/dpatch--dbharris--2.0--patch-1 Move dpatch-edit-patch files to dpep/ * dbharris@eelf.ddts.net--2004-debian/dpatch--dbharris--2.0--base-0 tag of dpatch@packages.qa.debian.org--archive/dpatch--mainline--2.0--patch-47 new files: dpep/.arch-ids/=id modified files: debian/rules dpep/dpatch-edit-patch history/dpatch/ChangeLog.mainline--2.0 renamed files: dpatch-edit-patch ==> dpep/dpatch-edit-patch dpatch-edit-patch.1 ==> dpep/dpatch-edit-patch.1 dpatch-edit-patch.functions ==> dpep/dpatch-edit-patch.functions dpatch_edit_patch.bash_completion.d ==> dpep/dpatch_edit_patch.bash_completion.d new directories: dpep dpep/.arch-ids new patches: dbharris@eelf.ddts.net--2004-debian/dpatch--dbharris--2.0--base-0 dbharris@eelf.ddts.net--2004-debian/dpatch--dbharris--2.0--patch-1 dbharris@eelf.ddts.net--2004-debian/dpatch--dbharris--2.0--patch-2 dbharris@eelf.ddts.net--2004-debian/dpatch--dbharris--2.0--patch-3 dbharris@eelf.ddts.net--2004-debian/dpatch--dbharris--2.0--patch-4 2004-01-27 20:07:32 GMT Gergely Nagy patch-49 Summary: Fix empty 00list handling Revision: dpatch--mainline--2.0--patch-49 * dpatch/dpatch_patchset.shpp (dpatch_patchset_do): Handle grep returning non-zero. Patch from Daniel Kobras. * debian/changelog: Log this fix. modified files: debian/changelog dpatch/dpatch_patchset.shpp history/dpatch/ChangeLog.mainline--2.0 2004-01-27 20:02:15 GMT Gergely Nagy patch-48 Summary: Bumped version Revision: dpatch--mainline--2.0--patch-48 * debian/changelog: Added a 2.0.3+snapshot entry. modified files: debian/changelog history/dpatch/ChangeLog.mainline--2.0 2004-01-18 13:51:43 GMT Gergely Nagy patch-47 Summary: Finalised 2.0.3 Revision: dpatch--mainline--2.0--patch-47 * debian/changelog: Finalised for 2.0.3. modified files: debian/changelog history/dpatch/ChangeLog.mainline--2.0 2004-01-18 13:18:58 GMT Gergely Nagy patch-46 Summary: Finalising for 2.0.3, step one Revision: dpatch--mainline--2.0--patch-46 * debian/changelog: Urgency set to medium, as we want this to enter testing soon. Removed the UNRELEASED entry too. modified files: debian/changelog history/dpatch/ChangeLog.mainline--2.0 2004-01-18 13:12:27 GMT Gergely Nagy patch-45 Summary: Configuration file support Revision: dpatch--mainline--2.0--patch-45 * config.mk {sysconfdir}: New variable. * dpatch/Makefile (dpatch): Export SYSCONFDIR to the build script. * dpatch/dpatch.shpp: Source in /etc/dpatch.conf and ~/.dpatch.conf, if they exist. * dpatch/dpatch.1 (FILES): Document that there are configuration files. * debian/changelog: Added logs about this. modified files: config.mk debian/changelog dpatch/Makefile dpatch/dpatch.1 dpatch/dpatch.shpp history/dpatch/ChangeLog.mainline--2.0 2004-01-18 12:46:15 GMT Gergely Nagy patch-44 Summary: Clarification in README Revision: dpatch--mainline--2.0--patch-44 * README: Clarified that one can (and sometimes should) arrange that `patch-stamp' is not a prerequisite for `build-stamp', but something else (like `configure-stamp' or `config.status') * debian/changelog: Added a log about the above change. modified files: README debian/changelog history/dpatch/ChangeLog.mainline--2.0 2004-01-18 11:41:34 GMT Gergely Nagy patch-43 Summary: debian/changelog update Revision: dpatch--mainline--2.0--patch-43 * debian/changelog: Updated (re: NEWS.Debian). modified files: debian/changelog history/dpatch/ChangeLog.mainline--2.0 2004-01-12 15:37:00 GMT Gergely Nagy patch-42 Summary: Do not ship debian/NEWS Revision: dpatch--mainline--2.0--patch-42 * debian/rules (binary-dpatch): Do not ship debian/NEWS. * debian/changelog: Start 2.0.2+snapshot (2.0.3) logs, and note this most recent change. modified files: debian/changelog debian/rules history/dpatch/ChangeLog.mainline--2.0 2004-01-10 12:32:45 GMT Gergely Nagy patch-41 Summary: DEB_BUILD_ARCH optimisation Revision: dpatch--mainline--2.0--patch-41 * dpatch/dpatch_patchset.shpp (dpatch_patchset_do): Do not declare DEB_BUILD_ARCH as a local variable. modified files: dpatch/dpatch_patchset.shpp history/dpatch/ChangeLog.mainline--2.0 2004-01-10 12:30:01 GMT Gergely Nagy patch-40 Summary: Updated debian/changelog Revision: dpatch--mainline--2.0--patch-40 * debian/changelog: Updated and finalised for 2.0.2. modified files: debian/changelog history/dpatch/ChangeLog.mainline--2.0 2004-01-05 18:05:56 GMT Gergely Nagy patch-39 Summary: Copyright year updates Revision: dpatch--mainline--2.0--patch-39 * dpatch/dpatch_help.shpp (dpatch_license): Updated the copyright years. * debian/copyright: Likewise. modified files: debian/copyright dpatch/dpatch_help.shpp history/dpatch/ChangeLog.mainline--2.0 2004-01-05 18:00:00 GMT Gergely Nagy patch-38 Summary: Made the patchname argument to patch-template optional Revision: dpatch--mainline--2.0--patch-38 * dpatch/dpatch.shpp: Made patch-template work without any arguments too. * dpatch/dpatch_template.shpp (dpatch_patch_template): If $1 is empty, use 99-unnamed as default. * dpatch/dpatch_help.shpp {dpatch_help_patch_template}: Updated the syntax, as the patchname argument is not required anymore. * dpatch/dpatch.1: Likewise. modified files: dpatch/dpatch.1 dpatch/dpatch.shpp dpatch/dpatch_help.shpp dpatch/dpatch_template.shpp history/dpatch/ChangeLog.mainline--2.0 2004-01-05 17:51:43 GMT Gergely Nagy patch-37 Summary: dpatch patch-template --prepend Revision: dpatch--mainline--2.0--patch-37 * dpatch/dpatch_template.shpp (dpatch_patch_template): Take a --prepend option, and cat STDIN after the template if it was given. * dpatch/dpatch_help.shpp {dpatch_help_patch_template}: Documented --prepend. * dpatch/dpatch.1: Likewise. modified files: dpatch/dpatch.1 dpatch/dpatch_help.shpp dpatch/dpatch_template.shpp history/dpatch/ChangeLog.mainline--2.0 2003-12-24 20:49:48 GMT Gergely Nagy patch-36 Summary: Fixed bashisms Revision: dpatch--mainline--2.0--patch-36 * dpatch/dpatch_patchset.shpp (dpatch_patchset_do): Only shit after the option loop if there is stuff to shift still. Also, use `=' instead of `==', since the latter is a bashism. * debian/changelog: Updated. Reported by Ian Dichkovsky (Debian Bug#224879). modified files: debian/changelog dpatch/dpatch_patchset.shpp history/dpatch/ChangeLog.mainline--2.0 2003-12-15 10:15:38 GMT Gergely Nagy patch-35 Summary: dpatch(7) Revision: dpatch--mainline--2.0--patch-35 * dpatch/dpatch.7: New file. * dpatch/Makefile (install): Install it. * TODO: Removed relevant entry. * debian/changelog: Updated. new files: dpatch/dpatch.7 modified files: TODO debian/changelog dpatch/Makefile history/dpatch/ChangeLog.mainline--2.0 2003-12-15 09:57:32 GMT Gergely Nagy patch-34 Summary: debian/changelog update Revision: dpatch--mainline--2.0--patch-34 * debian/changelog: Added recent changes. modified files: debian/changelog history/dpatch/ChangeLog.mainline--2.0 2003-12-15 09:54:41 GMT Gergely Nagy patch-33 Summary: README made clear about patch order Revision: dpatch--mainline--2.0--patch-33 * README: Made clear about the patch order. Noticed by Steve Greenland (Debian bug #223876) modified files: README history/dpatch/ChangeLog.mainline--2.0 2003-12-15 09:50:32 GMT Gergely Nagy patch-32 Summary: Updated the template in README Revision: dpatch--mainline--2.0--patch-32 * README: Updated the template. modified files: README history/dpatch/ChangeLog.mainline--2.0 2003-12-15 09:47:26 GMT Gergely Nagy patch-31 Summary: Make templates handle the second argument Revision: dpatch--mainline--2.0--patch-31 * dpatch/dpatch_template.shpp (dpatch_patch_template): Make the template use the optional second argument too. * samples/sample.00template: Likewise. modified files: dpatch/dpatch_template.shpp history/dpatch/ChangeLog.mainline--2.0 samples/sample.00template 2003-12-15 09:36:22 GMT Gergely Nagy patch-30 Summary: Added a --chdir option Revision: dpatch--mainline--2.0--patch-30 * dpatch/dpatch.shpp: Recognise --chdir. * dpatch/dpatch_lowlevel.shpp (dpatch_patch_apply): Only do the `cd' if DPATCH_OPTION_CHDIR is non-zero. (dpatch_patch_deapply): Likewise. (dpatch_patch_custom): Likewise. * dpatch/dpatch.1: Updated to reflect this. modified files: dpatch/dpatch.1 dpatch/dpatch.shpp dpatch/dpatch_lowlevel.shpp history/dpatch/ChangeLog.mainline--2.0 2003-12-07 14:04:37 GMT Gergely Nagy patch-29 Summary: Fixed dpatch-edit-patch default template Revision: dpatch--mainline--2.0--patch-29 * dpatch-edit-patch.functions (dpep_template_hardcoded): Fixed the default template to accept more than one argument. modified files: dpatch-edit-patch.functions history/dpatch/ChangeLog.mainline--2.0 2003-12-07 12:51:33 GMT Gergely Nagy patch-28 Summary: TODO update Revision: dpatch--mainline--2.0--patch-28 * TODO: Updated. modified files: TODO history/dpatch/ChangeLog.mainline--2.0 2003-12-07 12:45:01 GMT Gergely Nagy patch-27 Summary: debian/changelog update Revision: dpatch--mainline--2.0--patch-27 * debian/changelog: Started 2.0.1+snapshot (to become 2.0.2 later). modified files: debian/changelog history/dpatch/ChangeLog.mainline--2.0 2003-12-06 20:35:21 GMT Gergely Nagy patch-26 Summary: Fix manpage permissions Revision: dpatch--mainline--2.0--patch-26 * scripts/Makefile (install): Call install with the appropriate --mode parameter. * dpatch/Makefile (install): Likewise. * compat/Makefile (install): Likewise. modified files: compat/Makefile dpatch/Makefile history/dpatch/ChangeLog.mainline--2.0 scripts/Makefile 2003-12-06 19:53:41 GMT Gergely Nagy patch-25 Summary: dpatch 2.0.1 Revision: dpatch--mainline--2.0--patch-25 * debian/changelog: Finalised for dpatch 2.0.1. modified files: debian/changelog history/dpatch/ChangeLog.mainline--2.0 2003-12-06 15:26:59 GMT Gergely Nagy patch-24 Summary: debian/changelog update Revision: dpatch--mainline--2.0--patch-24 * debian/changelog: Update to reflect recent changes. modified files: debian/changelog history/dpatch/ChangeLog.mainline--2.0 2003-12-06 15:17:54 GMT Gergely Nagy patch-23 Summary: Implemented apply --verbose and deapply --verbose Revision: dpatch--mainline--2.0--patch-23 * dpatch/dpatch_lowlevel.shpp (dpatch_patch_apply): Implemented --verbose. (dpatch_patch_deapply): Likewise. * dpatch/dpatch_help.shpp {dpatch_help_apply}: Documented --verbose. {dpatch_help_deapply}: Likewise. * dpatch/dpatch.1: Documented --verbose for apply and deapply. modified files: dpatch/dpatch.1 dpatch/dpatch_help.shpp dpatch/dpatch_lowlevel.shpp history/dpatch/ChangeLog.mainline--2.0 2003-12-06 14:10:37 GMT Gergely Nagy patch-22 Summary: Restored dpatch1 compatibility Revision: dpatch--mainline--2.0--patch-22 * dpatch/dpatch_lowlevel.shpp (dpatch_patch_apply): Only pass a second argument to the scriptlet if DPATCH_WORKDIR is not the default ./. (dpatch_patch_deapply): Likewise. (dpatch_patch_custom): Likewise. Bug noticed and workaround suggested by Geert Stappers. modified files: dpatch/dpatch_lowlevel.shpp history/dpatch/ChangeLog.mainline--2.0 2003-12-06 14:00:11 GMT Gergely Nagy patch-21 Summary: Fixed sample templates Revision: dpatch--mainline--2.0--patch-21 * samples/dpatch/01_config.dpatch: Allow more than one parameter. * samples/sample.00template: Likewise. * dpatch/dpatch_template.shpp (dpatch_patch_template): Likewise. This partly addresses Debian bug #222006, thanks to Geert Stappers. modified files: dpatch/dpatch_template.shpp history/dpatch/ChangeLog.mainline--2.0 samples/dpatch/01_config.dpatch samples/sample.00template 2003-12-06 13:52:25 GMT Gergely Nagy patch-20 Summary: Implemented dpatch log Revision: dpatch--mainline--2.0--patch-20 * dpatch/dpatch_lowlevel.shpp (dpatch_patch_log): New function. (dpatch_command_map): Recognise `log' and variants. * dpatch/dpatch.shpp: Recognise `log' and variants. * dpatch/dpatch_help.shpp {dpatch_help_log}: New variable. (dpatch_help): Mention `log'. * dpatch/dpatch.1: Documented the `log' sub-command. Requested by Geert Stappers. modified files: dpatch/dpatch.1 dpatch/dpatch.shpp dpatch/dpatch_help.shpp dpatch/dpatch_lowlevel.shpp history/dpatch/ChangeLog.mainline--2.0 2003-12-06 13:02:11 GMT Gergely Nagy patch-19 Summary: README.arch update for TLA 1.0 Revision: dpatch--mainline--2.0--patch-19 * README.arch: Added info about how to update with TLA 1.0. Omission noticed by Geert Stappers. modified files: README.arch debian/changelog history/dpatch/ChangeLog.mainline--2.0 2003-12-06 12:55:03 GMT Gergely Nagy patch-18 Summary: Mention README.arch in README Revision: dpatch--mainline--2.0--patch-18 * README: Mention README.arch. Patch from Geert Stappers. modified files: README debian/changelog history/dpatch/ChangeLog.mainline--2.0 2003-12-06 12:46:07 GMT Gergely Nagy patch-17 Summary: Include README.arch in the binary package Revision: dpatch--mainline--2.0--patch-17 * debian/rules {DOCS}: Added README.arch. Patch from Geert Stappers. modified files: debian/changelog debian/rules history/dpatch/ChangeLog.mainline--2.0 2003-12-06 12:08:32 GMT Gergely Nagy patch-16 Summary: Fixed example installation Revision: dpatch--mainline--2.0--patch-16 * sample/Makefile (install): When traversing into rules/ and dpatch/, call the makefile there with $@, otherwise it won't install, but simply do a build, which does nothing. * debian/changelog: Updated accordingly. This fixes #217136 for real. Noticed by Geert Stappers. modified files: debian/changelog history/dpatch/ChangeLog.mainline--2.0 samples/Makefile 2003-11-16 18:28:07 GMT Gergely Nagy patch-15 Summary: Updated version Revision: dpatch--mainline--2.0--patch-15 * debian/changelog: Added 2.0.0+snapshot. Sorts before 2.0.1 so it is ok ;) * dpatch/Makefile (dpatch): Added ../debian/changelog to the list of prerequisites. modified files: debian/changelog dpatch/Makefile history/dpatch/ChangeLog.mainline--2.0 2003-11-16 17:01:58 GMT Gergely Nagy patch-14 Summary: Fixed make tla-release Revision: dpatch--mainline--2.0--patch-14 * Makefile (tla-release): Fixed to not flatten the hierarchy. modified files: Makefile history/dpatch/ChangeLog.mainline--2.0 2003-11-16 16:52:05 GMT Gergely Nagy patch-13 Summary: Removed last trace of the version stuff Revision: dpatch--mainline--2.0--patch-13 * dpatch/Makefile: Removed the last trace of the version stuff. modified files: dpatch/Makefile history/dpatch/ChangeLog.mainline--2.0 2003-11-16 16:38:36 GMT Gergely Nagy patch-12 Summary: Added a few samples from Joerg Revision: dpatch--mainline--2.0--patch-12 * samples/rules/rules.new.dh: New file. * samples/rules/rules.new.non-dh: Likewise. * samples/rules/00list.new.non-dh: Likewise. * samples/rules/Makefile (SAMPLES): Added them. new files: samples/rules/00list.new.non-dh samples/rules/rules.new.dh samples/rules/rules.new.non-dh modified files: history/dpatch/ChangeLog.mainline--2.0 samples/rules/Makefile 2003-11-16 16:05:14 GMT Gergely Nagy patch-11 Summary: Fixed permissions in the tarball Revision: dpatch--mainline--2.0--patch-11 * Makefile (tla-release): Do not use install, but cp instead, to preserve permissions. modified files: Makefile history/dpatch/ChangeLog.mainline--2.0 2003-11-16 15:45:52 GMT Gergely Nagy patch-10 Summary: README.arch Revision: dpatch--mainline--2.0--patch-10 * README.arch: New file. new files: README.arch modified files: history/dpatch/ChangeLog.mainline--2.0 2003-11-16 15:36:48 GMT Gergely Nagy patch-9 Summary: Do not include arch stuff in the tarball Revision: dpatch--mainline--2.0--patch-9 * Makefile (tla-release): Do not include arch stuff in the tarball. modified files: Makefile history/dpatch/ChangeLog.mainline--2.0 2003-11-16 15:33:03 GMT Gergely Nagy patch-8 Summary: Fixed make tla-release Revision: dpatch--mainline--2.0--patch-8 * Makefile (tla-release): Use DPATCH_REVISION instead of DPATCH_VERSION. modified files: Makefile history/dpatch/ChangeLog.mainline--2.0 2003-11-16 15:29:48 GMT Gergely Nagy patch-7 Summary: Changed the format of dpatch version Revision: dpatch--mainline--2.0--patch-7 * dpatch/dpatch_help.shpp (dpatch_version): Changed the output format. modified files: dpatch/dpatch_help.shpp history/dpatch/ChangeLog.mainline--2.0 2003-11-16 15:26:49 GMT Gergely Nagy patch-6 Summary: Fixed a typo in dpatch.make(7) Revision: dpatch--mainline--2.0--patch-6 * compat/dpatch.make.7: Fixed a typo (\B instead of \fB), noticed by Joerg Jaspert. modified files: compat/dpatch.make.7 history/dpatch/ChangeLog.mainline--2.0 2003-11-16 15:21:06 GMT Gergely Nagy patch-5 Summary: Removed the version stuff Revision: dpatch--mainline--2.0--patch-5 Simply extract the version from debian/changelog, and use it. modified files: Makefile compat/Makefile config.mk dpatch/Makefile history/dpatch/ChangeLog.mainline--2.0 samples/Makefile samples/dpatch/Makefile samples/rules/Makefile scripts/Makefile 2003-11-16 15:04:03 GMT Gergely Nagy patch-4 Summary: Fixed Makefile Revision: dpatch--mainline--2.0--patch-4 * Makefile {DPATCH_VERSION}: Explictly set it to 2.0.0. {DPATCH_BASE}: Removed this variable. modified files: Makefile history/dpatch/ChangeLog.mainline--2.0 2003-11-16 14:55:47 GMT Gergely Nagy patch-3 Summary: Samples reorganised, and a new one added Revision: dpatch--mainline--2.0--patch-3 * samples/rules/: New directory. * samples/dpatch/: Likewise. * samples/sample.rules: Moved from here... * samples/rules/rules.dh: ...to here. * samples/sample.rules2: Moved from here... * samples/rules/rules.non-dh: ...to here. * samples/dpatch/01_config.dpatch: New sample from Ralf Treinen. * samples/dpatch/Makefile: New file. * samples/rules/Makefile: Likewise. * samples/Makefile: Descend into dpatch/ and rules/ too. * TODO: Removed relevant entry. new files: samples/dpatch/.arch-ids/=id samples/dpatch/01_config.dpatch samples/dpatch/Makefile samples/rules/.arch-ids/=id samples/rules/Makefile modified files: TODO history/dpatch/ChangeLog.mainline--2.0 samples/Makefile renamed files: samples/.arch-ids/sample.rules.id ==> samples/rules/.arch-ids/rules.dh.id samples/.arch-ids/sample.rules2.id ==> samples/rules/.arch-ids/rules.non-dh.id samples/sample.rules ==> samples/rules/rules.dh samples/sample.rules2 ==> samples/rules/rules.non-dh new directories: samples/dpatch samples/dpatch/.arch-ids samples/rules samples/rules/.arch-ids 2003-11-16 14:34:24 GMT Gergely Nagy patch-2 Summary: debian/changelog and debian/NEWS update Revision: dpatch--mainline--2.0--patch-2 * debian/changelog: Updated. * debian/NEWS: Likewise. modified files: debian/NEWS debian/changelog history/dpatch/ChangeLog.mainline--2.0 2003-11-14 11:23:10 GMT Gergely Nagy patch-1 Summary: history/dpatch/ChangeLog.mainline--2.0 Revision: dpatch--mainline--2.0--patch-1 * history/dpatch/ChangeLog.mainline--2.0: New file new files: history/dpatch/ChangeLog.mainline--2.0 2003-11-14 11:19:09 GMT Gergely Nagy base-0 Summary: tag of dpatch@packages.qa.debian.org--archive/dpatch--refactor--0--patch-10 Revision: dpatch--mainline--2.0--base-0 (automatically generated log message) new patches: algernon@bonehunter.rulez.org--tla/dpatch--mainline--1--base-0 algernon@bonehunter.rulez.org--tla/dpatch--mainline--1--patch-1 algernon@bonehunter.rulez.org--tla/dpatch--mainline--1--patch-2 algernon@bonehunter.rulez.org--tla/dpatch--mainline--1--patch-3 algernon@bonehunter.rulez.org--tla/dpatch--mainline--1--patch-4 algernon@bonehunter.rulez.org--tla/dpatch--mainline--1--patch-5 algernon@bonehunter.rulez.org--tla/dpatch--mainline--1--patch-6 algernon@bonehunter.rulez.org--tla/dpatch--mainline--1--patch-7 algernon@bonehunter.rulez.org--tla/dpatch--mainline--1--patch-8 algernon@bonehunter.rulez.org--tla/dpatch--mainline--1--patch-9 algernon@bonehunter.rulez.org--tla/dpatch--mainline--1--patch-10 algernon@bonehunter.rulez.org--tla/dpatch--mainline--1--patch-11 algernon@bonehunter.rulez.org--tla/dpatch--mainline--1--patch-12 algernon@bonehunter.rulez.org--tla/dpatch--mainline--1--patch-13 algernon@bonehunter.rulez.org--tla/dpatch--mainline--1--patch-14 algernon@bonehunter.rulez.org--tla/dpatch--mainline--1--patch-15 algernon@bonehunter.rulez.org--tla/dpatch--mainline--1--patch-16 algernon@bonehunter.rulez.org--tla/dpatch--mainline--1--patch-17 algernon@bonehunter.rulez.org--tla/dpatch--mainline--1--patch-18 algernon@bonehunter.rulez.org--tla/dpatch--mainline--1--patch-19 algernon@bonehunter.rulez.org--tla/dpatch--mainline--1--patch-20 algernon@bonehunter.rulez.org--tla/dpatch--mainline--1--patch-21 algernon@bonehunter.rulez.org--tla/dpatch--mainline--1--patch-22 algernon@bonehunter.rulez.org--tla/dpatch--mainline--1--patch-23 algernon@bonehunter.rulez.org--tla/dpatch--mainline--1--patch-24 algernon@bonehunter.rulez.org--tla/dpatch--mainline--1--patch-25 algernon@bonehunter.rulez.org--tla/dpatch--mainline--1--patch-26 algernon@bonehunter.rulez.org--tla/dpatch--mainline--1--patch-27 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--base-0 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-1 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-2 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-3 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-4 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-5 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-6 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-7 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-8 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-9 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-10 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-11 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-12 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-13 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-14 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-15 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-16 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-17 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-18 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-19 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-20 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-21 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-22 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-23 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-24 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-25 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-26 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-27 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-28 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-29 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-30 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-31 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-32 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-33 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-34 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-35 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-36 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-37 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-38 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-39 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-40 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-41 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-42 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-43 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-44 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-45 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-46 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-47 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-48 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-49 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-50 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-51 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-52 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-53 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-54 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-55 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-56 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-57 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-58 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-59 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-60 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-61 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-62 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-63 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-64 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-65 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-66 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-67 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-68 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-69 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-70 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-71 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-72 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-73 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-74 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-75 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-76 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-77 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-78 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-79 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-80 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-81 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-82 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-83 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-84 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-85 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-86 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-87 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-88 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-89 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-90 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-91 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-92 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-93 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-94 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-95 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-96 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-97 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-98 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-99 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-100 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-101 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-102 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-103 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-104 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-105 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-106 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-107 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-108 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-109 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-110 algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-111 david@eelf.ddts.net--debian/dpatch--eelf--0--base-0 david@eelf.ddts.net--debian/dpatch--eelf--0--patch-1 dpatch@packages.qa.debian.org--archive/dpatch--refactor--0--base-0 dpatch@packages.qa.debian.org--archive/dpatch--refactor--0--patch-1 dpatch@packages.qa.debian.org--archive/dpatch--refactor--0--patch-2 dpatch@packages.qa.debian.org--archive/dpatch--refactor--0--patch-3 dpatch@packages.qa.debian.org--archive/dpatch--refactor--0--patch-4 dpatch@packages.qa.debian.org--archive/dpatch--refactor--0--patch-5 dpatch@packages.qa.debian.org--archive/dpatch--refactor--0--patch-6 dpatch@packages.qa.debian.org--archive/dpatch--refactor--0--patch-7 dpatch@packages.qa.debian.org--archive/dpatch--refactor--0--patch-8 dpatch@packages.qa.debian.org--archive/dpatch--refactor--0--patch-9 dpatch@packages.qa.debian.org--archive/dpatch--refactor--0--patch-10 dpatch/history/algernon/0000755000000000000000000000000011621425704012517 5ustar dpatch/history/algernon/ChangeLog.refactor--00000644000000000000000000014506511621425704016322 0ustar # do not edit -- automatically generated by arch changelog # arch-tag: automatic-ChangeLog--algernon@bonehunter.rulez.org--tla/dpatch--refactor--0 # 2003-11-14 11:01:11 GMT Gergely Nagy patch-111 Summary: Workdir support modified a bit Revision: dpatch--refactor--0--patch-111 * compat/dpatch.make: If DPATCH_WORKDIR is defined, pass --workdir ${DPATCH_WORKDIR} to all dpatch calls. * compat/dpatch.make.7: Documented DPATCH_WORKDIR. * dpatch/dpatch.shpp: Canonicalise DPATCH_WORKDIR. * dpatch/dpatch_lowlevel.shpp (dpatch_patch_apply): Pass ${DPATCH_WORKDIR} to the called patch as a second argument (used by the glibc dpatches). (dpatch_patch_deapply): Likewise. (dpatch_patch_custom): Likewise. modified files: compat/dpatch.make compat/dpatch.make.7 dpatch/dpatch.shpp dpatch/dpatch_lowlevel.shpp history/algernon/ChangeLog.refactor--0 2003-11-14 10:29:51 GMT Gergely Nagy patch-110 Summary: TODO update Revision: dpatch--refactor--0--patch-110 * TODO: Updated. modified files: TODO history/algernon/ChangeLog.refactor--0 2003-11-14 10:25:32 GMT Gergely Nagy patch-109 Summary: When running with --with-cpp, define DEB_BUILD_ARCH too Revision: dpatch--refactor--0--patch-109 * dpatch/dpatch_patchset.shpp (dpatch_patchset_do): Add -DDEB_BUILD_ARCH=\"${DEB_BUILD_ARCH}\" to the cpp commandline. modified files: dpatch/dpatch_patchset.shpp history/algernon/ChangeLog.refactor--0 2003-11-14 10:06:35 GMT Gergely Nagy patch-108 Summary: Documented the dpatch.make variables Revision: dpatch--refactor--0--patch-108 * compat/dpatch.make.7: Documented the settable variables. modified files: compat/dpatch.make.7 history/algernon/ChangeLog.refactor--0 2003-11-14 09:56:35 GMT Gergely Nagy patch-107 Summary: Implemented --stampdir Revision: dpatch--refactor--0--patch-107 * dpatch/dpatch_lowlevel.shpp (dpatch_apply): Recognise and use --stampdir. (dpatch_deapply): Likewise. (dpatch_status): Likewise. * dpatch/dpatch_help.shpp {dpatch_help_apply}: Documented --stampdir. {dpatch_help_deapply}: Likewise. {dpatch_help_status}: Likewise. * dpatch/dpatch.1: Likewise. * compat/dpatch.make: Added support for setting the stampdir to something other than debian/patched. modified files: compat/dpatch.make dpatch/dpatch.1 dpatch/dpatch_help.shpp dpatch/dpatch_lowlevel.shpp history/algernon/ChangeLog.refactor--0 2003-11-12 13:14:22 GMT Gergely Nagy patch-106 Summary: Use ${DEB_SOURCE_PACKAGE} in dpatch.make, if available Revision: dpatch--refactor--0--patch-106 * compat/dpatch.make {DPATCH_PACKAGE}: New variable. (patch): Use it. modified files: compat/dpatch.make history/algernon/ChangeLog.refactor--0 2003-11-12 13:02:24 GMT Gergely Nagy patch-105 Summary: Check for cpp before using it Revision: dpatch--refactor--0--patch-105 * dpatch/dpatch.shpp: Check for /usr/bin/cpp before trying to use it, and fail with a nice error message if not found. modified files: dpatch/dpatch.shpp history/algernon/ChangeLog.refactor--0 2003-11-12 12:55:53 GMT Gergely Nagy patch-104 Summary: TODO Revision: dpatch--refactor--0--patch-104 * TODO: New file. new files: TODO modified files: history/algernon/ChangeLog.refactor--0 2003-11-12 12:39:49 GMT Gergely Nagy patch-103 Summary: Standardised error messages Revision: dpatch--refactor--0--patch-103 All fatal error messages go to stderr, and are prefixed with "dpatch:". modified files: dpatch/dpatch.shpp dpatch/dpatch_args.shpp dpatch/dpatch_help.shpp dpatch/dpatch_lowlevel.shpp dpatch/dpatch_template.shpp history/algernon/ChangeLog.refactor--0 2003-11-12 12:32:45 GMT Gergely Nagy patch-102 Summary: Bail out early in dpatch-convert-diffgz if filterdiff is not found Revision: dpatch--refactor--0--patch-102 * scripts/dpatch-convert-diffgz: Bail out early, with a friendly error message if filterdiff is not found. modified files: history/algernon/ChangeLog.refactor--0 scripts/dpatch-convert-diffgz 2003-11-02 13:49:10 GMT Gergely Nagy patch-101 Summary: Documented --strict and --force Revision: dpatch--refactor--0--patch-101 * dpatch/dpatch_help.shpp (dpatch_help.shpp): Added --strict and --force documentation. * dpatch/dpatch.1 (GLOBAL OPTIONS): Likewise. modified files: dpatch/dpatch.1 dpatch/dpatch_help.shpp history/algernon/ChangeLog.refactor--0 2003-11-02 13:33:17 GMT Gergely Nagy patch-100 Summary: Implemented --force Revision: dpatch--refactor--0--patch-100 * dpatch/dpatch.shpp: Handle --force. * dpatch/dpatch_lowlevel.shpp (dpatch_patch_apply): Apply the patch anyway if --force is in effect. (dpatch_patch_deapply): Deapply the patch anyway if --force is in effect. modified files: dpatch/dpatch.shpp dpatch/dpatch_lowlevel.shpp history/algernon/ChangeLog.refactor--0 2003-11-02 13:28:31 GMT Gergely Nagy patch-99 Summary: Implemented --strict Revision: dpatch--refactor--0--patch-99 * dpatch/dpatch.shpp: Handle --strict. * dpatch/dpatch_lowlevel.shpp (dpatch_patch_apply): If --strict is in effect, stop on the first warning. (dpatch_patch_deapply): Likewise. modified files: dpatch/dpatch.shpp dpatch/dpatch_lowlevel.shpp history/algernon/ChangeLog.refactor--0 2003-10-22 18:04:37 GMT Gergely Nagy patch-98 Summary: Fixed `dpatch call' example Revision: dpatch--refactor--0--patch-98 * dpatch/dpatch.1 (DPATCH IN DEBIAN PACKAGES): Fixed the `dpatch call' example, we do not need a hyphen before the argument, dpatch puts it there automatically. modified files: dpatch/dpatch.1 history/algernon/ChangeLog.refactor--0 2003-10-22 18:01:37 GMT Gergely Nagy patch-97 Summary: dpatch.make(7) Revision: dpatch--refactor--0--patch-97 * config.mk (mandir): New variable. (man7dir): Likewise. (man1dir): Use ${mandir}. * compat/dpatch.make.7: New file. * compat/Makefile (install): Install dpatch.make.7. * debian/rules (install): Compress everything in man7dir too. new files: compat/dpatch.make.7 modified files: compat/Makefile config.mk debian/rules history/algernon/ChangeLog.refactor--0 2003-10-22 17:43:28 GMT Gergely Nagy patch-96 Summary: dpatch.1 fixes Revision: dpatch--refactor--0--patch-96 * dpatch/dpatch.1: Fixed the .TH line (added section argument). (SEE ALSO): Moved, so it is the last section now. modified files: dpatch/dpatch.1 history/algernon/ChangeLog.refactor--0 2003-10-22 17:39:14 GMT Gergely Nagy patch-95 Summary: Made `all' .PHONY Revision: dpatch--refactor--0--patch-95 * Makefile (.PHONY): Added `all'. modified files: Makefile history/algernon/ChangeLog.refactor--0 2003-10-22 17:37:45 GMT Gergely Nagy patch-94 Summary: Heavy manual page updates Revision: dpatch--refactor--0--patch-94 * dpatch/dpatch.1 (DPATCH IN DEBIAN PACKAGES): New section. (SEE ALSO): Likewise. modified files: dpatch/dpatch.1 history/algernon/ChangeLog.refactor--0 2003-10-22 16:56:08 GMT Gergely Nagy patch-93 Summary: Minor man page formatting changes Revision: dpatch--refactor--0--patch-93 * dpatch/dpatch.1: Added two newlines. modified files: dpatch/dpatch.1 history/algernon/ChangeLog.refactor--0 2003-10-22 16:53:34 GMT Gergely Nagy patch-92 Summary: ChangeLog-foo Revision: dpatch--refactor--0--patch-92 * ChangeLog: Moved from here... * history/dpatch/ChangeLog.refactor--0: ...to here. * debian/rules (install): Do not try to compress the toplevel changelog. new files: history/dpatch/.arch-ids/=id modified files: debian/rules history/algernon/ChangeLog.refactor--0 renamed files: ChangeLog ==> history/dpatch/ChangeLog.refactor--0 new directories: history/dpatch history/dpatch/.arch-ids 2003-10-22 16:50:24 GMT Gergely Nagy patch-91 Summary: Better version number detection Revision: dpatch--refactor--0--patch-91 Added support for using tla to detect the exact version number of dpatch. If there is no tla installed, it will be an unofficial version. modified files: Makefile config.mk dpatch/Makefile history/algernon/ChangeLog.refactor--0 2003-10-21 15:34:56 GMT Gergely Nagy patch-90 Summary: debian/ update Revision: dpatch--refactor--0--patch-90 * debian/NEWS: Added 1.99.0 entry. * debian/changelog: Updated date and version, and set distribution to experimental. * debian/control (Description): Added some blurb about the dpatch script. modified files: debian/NEWS debian/changelog debian/control history/algernon/ChangeLog.refactor--0 2003-10-21 15:25:26 GMT Gergely Nagy patch-89 Summary: make tla-release Revision: dpatch--refactor--0--patch-89 * Makefile (tla-release): New rule. modified files: Makefile history/algernon/ChangeLog.refactor--0 2003-10-19 18:58:31 GMT Gergely Nagy patch-88 Summary: star-merge with the master repository Revision: dpatch--refactor--0--patch-88 Patches applied: * dpatch@packages.qa.debian.org--archive/dpatch--refactor--0--patch-9 star-merged with algernon * dpatch@packages.qa.debian.org--archive/dpatch--refactor--0--patch-8 Star-merge with algernon@bonehunter.rulez.org--tla/dpatch--refactor--0 modified files: ChangeLog history/algernon/ChangeLog.refactor--0 new patches: dpatch@packages.qa.debian.org--archive/dpatch--refactor--0--patch-8 dpatch@packages.qa.debian.org--archive/dpatch--refactor--0--patch-9 2003-10-19 18:51:40 GMT Gergely Nagy patch-87 Summary: Document patch-template in dpatch help Revision: dpatch--refactor--0--patch-87 * dpatch/dpatch_help.shpp (dpatch_help): Documented patch-template. modified files: dpatch/dpatch_help.shpp history/algernon/ChangeLog.refactor--0 2003-10-19 18:33:50 GMT Gergely Nagy patch-86 Summary: Whitespace cleanup Revision: dpatch--refactor--0--patch-86 * dpatch/dpatch.shpp: Removed trailing whitespace. * dpatch/dpatch_help.shpp: Likewise. * dpatch/dpatch_lowlevel.shpp: Likewise. * dpatch/dpatch_args.shpp: Likewise. modified files: dpatch/dpatch.shpp dpatch/dpatch_args.shpp dpatch/dpatch_help.shpp dpatch/dpatch_lowlevel.shpp history/algernon/ChangeLog.refactor--0 2003-10-19 09:25:19 GMT Gergely Nagy patch-85 Summary: patch-template syntax change Revision: dpatch--refactor--0--patch-85 * dpatch/dpatch_template.shpp (dpatch_patch_template): Removed the patchno argument. * dpatch/dpatch_help.shpp {dpatch_help_patch_template}: Updated documentation. * dpatch/dpatch.1: Likewise. * dpatch/dpatch.shpp: Updated argument number checker to work with the new patch-template syntax. modified files: dpatch/dpatch.1 dpatch/dpatch.shpp dpatch/dpatch_help.shpp dpatch/dpatch_template.shpp history/algernon/ChangeLog.refactor--0 2003-10-19 09:17:19 GMT Gergely Nagy patch-84 Summary: Compress manual pages in the .deb Revision: dpatch--refactor--0--patch-84 * debian/rules (binary-dpatch): Compress all manual pages. modified files: debian/rules history/algernon/ChangeLog.refactor--0 2003-10-19 09:16:07 GMT Gergely Nagy patch-83 Summary: Install dpatch.1 Revision: dpatch--refactor--0--patch-83 * dpatch/Makefile (install): Install dpatch.1. modified files: dpatch/Makefile history/algernon/ChangeLog.refactor--0 2003-10-19 09:09:19 GMT Gergely Nagy patch-82 Summary: A manual page Revision: dpatch--refactor--0--patch-82 * dpatch/dpatch.1: New file. new files: dpatch/dpatch.1 modified files: history/algernon/ChangeLog.refactor--0 2003-10-19 09:06:07 GMT Gergely Nagy patch-81 Summary: Minor help message fixes Revision: dpatch--refactor--0--patch-81 * dpatch/dpatch_help.shpp {dpatch_help_custom}: Minor wording fixes. {dpatch_help_cat}: Fixed one option name. modified files: dpatch/dpatch_help.shpp history/algernon/ChangeLog.refactor--0 2003-10-19 07:57:39 GMT Gergely Nagy patch-80 Summary: dpatch status -q should exit 11 when the patch is already applied Revision: dpatch--refactor--0--patch-80 * dpatch/dpatch_lowlevel.shpp (dpatch_patch_status): Exit with 11 if ran with -q, and the patch is already applied. modified files: dpatch/dpatch_lowlevel.shpp history/algernon/ChangeLog.refactor--0 2003-10-18 23:22:40 GMT Gergely Nagy patch-79 Summary: Implement dpatch version --help & friends Revision: dpatch--refactor--0--patch-79 * dpatch/dpatch.shpp: Call dpatch_version with "$@". * dpatch/dpatch_help.shpp {dpatch_help_version}: New variable. (dpatch_version): Handle --help. * dpatch/dpatch_lowlevel.shpp (dpatch_command_map): Map `version', `--version' and `-V' to `version'. modified files: dpatch/dpatch.shpp dpatch/dpatch_help.shpp dpatch/dpatch_lowlevel.shpp history/algernon/ChangeLog.refactor--0 2003-10-18 23:16:11 GMT Gergely Nagy patch-78 Summary: Fixed patch-template argument handling Revision: dpatch--refactor--0--patch-78 * dpatch/dpatch_template.shpp (dpatch_patch_template): Fixed argument handling. modified files: dpatch/dpatch_template.shpp history/algernon/ChangeLog.refactor--0 2003-10-18 23:10:34 GMT Gergely Nagy patch-77 Summary: Fixed dpatch patch-template --help Revision: dpatch--refactor--0--patch-77 * dpatch/dpatch_template.shpp (dpatch_patch_template): Added support for handling --help. modified files: dpatch/dpatch_template.shpp history/algernon/ChangeLog.refactor--0 2003-10-18 23:06:05 GMT Gergely Nagy patch-76 Summary: Fold patch description Revision: dpatch--refactor--0--patch-76 * dpatch/dpatch_template.shpp (dpatch_patch_template): Use `fold' to wrap the patch description into sane length lines. modified files: dpatch/dpatch_template.shpp history/algernon/ChangeLog.refactor--0 2003-10-18 23:04:12 GMT Gergely Nagy patch-75 Summary: Fix $@ passing Revision: dpatch--refactor--0--patch-75 * dpatch/dpatch.shpp: Always pass $@ in double quotes. modified files: dpatch/dpatch.shpp history/algernon/ChangeLog.refactor--0 2003-10-18 19:50:03 GMT Gergely Nagy patch-74 Summary: Fixed dpatch status-all Revision: dpatch--refactor--0--patch-74 * dpatch/dpatch_lowlevel.shpp (dpatch_patch_status): Whether applied or not, return zero. * dpatch/dpatch_help.shpp {dpatch_help_status}: Removed exit status references, as they do not apply anymore. modified files: dpatch/dpatch_help.shpp dpatch/dpatch_lowlevel.shpp history/algernon/ChangeLog.refactor--0 2003-10-18 19:42:22 GMT Gergely Nagy patch-73 Summary: Fix dpatch deapply-{until,all} Revision: dpatch--refactor--0--patch-73 * dpatch/dpatch_patchset.shpp (dpatch_patchset_do): Reverse the patchlist when the command is `deapply', not when it is `unpatch' (higher level stuff passes `deapply'). modified files: dpatch/dpatch_patchset.shpp history/algernon/ChangeLog.refactor--0 2003-10-18 19:32:58 GMT Gergely Nagy patch-72 Summary: More detailed help messages Revision: dpatch--refactor--0--patch-72 * dpatch/dpatch_help.shpp {dpatch_help_apply}: Added some more details. {dpatch_help_deapply}: Likewise. {dpatch_help_custom}: Likewise. {dpatch_help_status}: Likewise. {dpatch_help_list}: Likewise. {dpatch_help_cat}: Likewise. {dpatch_help_patch_template}: Likewise. {dpatch_help_help}: Likewise. {dpatch_help_UNKNOWN}: Likewise. (dpatch_help): Upon an UNKNOWN command, return an error. modified files: dpatch/dpatch_help.shpp history/algernon/ChangeLog.refactor--0 2003-10-18 16:28:24 GMT Gergely Nagy patch-71 Summary: Documented dpatch help Revision: dpatch--refactor--0--patch-71 * dpatch/dpatch_help.shpp (dpatch_help): Documented dpatch help modified files: dpatch/dpatch_help.shpp history/algernon/ChangeLog.refactor--0 2003-10-18 16:24:51 GMT Gergely Nagy patch-70 Summary: Documented dpatch status Revision: dpatch--refactor--0--patch-70 * dpatch/dpatch_help.shpp (dpatch_help): Documented the `status' command. modified files: dpatch/dpatch_help.shpp history/algernon/ChangeLog.refactor--0 2003-10-17 11:56:04 GMT Gergely Nagy patch-69 Summary: Include more changelogs in the debian package Revision: dpatch--refactor--0--patch-69 * debian/rules: Include more changelogs in the .deb. modified files: debian/rules history/algernon/ChangeLog.refactor--0 2003-10-17 11:30:08 GMT Gergely Nagy patch-68 Summary: ChangeLog re-added Revision: dpatch--refactor--0--patch-68 * ChangeLog: New file, this time the log for dpatch@packages.qa.debian.org--archive/dpatch--refactor--0. new files: ChangeLog modified files: history/algernon/ChangeLog.refactor--0 2003-10-17 11:26:24 GMT Gergely Nagy patch-67 Summary: Star-merge with dpatch@packages.qa.debian.org--archive/dpatch--refactor--0 Revision: dpatch--refactor--0--patch-67 Patches applied: * dpatch@packages.qa.debian.org--archive/dpatch--refactor--0--patch-7 Star-merge with algernon@bonehunter.rulez.org--tla/dpatch--refactor--0 * dpatch@packages.qa.debian.org--archive/dpatch--refactor--0--patch-6 Improved build system and debianisation (merge) * dpatch@packages.qa.debian.org--archive/dpatch--refactor--0--patch-5 Merged in --with-cpp support * dpatch@packages.qa.debian.org--archive/dpatch--refactor--0--patch-4 Test commit, removing whitespace added previously * dpatch@packages.qa.debian.org--archive/dpatch--refactor--0--patch-3 Remove test directory * dpatch@packages.qa.debian.org--archive/dpatch--refactor--0--patch-2 Test commit, creating a new directory * dpatch@packages.qa.debian.org--archive/dpatch--refactor--0--patch-1 test * dpatch@packages.qa.debian.org--archive/dpatch--refactor--0--base-0 tag of algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-34 modified files: history/algernon/ChangeLog.refactor--0 new patches: dpatch@packages.qa.debian.org--archive/dpatch--refactor--0--base-0 dpatch@packages.qa.debian.org--archive/dpatch--refactor--0--patch-1 dpatch@packages.qa.debian.org--archive/dpatch--refactor--0--patch-2 dpatch@packages.qa.debian.org--archive/dpatch--refactor--0--patch-3 dpatch@packages.qa.debian.org--archive/dpatch--refactor--0--patch-4 dpatch@packages.qa.debian.org--archive/dpatch--refactor--0--patch-5 dpatch@packages.qa.debian.org--archive/dpatch--refactor--0--patch-6 dpatch@packages.qa.debian.org--archive/dpatch--refactor--0--patch-7 2003-10-17 11:22:01 GMT Gergely Nagy patch-66 Summary: ChangeLog moving foo Revision: dpatch--refactor--0--patch-66 * history/: New director. * history/algernon/: Likewise. * ChangeLog: Moved from here... * history/algernon/ChangeLog.refactor--0: ...to here. * history/algernon/ChangeLog.mainline--1: New file. new files: history/.arch-ids/=id history/algernon/.arch-ids/=id history/algernon/ChangeLog.mainline--1 modified files: ChangeLog renamed files: ChangeLog ==> history/algernon/ChangeLog.refactor--0 new directories: history history/.arch-ids history/algernon history/algernon/.arch-ids 2003-10-17 11:14:03 GMT Gergely Nagy patch-65 Summary: Add full arch revision to dpatch version Revision: dpatch--refactor--0--patch-65 * dpatch/Makefile {DPATCH_BRANCH}: New variable. {DPATCH_PATCHL}: Likewise. {DPATCH_REVISION}: Likewise. * dpatch/dpatch_help.shpp (dpatch_version): Include ${DPATCH_VERSION} in the output too. modified files: ChangeLog dpatch/Makefile dpatch/dpatch_help.shpp 2003-10-17 11:00:32 GMT Gergely Nagy patch-64 Summary: ChangeLog Revision: dpatch--refactor--0--patch-64 * ChangeLog: New file. new files: ChangeLog 2003-10-17 10:54:31 GMT Gergely Nagy patch-63 Summary: Implemented dpatch license Revision: dpatch--refactor--0--patch-63 * dpatch/dpatch_help.shpp (dpatch_license): New function. * dpatch/dpatch.shpp: Recognise the `license' command. modified files: dpatch/dpatch.shpp dpatch/dpatch_help.shpp 2003-10-17 10:45:03 GMT Gergely Nagy patch-62 Summary: dpatch.shpp comment updates Revision: dpatch--refactor--0--patch-62 * dpatch/dpatch.shpp: Updated top-level comments, to be consistent with the other shpp files. modified files: dpatch/dpatch.shpp 2003-10-17 10:37:15 GMT Gergely Nagy patch-61 Summary: Implemented dpatch status Revision: dpatch--refactor--0--patch-61 * dpatch/dpatch_lowlevel.shpp (dpatch_patch_status): New function. (dpatch_command_map): Map `status', `status-all', `status-up-to' and `status-until' to `status'. * dpatch/dpatch.shpp: Recognise the status commands. * dpatch/dpatch_help.shpp {dpatch_help_status}: New variable. modified files: dpatch/dpatch.shpp dpatch/dpatch_help.shpp dpatch/dpatch_lowlevel.shpp 2003-10-16 22:51:44 GMT Gergely Nagy patch-60 Summary: Output formatting fixes Revision: dpatch--refactor--0--patch-60 * dpatch/dpatch.shpp {DPATCH_WORKDIR}: Make it `./' instead of `.'. * dpatch/dpatch_lowlevel.shpp (dpatch_patch_apply): Output formatting fixes. (dpatch_patch_deapply): Likewise. modified files: dpatch/dpatch.shpp dpatch/dpatch_lowlevel.shpp 2003-10-16 16:00:42 GMT Gergely Nagy patch-59 Summary: Document --workdir Revision: dpatch--refactor--0--patch-59 * dpatch/dpatch_help.shpp (dpatch_help): Documented --workdir. modified files: dpatch/dpatch_help.shpp 2003-10-16 15:43:03 GMT Gergely Nagy patch-58 Summary: Implemented --workdir Revision: dpatch--refactor--0--patch-58 * dpatch/dpatch.shpp: Made it handle --workdir and friends, by setting DPATCH_WORKDIR to the appropriate value. {DPATCH_WORKDIR}: New variable. * dpatch/dpatch_lowlevel.shpp (dpatch_patch_apply): Added code to apply patches to a different directory than the current one. (Using DPATCH_WORKDIR) (dpatch_patch_deapply): Likewise. (dpatch_patch_custom): Likewise. Implemented for #209109. modified files: dpatch/dpatch.shpp dpatch/dpatch_lowlevel.shpp 2003-10-16 11:35:02 GMT Gergely Nagy patch-57 Summary: Made dpatch help --help work, for consistency's sake Revision: dpatch--refactor--0--patch-57 * dpatch/dpatch_lowlevel.shpp (dpatch_command_map): Map `--help' and `-h' to `help'. modified files: dpatch/dpatch_lowlevel.shpp 2003-10-16 11:26:20 GMT Gergely Nagy patch-56 Summary: Help gives a warning upon dpatch help somerandomstuff Revision: dpatch--refactor--0--patch-56 * dpatch/dpatch_lowlevel.shpp (dpatch_command_map): Map unmapped stuff to UNKNOWN. * dpatch/dpatch_help.shpp {dpatch_help_UNKNOWN}: New variable. modified files: dpatch/dpatch_help.shpp dpatch/dpatch_lowlevel.shpp 2003-10-16 11:21:27 GMT Gergely Nagy patch-55 Summary: Implemented dpatch help help Revision: dpatch--refactor--0--patch-55 * dpatch/dpatch_lowlevel.shpp (dpatch_command_map): Map `help' to `help'. * dpatch/dpatch_help.shpp {dpatch_help_help}: New variable. modified files: dpatch/dpatch_help.shpp dpatch/dpatch_lowlevel.shpp 2003-10-16 11:17:37 GMT Gergely Nagy patch-54 Summary: Added help text for dpatch patch-template Revision: dpatch--refactor--0--patch-54 * dpatch/dpatch_help.shpp {dpatch_help_patch_template}: New variable. modified files: dpatch/dpatch_help.shpp 2003-10-15 13:58:34 GMT Gergely Nagy patch-53 Summary: Documented aliases Revision: dpatch--refactor--0--patch-53 * dpatch/dpatch_help.shpp [dpatch_help_apply]: Documented aliases. [dpatch_help_deapply]: Likewise. modified files: dpatch/dpatch_help.shpp 2003-10-12 16:40:07 GMT Gergely Nagy patch-52 Summary: Fixed dpatch help patch-template Revision: dpatch--refactor--0--patch-52 * dpatch/dpatch_lowlevel.shpp (dpatch_command_map): Map patch-template to cmd=patch_template, so dpatch help patch-template works as expected. modified files: dpatch/dpatch_lowlevel.shpp 2003-10-12 16:30:56 GMT Gergely Nagy patch-51 Summary: Fixed dpatch help Revision: dpatch--refactor--0--patch-51 * dpatch/dpatch_help.shpp (dpatch_help_do): Fixed a typo that prevented dpatch help from working. modified files: dpatch/dpatch_help.shpp 2003-10-12 16:25:29 GMT Gergely Nagy patch-50 Summary: dpatch_command_map Revision: dpatch--refactor--0--patch-50 * dpatch/dpatch_lowlevel.shpp (dpatch_command_map): New function. * dpatch/dpatch_help.shpp (dpatch_help_do): Use it. * dpatch/dpatch.shpp: Likewise. modified files: dpatch/dpatch.shpp dpatch/dpatch_help.shpp dpatch/dpatch_lowlevel.shpp 2003-10-12 16:17:35 GMT Gergely Nagy patch-49 Summary: Added command mapping to dpatch_help_do Revision: dpatch--refactor--0--patch-49 * dpatch/dpatch_help.shpp (dpatch_help_do): Map all the different commands to their respective help messages. modified files: dpatch/dpatch_help.shpp 2003-10-12 16:09:52 GMT Gergely Nagy patch-48 Summary: help message updates Revision: dpatch--refactor--0--patch-48 * dpatch/dpatch_help.shpp [dpatch_help_custom]: Document --quiet. [dpatch_help_cat]: Likewise. modified files: dpatch/dpatch_help.shpp 2003-10-12 16:07:00 GMT Gergely Nagy patch-47 Summary: Print a friendly error message when the patch does not exist Revision: dpatch--refactor--0--patch-47 * dpatch/dpatch_lowlevel.shpp (dpatch_patch_apply): Print a friendly message when the patch does not exist. (dpatch_patch_deapply): Likewise. (dpatch_patch_custom): Likewise. (dpatch_patch_cat): Likewise. modified files: dpatch/dpatch_lowlevel.shpp 2003-10-12 15:51:23 GMT Gergely Nagy patch-46 Summary: dpatch help support Revision: dpatch--refactor--0--patch-46 * dpatch/dpatch_help.shpp (dpatch_help_cmd): New function. (dpatch_help_do): Likewise. * dpatch/dpatch.shpp: Use dpatch_help_do $@. * dpatch/dpatch_patchset.shpp (dpatch_patchset_do): Use dpatch_help_cmd ${cmd}. modified files: dpatch/dpatch.shpp dpatch/dpatch_help.shpp dpatch/dpatch_patchset.shpp 2003-10-12 15:43:26 GMT Gergely Nagy patch-45 Summary: Made dpatch --version work too Revision: dpatch--refactor--0--patch-45 * dpatch/dpatch.shpp: Made dpatch --version work too. modified files: dpatch/dpatch.shpp 2003-10-12 15:32:14 GMT Gergely Nagy patch-44 Summary: Made dpatch --help work Revision: dpatch--refactor--0--patch-44 * dpatch/dpatch.shpp: Made dpatch --help work. modified files: dpatch/dpatch.shpp 2003-10-12 15:22:35 GMT Gergely Nagy patch-43 Summary: Fixed unsupported global option error Revision: dpatch--refactor--0--patch-43 * dpatch/dpatch.shpp: Use exit, rather than return in the unsupported global option error. modified files: dpatch/dpatch.shpp 2003-10-03 22:35:01 GMT Gergely Nagy patch-42 Summary: debian/changelog-foo Revision: dpatch--refactor--0--patch-42 * debian/changelog: Started adding some very rudimentary dpatch 2.0 notes. modified files: debian/changelog 2003-10-03 22:30:05 GMT Gergely Nagy patch-41 Summary: debian/rules update Revision: dpatch--refactor--0--patch-41 * debian/rules: Removed EXAMPLES handling code - it is now done by upstream makefiles. modified files: debian/rules 2003-10-03 22:27:14 GMT Gergely Nagy patch-40 Summary: samples/ Revision: dpatch--refactor--0--patch-40 * sample.rules: Moved to samples/. * sample.rules2: Likewise. * sample.00template: Likewise. * samples/Makefile: New file. * config.mk [docdir]: New variable. [sampledir]: Likewise. * Makefile (.DEFAULT): Descend into samples/ too. new files: samples/.arch-ids/=id samples/Makefile modified files: Makefile config.mk renamed files: .arch-ids/sample.00template.id ==> samples/.arch-ids/sample.00template.id .arch-ids/sample.rules.id ==> samples/.arch-ids/sample.rules.id .arch-ids/sample.rules2.id ==> samples/.arch-ids/sample.rules2.id sample.00template ==> samples/sample.00template sample.rules ==> samples/sample.rules sample.rules2 ==> samples/sample.rules2 new directories: samples samples/.arch-ids 2003-10-03 22:16:02 GMT Gergely Nagy patch-39 Summary: debian/rules update Revision: dpatch--refactor--0--patch-39 * debian/rules (build): Made it a non-no-op rule. (install): Depend on build, and use the "upstream" makefile for most of the stuff. (clean): Use the upstream makefile to clean stuff. modified files: debian/rules 2003-10-03 22:13:38 GMT Gergely Nagy patch-38 Summary: Build system fixes Revision: dpatch--refactor--0--patch-38 * compat/Makefile: include ../config.mk. (clean): New (empty) target. * dpatch/Makefile (install): Use ${bindir}/, ie without target filename. * scripts/Makefile (clean): New (empty) target. modified files: compat/Makefile dpatch/Makefile scripts/Makefile 2003-10-03 22:05:38 GMT Gergely Nagy patch-37 Summary: *Sigh* add some tags... Revision: dpatch--refactor--0--patch-37 * compat/Makefile: Added a tag, so it gets included. * scripts/Makefile: Likewise. new files: compat/Makefile scripts/Makefile 2003-10-03 22:03:04 GMT Gergely Nagy patch-36 Summary: Improved build system Revision: dpatch--refactor--0--patch-36 * config.mk: New file. * compat/Makefile: Likewise. * scripts/Makefile: Likewise. * dpatch/Makefile (install): New target. * Makefile (.DEFAULT): Descend into compat/ and scripts/ too. new files: config.mk modified files: Makefile dpatch/Makefile 2003-10-03 21:23:04 GMT Gergely Nagy patch-35 Summary: dpatch --with-cpp Revision: dpatch--refactor--0--patch-35 * dpatch/dpatch.shpp: Added code to handle global arguments (for now, only --with-cpp). * dpatch/dpatch_patchset.shpp (dpatch_patchset_do): If DPATCH_OPTION_CPP is non-zero, filter the lists through cpp. * dpatch/dpatch_help.shpp (dpatch_help): Documented --with-cpp. modified files: dpatch/dpatch.shpp dpatch/dpatch_help.shpp dpatch/dpatch_patchset.shpp 2003-10-03 18:52:17 GMT Gergely Nagy patch-34 Summary: patch-log-foo Revision: dpatch--refactor--0--patch-34 Removed EElf's patch-log, since that tree was blown away and recreated in the mean time. 2003-10-03 10:33:03 GMT Gergely Nagy patch-33 Summary: dpatch_patch_cat featuritis updatis Revision: dpatch--refactor--0--patch-33 * dpatch/dpatch_lowlevel.shpp (dpatch_patch_cat): Implemented --no-meta|--desc-only, --author-only and --no-desc options. * dpatch/dpatch_help.shpp [dpatch_help_cat]: Updated accordingly. modified files: dpatch/dpatch_help.shpp dpatch/dpatch_lowlevel.shpp 2003-10-03 10:21:49 GMT Gergely Nagy patch-32 Summary: dpatch_patchset_do interface change Revision: dpatch--refactor--0--patch-32 * dpatch/dpatch_patchset.shpp (dpatch_patchset_do): Take a new argument: is_single. If it is non-zero, we do not add new patches to the list, but use only the specified ones. * dpatch/dpatch.shpp: Updated for the new dpatch_patchset_do() interface. Call it with is_single=0 on all -until, -up-to and -all commands, is_single=1 on simple ones. modified files: dpatch/dpatch.shpp dpatch/dpatch_patchset.shpp 2003-10-03 10:12:41 GMT Gergely Nagy patch-31 Summary: Added dpatch cat --author-only Revision: dpatch--refactor--0--patch-31 * dpatch/dpatch_lowlevel.shpp (dpatch_patch_cat): Support an --author-only option too. modified files: dpatch/dpatch_lowlevel.shpp 2003-10-03 10:05:00 GMT Gergely Nagy patch-30 Summary: dpatch-convert-diffgz ported to new dpatch Revision: dpatch--refactor--0--patch-30 * dpatch-convert-diffgz: Moved from here... * scripts/dpatch-convert-diffgz: ...to here, and ported over to use the new /usr/bin/dpatch. * dpatch-convert-diffgz.1: Moved from here... * scripts/dpatch-convert-diffgz.1: ...to here. modified files: scripts/dpatch-convert-diffgz renamed files: dpatch-convert-diffgz ==> scripts/dpatch-convert-diffgz dpatch-convert-diffgz.1 ==> scripts/dpatch-convert-diffgz.1 2003-10-03 09:56:34 GMT Gergely Nagy patch-29 Summary: dpatch patch-template Revision: dpatch--refactor--0--patch-29 * dpatch/dpatch_template.shpp: New file. * dpatch/dpatch.shpp: #:include dpatch_template.shpp; Added a `patch-template' command. * dpatch/Makefile (dpatch): Added dpatch_template.shpp to the list of prerequisites. new files: dpatch/dpatch_template.shpp modified files: dpatch/Makefile dpatch/dpatch.shpp 2003-10-03 09:43:09 GMT Gergely Nagy patch-28 Summary: Added a top-level Makefile Revision: dpatch--refactor--0--patch-28 * Makefile: New file. new files: Makefile 2003-10-03 09:41:19 GMT Gergely Nagy patch-27 Summary: Notify the user if there is no help for a command Revision: dpatch--refactor--0--patch-27 * dpatch/dpatch_patchset.shpp (dpatch_patchset_do): When there is no help text for a given command, and we got a --help option, tell that to the user instead of exiting quickly. modified files: dpatch/dpatch_patchset.shpp 2003-10-03 09:37:03 GMT Gergely Nagy patch-26 Summary: --help, -h, --version and -V handling Revision: dpatch--refactor--0--patch-26 * dpatch/dpatch.shpp: Made --help and -h an alias for help, -V and --version for version. modified files: dpatch/dpatch.shpp 2003-10-03 09:35:19 GMT Gergely Nagy patch-25 Summary: Implemented `dpatch call' Revision: dpatch--refactor--0--patch-25 * dpatch/dpatch.shpp: Added code to recognise and handle the `call' command. * dpatch/dpatch_help.shpp [dpatch_help_custom]: New help text. (dpatch_help): Documented `dpatch call'. * dpatch/dpatch_lowlevel.shpp (dpatch_patch_custom): New function. modified files: dpatch/dpatch.shpp dpatch/dpatch_help.shpp dpatch/dpatch_lowlevel.shpp 2003-10-03 09:04:08 GMT Gergely Nagy patch-24 Summary: Added `dpatch version' Revision: dpatch--refactor--0--patch-24 * dpatch/dpatch.shpp: Handle `dpatch version'. * dpatch/dpatch_help.shpp (dpatch_help): Document `dpatch version'. (dpatch_version): New function. modified files: dpatch/dpatch.shpp dpatch/dpatch_help.shpp 2003-10-03 08:59:09 GMT Gergely Nagy patch-23 Summary: Help message update Revision: dpatch--refactor--0--patch-23 * dpatch/dpatch_help.shpp (dpatch_help): Added a few words about each command. modified files: dpatch/dpatch_help.shpp 2003-10-03 08:53:41 GMT Gergely Nagy patch-22 Summary: patch-stamp formatting fix Revision: dpatch--refactor--0--patch-22 * compat/dpatch.make (patch-stamp): Put a newline after the first one (echoed to patch-stampT). modified files: compat/dpatch.make 2003-10-03 08:50:34 GMT Gergely Nagy patch-21 Summary: Restored --sourcedir support for dpatch-list-patch Revision: dpatch--refactor--0--patch-21 * scripts/dpatch-list-patch: cd to ${DPLP_SRCDIR} before calling dpatch. modified files: scripts/dpatch-list-patch 2003-10-03 08:47:44 GMT Gergely Nagy patch-20 Summary: dpatch_patch_apply() cleanup Revision: dpatch--refactor--0--patch-20 * dpatch/dpatch_lowlevel.shpp (dpatch_patch_apply): Removed the `author' variable, as it is not used anymore. modified files: dpatch/dpatch_lowlevel.shpp 2003-10-03 08:45:24 GMT Gergely Nagy patch-19 Summary: dpatch.make update Revision: dpatch--refactor--0--patch-19 * compat/dpatch.make (patch): Use dpatch cat${DPATCH_ALL} to generate patch-stampT, as apply does not do that anymore. modified files: compat/dpatch.make 2003-10-03 08:30:34 GMT Gergely Nagy patch-18 Summary: dpatch_lowlevel.shpp reordering Revision: dpatch--refactor--0--patch-18 * dpatch/dpatch_lowlevel.shpp (dpatch_patch_deapply): Moved way up, just after dpatch_patch_apply(), so that related functions are kept together. modified files: dpatch/dpatch_lowlevel.shpp 2003-10-03 08:29:22 GMT Gergely Nagy patch-17 Summary: Print status messages to STDOUT, nuke dpatch_error Revision: dpatch--refactor--0--patch-17 * dpatch/dpatch_lowlevel.shpp (dpatch_patch_apply): Use echo and return 1 instead of dpatch_error (which doesn't exist). And output status messages to STDOUT rather than STDERR. (dpatch_patch_list): Likewise. (dpatch_patch_cat): Likewise. (dpatch_patch_deapply): Likewise. modified files: dpatch/dpatch_lowlevel.shpp 2003-10-02 21:33:43 GMT Gergely Nagy patch-16 Summary: Reverted EElf's changes Revision: dpatch--refactor--0--patch-16 Reverted EElf's changes modified files: sample.00template 2003-10-02 21:32:01 GMT Gergely Nagy patch-15 Summary: Star merged with EElf Revision: dpatch--refactor--0--patch-15 Star merged with EElf Patches applied: * david@eelf.ddts.net--debian/dpatch--eelf--0--base-0 tag of algernon@bonehunter.rulez.org--tla/dpatch--refactor--0--patch-14 * david@eelf.ddts.net--debian/dpatch--eelf--0--patch-1 Whitespace change to test commit modified files: sample.00template new patches: david@eelf.ddts.net--debian/dpatch--eelf--0--base-0 david@eelf.ddts.net--debian/dpatch--eelf--0--patch-1 2003-10-02 21:10:29 GMT Gergely Nagy patch-14 Summary: Nuke --silent and stuff Revision: dpatch--refactor--0--patch-14 * dpatch/dpatch_help.shpp: Removed --silent help texts. * dpatch/dpatch_lowlevel.shpp (dpatch_patch_apply): Do not print anything to stdout, and remove --silent. (dpatch_patch_deapply): Remove --silent. modified files: dpatch/dpatch_help.shpp dpatch/dpatch_lowlevel.shpp 2003-10-02 11:01:55 GMT Gergely Nagy patch-13 Summary: Moved dpatch.make to compat/ Revision: dpatch--refactor--0--patch-13 * dpatch.make: Moved to... * compat/dpatch.make: ...here. new files: compat/.arch-ids/=id renamed files: dpatch.make ==> compat/dpatch.make new directories: compat compat/.arch-ids 2003-10-02 11:00:55 GMT Gergely Nagy patch-12 Summary: Fixed dpatch_arg_cmd_help Revision: dpatch--refactor--0--patch-12 * dpatch/dpatch_args.shpp (dpatch_arg_cmd_help): Initialise `h' to zero. So we're guaranteed to have a numeric output. modified files: dpatch/dpatch_args.shpp 2003-10-02 10:58:00 GMT Gergely Nagy patch-11 Summary: Converted dpatch-list-patch to use /usr/bin/dpatch Revision: dpatch--refactor--0--patch-11 * dpatch-list-patch: Moved from here... * scripts/dpatch-list-patch: ...to here, and converted to use /usr/bin/dpatch. * dpatch-list-patch.1: Moved from here... * scripts/dpatch-list-patch.1: ...to here. new files: scripts/.arch-ids/=id modified files: scripts/dpatch-list-patch renamed files: dpatch-list-patch ==> scripts/dpatch-list-patch dpatch-list-patch.1 ==> scripts/dpatch-list-patch.1 new directories: scripts scripts/.arch-ids 2003-10-02 10:44:53 GMT Gergely Nagy patch-10 Summary: Fixed =tagging-method Revision: dpatch--refactor--0--patch-10 * {arch}/=tagging-method: Use untagged-source. This means... * dpatch/dpatch: ...that this is gone for real. removed files: dpatch/dpatch modified files: {arch}/=tagging-method 2003-10-02 10:41:49 GMT Gergely Nagy patch-9 Summary: Factored dpatch/dpatch into smaller chunks Revision: dpatch--refactor--0--patch-9 * dpatch/dpatch: Renamed to... * dpatch/dpatch.shpp: ...this, and refactored into... * dpatch/dpatch_args.shpp: ...this, * dpatch/dpatch_help.shpp: this, * dpatch/dpatch_lowlevel.shpp: this, * dpatch/dpatch_patchset.shpp: and this. * dpatch/Makefile: New file. * build-tools/shpp.awk: New file (from Miles Bader's tla-tools package). new files: build-tools/.arch-ids/=id build-tools/shpp.awk dpatch/Makefile dpatch/dpatch dpatch/dpatch_args.shpp dpatch/dpatch_help.shpp dpatch/dpatch_lowlevel.shpp dpatch/dpatch_patchset.shpp modified files: dpatch/dpatch.shpp renamed files: dpatch/dpatch ==> dpatch/dpatch.shpp new directories: build-tools build-tools/.arch-ids 2003-10-02 10:17:19 GMT Gergely Nagy patch-8 Summary: Implemented --help for all commands Revision: dpatch--refactor--0--patch-8 * dpatch/dpatch: Implemented --help for all commands. modified files: dpatch/dpatch 2003-10-02 09:46:14 GMT Gergely Nagy patch-7 Summary: Implemented --option parsing Revision: dpatch--refactor--0--patch-7 * dpatch/dpatch: Added infrastructure for parsing --options for individual commands. Added --quiet and --silence for apply/unapply and --no-author to cat. modified files: dpatch/dpatch 2003-10-02 09:09:06 GMT Gergely Nagy patch-6 Summary: Print help upon lack of arguments Revision: dpatch--refactor--0--patch-6 * dpatch/dpatch: If we have no arguments, or an invalid one, print help. modified files: dpatch/dpatch 2003-10-02 09:04:39 GMT Gergely Nagy patch-5 Summary: Some reordering of command parsing Revision: dpatch--refactor--0--patch-5 * dpatch/dpatch: Reordered command parsing - put the stuff in groups, and place a comment before each group. modified files: dpatch/dpatch 2003-10-02 09:00:24 GMT Gergely Nagy patch-4 Summary: list & cat separation Revision: dpatch--refactor--0--patch-4 * dpatch/dpatch (dpatch_patch_list): Rewritten to be a completely different command. Old one renamed to... (dpatch_patch_cat): ...this. All users updated, just like the main option parsing code. modified files: dpatch/dpatch 2003-09-08 20:53:37 GMT Gergely Nagy patch-3 Summary: dpatch.make converted to use dpatch Revision: dpatch--refactor--0--patch-3 * dpatch.make: Converted to use dpatch. modified files: dpatch.make 2003-09-08 20:49:47 GMT Gergely Nagy patch-2 Summary: Oops, added dpatch/ too, explicitly. Revision: dpatch--refactor--0--patch-2 Oops, added dpatch/ too, explicitly. new files: dpatch/.arch-ids/=id renamed files: dpatch/dpatch ==> dpatch/dpatch new directories: dpatch dpatch/.arch-ids removed directories: dpatch 2003-09-08 20:48:52 GMT Gergely Nagy patch-1 Summary: dpatch/dpatch Revision: dpatch--refactor--0--patch-1 * dpatch/dpatch: New file, containing the current functionality of dpatch, and more. new files: dpatch/dpatch new directories: dpatch 2003-09-08 18:03:15 GMT Gergely Nagy base-0 Summary: tag of algernon@bonehunter.rulez.org--tla/dpatch--mainline--1--patch-27 Revision: dpatch--refactor--0--base-0 (automatically generated log message) new patches: algernon@bonehunter.rulez.org--tla/dpatch--mainline--1--base-0 algernon@bonehunter.rulez.org--tla/dpatch--mainline--1--patch-1 algernon@bonehunter.rulez.org--tla/dpatch--mainline--1--patch-2 algernon@bonehunter.rulez.org--tla/dpatch--mainline--1--patch-3 algernon@bonehunter.rulez.org--tla/dpatch--mainline--1--patch-4 algernon@bonehunter.rulez.org--tla/dpatch--mainline--1--patch-5 algernon@bonehunter.rulez.org--tla/dpatch--mainline--1--patch-6 algernon@bonehunter.rulez.org--tla/dpatch--mainline--1--patch-7 algernon@bonehunter.rulez.org--tla/dpatch--mainline--1--patch-8 algernon@bonehunter.rulez.org--tla/dpatch--mainline--1--patch-9 algernon@bonehunter.rulez.org--tla/dpatch--mainline--1--patch-10 algernon@bonehunter.rulez.org--tla/dpatch--mainline--1--patch-11 algernon@bonehunter.rulez.org--tla/dpatch--mainline--1--patch-12 algernon@bonehunter.rulez.org--tla/dpatch--mainline--1--patch-13 algernon@bonehunter.rulez.org--tla/dpatch--mainline--1--patch-14 algernon@bonehunter.rulez.org--tla/dpatch--mainline--1--patch-15 algernon@bonehunter.rulez.org--tla/dpatch--mainline--1--patch-16 algernon@bonehunter.rulez.org--tla/dpatch--mainline--1--patch-17 algernon@bonehunter.rulez.org--tla/dpatch--mainline--1--patch-18 algernon@bonehunter.rulez.org--tla/dpatch--mainline--1--patch-19 algernon@bonehunter.rulez.org--tla/dpatch--mainline--1--patch-20 algernon@bonehunter.rulez.org--tla/dpatch--mainline--1--patch-21 algernon@bonehunter.rulez.org--tla/dpatch--mainline--1--patch-22 algernon@bonehunter.rulez.org--tla/dpatch--mainline--1--patch-23 algernon@bonehunter.rulez.org--tla/dpatch--mainline--1--patch-24 algernon@bonehunter.rulez.org--tla/dpatch--mainline--1--patch-25 algernon@bonehunter.rulez.org--tla/dpatch--mainline--1--patch-26 algernon@bonehunter.rulez.org--tla/dpatch--mainline--1--patch-27 dpatch/history/algernon/ChangeLog.mainline--10000644000000000000000000003774111621425704016313 0ustar # do not edit -- automatically generated by arch changelog # arch-tag: automatic-ChangeLog--algernon@bonehunter.rulez.org--tla/dpatch--mainline--1 # 2003-09-08 17:57:56 GMT Gergely Nagy patch-27 Summary: Switched to tagline tagging method. Revision: dpatch--mainline--1--patch-27 Switched to tagline tagging method. new files: .arch-ids/README.History.id .arch-ids/README.id .arch-ids/sample.00template.id .arch-ids/sample.rules.id .arch-ids/sample.rules2.id README README.History debian/.arch-ids/=id debian/.arch-ids/NEWS.id debian/.arch-ids/changelog.id debian/.arch-ids/control.id debian/.arch-ids/copyright.id debian/NEWS debian/changelog debian/control debian/copyright debian/rules dpatch-convert-diffgz dpatch-convert-diffgz.1 dpatch-edit-patch dpatch-edit-patch.1 dpatch-edit-patch.functions dpatch-list-patch dpatch-list-patch.1 dpatch.make dpatch_edit_patch.bash_completion.d sample.00template sample.rules sample.rules2 removed files: README README.History debian/NEWS debian/changelog debian/control debian/copyright debian/rules dpatch-convert-diffgz dpatch-convert-diffgz.1 dpatch-edit-patch dpatch-edit-patch.1 dpatch-edit-patch.functions dpatch-list-patch dpatch-list-patch.1 dpatch.make dpatch_edit_patch.bash_completion.d sample.00template sample.rules sample.rules2 {arch}/.arch-project-tree {arch}/=tagging-method {arch}/dpatch/dpatch--mainline/dpatch--mainline--1/algernon@bonehunter.rulez.org--tla/patch-log/base-0 {arch}/dpatch/dpatch--mainline/dpatch--mainline--1/algernon@bonehunter.rulez.org--tla/patch-log/patch-1 {arch}/dpatch/dpatch--mainline/dpatch--mainline--1/algernon@bonehunter.rulez.org--tla/patch-log/patch-10 {arch}/dpatch/dpatch--mainline/dpatch--mainline--1/algernon@bonehunter.rulez.org--tla/patch-log/patch-11 {arch}/dpatch/dpatch--mainline/dpatch--mainline--1/algernon@bonehunter.rulez.org--tla/patch-log/patch-12 {arch}/dpatch/dpatch--mainline/dpatch--mainline--1/algernon@bonehunter.rulez.org--tla/patch-log/patch-13 {arch}/dpatch/dpatch--mainline/dpatch--mainline--1/algernon@bonehunter.rulez.org--tla/patch-log/patch-14 {arch}/dpatch/dpatch--mainline/dpatch--mainline--1/algernon@bonehunter.rulez.org--tla/patch-log/patch-15 {arch}/dpatch/dpatch--mainline/dpatch--mainline--1/algernon@bonehunter.rulez.org--tla/patch-log/patch-16 {arch}/dpatch/dpatch--mainline/dpatch--mainline--1/algernon@bonehunter.rulez.org--tla/patch-log/patch-17 {arch}/dpatch/dpatch--mainline/dpatch--mainline--1/algernon@bonehunter.rulez.org--tla/patch-log/patch-18 {arch}/dpatch/dpatch--mainline/dpatch--mainline--1/algernon@bonehunter.rulez.org--tla/patch-log/patch-19 {arch}/dpatch/dpatch--mainline/dpatch--mainline--1/algernon@bonehunter.rulez.org--tla/patch-log/patch-2 {arch}/dpatch/dpatch--mainline/dpatch--mainline--1/algernon@bonehunter.rulez.org--tla/patch-log/patch-20 {arch}/dpatch/dpatch--mainline/dpatch--mainline--1/algernon@bonehunter.rulez.org--tla/patch-log/patch-21 {arch}/dpatch/dpatch--mainline/dpatch--mainline--1/algernon@bonehunter.rulez.org--tla/patch-log/patch-22 {arch}/dpatch/dpatch--mainline/dpatch--mainline--1/algernon@bonehunter.rulez.org--tla/patch-log/patch-23 {arch}/dpatch/dpatch--mainline/dpatch--mainline--1/algernon@bonehunter.rulez.org--tla/patch-log/patch-24 {arch}/dpatch/dpatch--mainline/dpatch--mainline--1/algernon@bonehunter.rulez.org--tla/patch-log/patch-25 {arch}/dpatch/dpatch--mainline/dpatch--mainline--1/algernon@bonehunter.rulez.org--tla/patch-log/patch-26 {arch}/dpatch/dpatch--mainline/dpatch--mainline--1/algernon@bonehunter.rulez.org--tla/patch-log/patch-3 {arch}/dpatch/dpatch--mainline/dpatch--mainline--1/algernon@bonehunter.rulez.org--tla/patch-log/patch-4 {arch}/dpatch/dpatch--mainline/dpatch--mainline--1/algernon@bonehunter.rulez.org--tla/patch-log/patch-5 {arch}/dpatch/dpatch--mainline/dpatch--mainline--1/algernon@bonehunter.rulez.org--tla/patch-log/patch-6 {arch}/dpatch/dpatch--mainline/dpatch--mainline--1/algernon@bonehunter.rulez.org--tla/patch-log/patch-7 {arch}/dpatch/dpatch--mainline/dpatch--mainline--1/algernon@bonehunter.rulez.org--tla/patch-log/patch-8 {arch}/dpatch/dpatch--mainline/dpatch--mainline--1/algernon@bonehunter.rulez.org--tla/patch-log/patch-9 new directories: .arch-ids debian debian/.arch-ids removed directories: debian {arch} {arch}/dpatch {arch}/dpatch/dpatch--mainline {arch}/dpatch/dpatch--mainline/dpatch--mainline--1 {arch}/dpatch/dpatch--mainline/dpatch--mainline--1/algernon@bonehunter.rulez.org--tla {arch}/dpatch/dpatch--mainline/dpatch--mainline--1/algernon@bonehunter.rulez.org--tla/patch-log new patches: algernon@bonehunter.rulez.org--tla/dpatch--mainline--1--base-0 algernon@bonehunter.rulez.org--tla/dpatch--mainline--1--patch-1 algernon@bonehunter.rulez.org--tla/dpatch--mainline--1--patch-2 algernon@bonehunter.rulez.org--tla/dpatch--mainline--1--patch-3 algernon@bonehunter.rulez.org--tla/dpatch--mainline--1--patch-4 algernon@bonehunter.rulez.org--tla/dpatch--mainline--1--patch-5 algernon@bonehunter.rulez.org--tla/dpatch--mainline--1--patch-6 algernon@bonehunter.rulez.org--tla/dpatch--mainline--1--patch-7 algernon@bonehunter.rulez.org--tla/dpatch--mainline--1--patch-8 algernon@bonehunter.rulez.org--tla/dpatch--mainline--1--patch-9 algernon@bonehunter.rulez.org--tla/dpatch--mainline--1--patch-10 algernon@bonehunter.rulez.org--tla/dpatch--mainline--1--patch-11 algernon@bonehunter.rulez.org--tla/dpatch--mainline--1--patch-12 algernon@bonehunter.rulez.org--tla/dpatch--mainline--1--patch-13 algernon@bonehunter.rulez.org--tla/dpatch--mainline--1--patch-14 algernon@bonehunter.rulez.org--tla/dpatch--mainline--1--patch-15 algernon@bonehunter.rulez.org--tla/dpatch--mainline--1--patch-16 algernon@bonehunter.rulez.org--tla/dpatch--mainline--1--patch-17 algernon@bonehunter.rulez.org--tla/dpatch--mainline--1--patch-18 algernon@bonehunter.rulez.org--tla/dpatch--mainline--1--patch-19 algernon@bonehunter.rulez.org--tla/dpatch--mainline--1--patch-20 algernon@bonehunter.rulez.org--tla/dpatch--mainline--1--patch-21 algernon@bonehunter.rulez.org--tla/dpatch--mainline--1--patch-22 algernon@bonehunter.rulez.org--tla/dpatch--mainline--1--patch-23 algernon@bonehunter.rulez.org--tla/dpatch--mainline--1--patch-24 algernon@bonehunter.rulez.org--tla/dpatch--mainline--1--patch-25 algernon@bonehunter.rulez.org--tla/dpatch--mainline--1--patch-26 2003-09-08 17:49:55 GMT Gergely Nagy patch-26 Summary: Updated Standards-Version Revision: dpatch--mainline--1--patch-26 * debian/control (Standards-Version): Bumped to 3.6.1. modified files: debian/control 2003-09-08 16:54:46 GMT Gergely Nagy patch-25 Summary: Updated from Alioth CVS HEAD. Revision: dpatch--mainline--1--patch-25 Updated from Alioth CVS HEAD. modified files: debian/changelog 2003-09-08 16:52:26 GMT Gergely Nagy patch-24 Summary: Updated from Alioth CVS, debian_version_1_24. Revision: dpatch--mainline--1--patch-24 Updated from Alioth CVS, debian_version_1_24. modified files: debian/changelog dpatch-edit-patch 2003-09-08 16:52:15 GMT Gergely Nagy patch-23 Summary: Updated from Alioth CVS, debian_version_1_23. Revision: dpatch--mainline--1--patch-23 Updated from Alioth CVS, debian_version_1_23. new files: debian/NEWS modified files: README debian/changelog debian/rules dpatch-list-patch dpatch.make 2003-09-08 16:52:04 GMT Gergely Nagy patch-22 Summary: Updated from Alioth CVS, debian_version_1_22. Revision: dpatch--mainline--1--patch-22 Updated from Alioth CVS, debian_version_1_22. modified files: debian/changelog dpatch.make 2003-09-08 16:51:38 GMT Gergely Nagy patch-21 Summary: Updated from Alioth CVS, debian_version_1_21. Revision: dpatch--mainline--1--patch-21 Updated from Alioth CVS, debian_version_1_21. modified files: debian/changelog dpatch-convert-diffgz dpatch-edit-patch dpatch-edit-patch.functions dpatch.make 2003-09-08 16:51:28 GMT Gergely Nagy patch-20 Summary: Updated from Alioth CVS, debian_version_1_20. Revision: dpatch--mainline--1--patch-20 Updated from Alioth CVS, debian_version_1_20. new files: sample.00template modified files: debian/changelog debian/control debian/rules dpatch-convert-diffgz dpatch-edit-patch dpatch-edit-patch.1 dpatch-edit-patch.functions dpatch-list-patch dpatch.make 2003-09-08 16:51:17 GMT Gergely Nagy patch-19 Summary: Updated from Alioth CVS, debian_version_1_19. Revision: dpatch--mainline--1--patch-19 Updated from Alioth CVS, debian_version_1_19. new files: dpatch_edit_patch.bash_completion.d modified files: README debian/changelog debian/rules dpatch-convert-diffgz dpatch-edit-patch dpatch-edit-patch.1 dpatch-list-patch dpatch.make 2003-09-08 16:51:06 GMT Gergely Nagy patch-18 Summary: Updated from Alioth CVS, debian_version_1_18. Revision: dpatch--mainline--1--patch-18 Updated from Alioth CVS, debian_version_1_18. modified files: README debian/changelog dpatch-edit-patch.1 2003-09-08 16:50:54 GMT Gergely Nagy patch-17 Summary: Updated from Alioth CVS, debian_version_1_17. Revision: dpatch--mainline--1--patch-17 Updated from Alioth CVS, debian_version_1_17. new files: dpatch-edit-patch.functions modified files: README debian/changelog debian/control debian/rules dpatch-edit-patch dpatch-edit-patch.1 dpatch.make sample.rules sample.rules2 2003-09-08 16:50:39 GMT Gergely Nagy patch-16 Summary: Updated from Alioth CVS, debian_version_1_16. Revision: dpatch--mainline--1--patch-16 Updated from Alioth CVS, debian_version_1_16. modified files: README debian/changelog debian/copyright dpatch.make sample.rules2 2003-09-08 16:50:29 GMT Gergely Nagy patch-15 Summary: Updated from Alioth CVS, debian_version_1_15. Revision: dpatch--mainline--1--patch-15 Updated from Alioth CVS, debian_version_1_15. modified files: debian/changelog debian/control dpatch-edit-patch dpatch-edit-patch.1 2003-09-08 16:50:19 GMT Gergely Nagy patch-14 Summary: Updated from Alioth CVS, debian_version_1_14. Revision: dpatch--mainline--1--patch-14 Updated from Alioth CVS, debian_version_1_14. modified files: debian/changelog dpatch-convert-diffgz dpatch-edit-patch.1 2003-09-08 16:50:09 GMT Gergely Nagy patch-13 Summary: Updated from Alioth CVS, debian_version_1_13. Revision: dpatch--mainline--1--patch-13 Updated from Alioth CVS, debian_version_1_13. modified files: README README.History debian/changelog dpatch-edit-patch dpatch-edit-patch.1 dpatch.make sample.rules sample.rules2 2003-09-08 16:50:00 GMT Gergely Nagy patch-12 Summary: Updated from Alioth CVS, debian_version_1_12. Revision: dpatch--mainline--1--patch-12 Updated from Alioth CVS, debian_version_1_12. modified files: README debian/changelog dpatch-list-patch 2003-09-08 16:49:50 GMT Gergely Nagy patch-11 Summary: Updated from Alioth CVS, debian_version_1_11. Revision: dpatch--mainline--1--patch-11 Updated from Alioth CVS, debian_version_1_11. modified files: debian/changelog dpatch.make 2003-09-08 16:49:41 GMT Gergely Nagy patch-10 Summary: Updated from Alioth CVS, debian_version_1_10. Revision: dpatch--mainline--1--patch-10 Updated from Alioth CVS, debian_version_1_10. modified files: README debian/changelog dpatch-list-patch 2003-09-08 16:49:32 GMT Gergely Nagy patch-9 Summary: Updated from Alioth CVS, debian_version_1_9. Revision: dpatch--mainline--1--patch-9 Updated from Alioth CVS, debian_version_1_9. modified files: debian/changelog dpatch-edit-patch 2003-09-08 16:49:23 GMT Gergely Nagy patch-8 Summary: Updated from Alioth CVS, debian_version_1_8. Revision: dpatch--mainline--1--patch-8 Updated from Alioth CVS, debian_version_1_8. modified files: debian/changelog debian/control 2003-09-08 16:49:13 GMT Gergely Nagy patch-7 Summary: Updated from Alioth CVS, debian_version_1_7. Revision: dpatch--mainline--1--patch-7 Updated from Alioth CVS, debian_version_1_7. new files: dpatch-convert-diffgz dpatch-convert-diffgz.1 modified files: README debian/changelog debian/control debian/copyright debian/rules dpatch-edit-patch dpatch-list-patch dpatch.make 2003-09-08 16:49:03 GMT Gergely Nagy patch-6 Summary: Updated from Alioth CVS, debian_version_1_6. Revision: dpatch--mainline--1--patch-6 Updated from Alioth CVS, debian_version_1_6. new files: dpatch-list-patch dpatch-list-patch.1 modified files: debian/changelog debian/rules dpatch-edit-patch dpatch-edit-patch.1 2003-09-08 16:48:54 GMT Gergely Nagy patch-5 Summary: Updated from Alioth CVS, debian_version_1_5. Revision: dpatch--mainline--1--patch-5 Updated from Alioth CVS, debian_version_1_5. modified files: README debian/changelog debian/control 2003-09-08 16:48:45 GMT Gergely Nagy patch-4 Summary: Updated from Alioth CVS, debian_version_1_4. Revision: dpatch--mainline--1--patch-4 Updated from Alioth CVS, debian_version_1_4. modified files: debian/changelog dpatch-edit-patch sample.rules2 2003-09-08 16:48:37 GMT Gergely Nagy patch-3 Summary: Updated from Alioth CVS, debian_version_1_3. Revision: dpatch--mainline--1--patch-3 Updated from Alioth CVS, debian_version_1_3. modified files: README debian/changelog dpatch-edit-patch 2003-09-08 16:48:28 GMT Gergely Nagy patch-2 Summary: Updated from Alioth CVS, debian_version_1_2. Revision: dpatch--mainline--1--patch-2 Updated from Alioth CVS, debian_version_1_2. modified files: README debian/changelog debian/control 2003-09-08 16:48:19 GMT Gergely Nagy patch-1 Summary: Updated from Alioth CVS, debian_version_1_1. Revision: dpatch--mainline--1--patch-1 Updated from Alioth CVS, debian_version_1_1. modified files: debian/changelog dpatch-edit-patch dpatch-edit-patch.1 2003-09-08 16:47:54 GMT Gergely Nagy base-0 Summary: Imported from Alioth CVS, debian_version_1_0. Revision: dpatch--mainline--1--base-0 Imported from Alioth CVS, debian_version_1_0. new files: README README.History debian/changelog debian/control debian/copyright debian/rules dpatch-edit-patch dpatch-edit-patch.1 dpatch.make sample.rules sample.rules2 dpatch/tests/0000755000000000000000000000000011621616704010355 5ustar dpatch/tests/15_dpatch_apply_with_error.sh0000755000000000000000000000117311621425704016135 0ustar #!/bin/bash ##: create two patches that conflict, and make sure applying both fails. set -e cd $PKGPATH cat debian/patches/00list echo 'echo one-patch > 10 ' | dpatch-edit-patch 05_conflicting1.dpatch echo 'echo two-patch > 10 ' | dpatch-edit-patch 05_conflicting2.dpatch cat < debian/patches/00list 05_conflicting1 05_conflicting2 EOF if dpatch apply-all ; then exit 1 else : fi dpatch deapply-all # make sure -v doesn't change behavior. if dpatch apply-all -v ; then exit 1 else : fi dpatch deapply-all -v # put them back. cat < debian/patches/00list 01_edpatch 02_another 03_description EOF dpatch/tests/06_dpatch_edit_patch_description.sh0000755000000000000000000000144211621425704017252 0ustar #!/bin/bash # Junichi Uekawa 21 June 2005. ##: check to see if '-d' command-line option works at all. ##: This didn't work in 2.0.13, since 'dpatch_template_hardcoded' doesn't call 'dpatch' with the description. set -e cd $PKGPATH #make sure it's unpatched debian/rules unpatch echo 'echo Modification > desc ' | \ dpatch-edit-patch -d 'Description of this patch' 03_description echo 03_description >> debian/patches/00list debian/rules patch echo '=== check file contains the right content' [ `cat desc` = Modification ] debian/rules unpatch echo '=== check file does not exist' [ ! -f desc ] echo '=== check the description' grep 'Description of this patch' debian/patches/03_description.dpatch echo '=== check the filename' grep '^##.*\.dpatch by ' debian/patches/03_description.dpatch dpatch/tests/02_create_patch.sh0000755000000000000000000000171511621425704013641 0ustar #!/bin/bash ##: check generation of initial patch ##: Bug#321320: also check the generated patch file # Junichi Uekawa 19 June 2005, updated 6 Aug 2005. set -e cd $PKGPATH echo 'echo this-is-a-line > one1 ' | dpatch-edit-patch 01_edpatch echo 01_edpatch > debian/patches/00list debian/rules patch echo '=== check file one1 contains the right content' [ `cat one1` = this-is-a-line ] debian/rules unpatch echo '=== check file one1 does not exist' [ ! -f one1 ] # additional checks; try creating a patch file. echo "cp -p ${SOURCE_DIR}/02_create_patch.sh . " | dpatch-edit-patch 02_create_two cp debian/patches/02_create_two.dpatch{,~~} echo "exit 0" | dpatch-edit-patch 02_create_two # 'patch' will update the timestamp. The following command # should output '11', not 0. if diff -u debian/patches/02_create_two.dpatch{~~,} > /dev/null; then : else echo 'diff gives zero output; date should have changed' cat debian/patches/02_create_two.dpatch{~~,} fi dpatch/tests/05_edit_with_patched.sh0000755000000000000000000000132611621425704014670 0ustar #!/bin/bash ##: Check editing of patch while source has applied patches. ##: Bug: #314494 # Junichi Uekawa 19 June 2005. set -e cd $PKGPATH #make sure it's patched debian/rules patch # make sure without --clean option, it fails. if echo 'echo this-is-a-more-modified-line > one1 ' | dpatch-edit-patch 01_edpatch; then echo Unexpected success exit 1 else : fi # make sure --clean option works here. echo 'echo this-is-a-more-modified-line2 > one1 ' | dpatch-edit-patch --clean 01_edpatch debian/rules unpatch debian/rules patch echo '=== check file one1 contains the right content' [ `cat one1` = this-is-a-more-modified-line2 ] debian/rules unpatch echo '=== check file one1 does not exist' [ ! -f one1 ] dpatch/tests/11_dpep_debianonly_origtargz_in_upstream.sh0000755000000000000000000000272011621615745021054 0ustar #!/bin/bash # Junichi Uekawa 11 Jul 2005, modified 16 Jul 2005. ##: Check that --debianonly option is working in dpatch-edit-patch ##: with the auto-detection, finding the .tar.gz in ../upstream directory. ##: Bug: #315719 -- patch to use ../upstream ##: Depends on 10_dpep_debianonly.sh for setting up the environment. ##: Bug: #317775 -- fallback when orig.tar.gz does not exist does not work. set -ex # uses debianonly/ # debianonly/upstream directory for tar.gz # debianonly/dpatch-test/debian directory for debian directory. cd $PKGPATH/../debianonly/dpatch-test mv ../upstream ../hidden-upstream # Error out if given wrong upstream orig.tar.gz path. if echo 'echo yet-more-patch > 11 ' | dpatch-edit-patch -P$(pwd)/../upstream --debianonly -d test 11_test_patch; then echo "exit with error expected, upstream not found for this package" exit 1 else : fi mv ../hidden-upstream ../upstream # Give proper upstream orig.tar.gz path, should succeed echo 'echo yet-more-patch-2 > 11 ' | dpatch-edit-patch -P$(pwd)/../upstream --debianonly=$(pwd)/../upstream/dpatch-test_0.1.orig.tar.gz -d test 11_test_patch # Give proper upstream orig.tar.gz path, should succeed echo 'echo yet-more-patch-3 > 11 ' | dpatch-edit-patch --origtargzpath=$(pwd)/../upstream --debianonly=$(pwd)/../upstream/dpatch-test_0.1.orig.tar.gz -d test 11_test_patch # check the resulting dpatch file. #cat debian/patches/11_test_patch.dpatch grep yet-more-patch debian/patches/11_test_patch.dpatch dpatch/tests/07_dpatch_edit_patch_description_preserve.sh0000755000000000000000000000105711621425704021170 0ustar #!/bin/bash # Junichi Uekawa 21 June 2005. ##: check to see the description set in 06 is preserved. ##: after editing. set -e cd $PKGPATH #make sure it's unpatched debian/rules unpatch echo 'echo Another Modification > desc ' | \ dpatch-edit-patch 03_description debian/rules patch echo '=== check file contains the right content' [ "`cat desc`" = 'Another Modification' ] debian/rules unpatch echo '=== check file does not exist' [ ! -f desc ] echo '=== check the description' grep 'Description of this patch' debian/patches/03_description.dpatch dpatch/tests/14_dpatch_edit_patch_without_DPATCH.sh0000755000000000000000000000060411621425704017453 0ustar #!/bin/bash ##: test dpatch editing without @DPATCH@. set -e cd $PKGPATH grep -v '^@DPATCH@' debian/patches/03_description.dpatch > debian/patches/04_dpatch_test.dpatch echo | dpatch-edit-patch 04_dpatch_test cat debian/patches/04_dpatch_test.dpatch echo '=== check the filename' grep '^##.*\.dpatch by ' debian/patches/04_dpatch_test.dpatch rm debian/patches/04_dpatch_test.dpatch dpatch/tests/log/0000755000000000000000000000000011621616717011142 5ustar dpatch/tests/log/01_create_env.sh.log0000644000000000000000000000032011621616704014660 0ustar create environment for dpatch testing. the environment is used in the following tests. $TESTDIR/dpatch-test ($PKGPATH) is the debian package directory, and "dpatch-test" is the package name. dpatch/tests/log/02_create_patch.sh.log0000644000000000000000000001736411621616706015212 0ustar check generation of initial patch Bug#321320: also check the generated patch file dpatch-edit-patch: * /tmp/XXXX/dpatch-test/debian/patches/01_edpatch.dpatch does not exist, it will be created as a new dpatch. dpatch-edit-patch: * Copying /tmp/XXXX/dpatch-test to reference directory. dpatch-edit-patch: * Cleaning /tmp/XXXX/dpatch-test --- Cleaning dh_testdir dh_testroot dh_clean -k dh_clean: dh_clean -k is deprecated; use dh_prep instead dh_clean: Compatibility levels before 5 are deprecated. dpatch deapply-all rm -rf patch-stamp debian/patched make: Nothing to be done for `unpatch'. dpatch-edit-patch: Warning: * No base-patch supplied, not applying any patches. dpatch-edit-patch: * Copying reference directory /tmp/XXXX/dpatch-test to work directory. dpatch-edit-patch: Now launching an interactive shell in your work directory. Edit your files. When you are done, exit the shell. When you exit the shell, your patch will be automatically updated based on the changes in your work directory. If you wish to abort the process, exit the shell such that it returns an exit code of "230". This is typically done by exiting the shell with the command 'exit 230'. dpatch-edit-patch: * Creating new patch /tmp/XXXX/dpatch-test/debian/patches/01_edpatch.dpatch dpatch-edit-patch: Warning: debian/patches/00template not exist, using hardcoded default. dpatch-edit-patch: /tmp/XXXX/dpatch-test/debian/patches/01_edpatch.dpatch created. dpatch apply-all applying patch 01_edpatch to ./ ... ok. dpatch cat-all >patch-stamp touch patch-stamp === check file one1 contains the right content dpatch deapply-all reverting patch 01_edpatch from ./ ... ok. rm -rf patch-stamp debian/patched === check file one1 does not exist dpatch-edit-patch: * /tmp/XXXX/dpatch-test/debian/patches/02_create_two.dpatch does not exist, it will be created as a new dpatch. dpatch-edit-patch: * Copying /tmp/XXXX/dpatch-test to reference directory. dpatch-edit-patch: * Cleaning /tmp/XXXX/dpatch-test --- Cleaning dh_testdir dh_testroot dh_clean -k dh_clean: dh_clean -k is deprecated; use dh_prep instead dh_clean: Compatibility levels before 5 are deprecated. dpatch deapply-all 01_edpatch not applied to ./ . rm -rf patch-stamp debian/patched make: Nothing to be done for `unpatch'. 01_edpatch not applied to ./ . dpatch-edit-patch: Warning: * No base-patch supplied, not applying any patches. dpatch-edit-patch: * Copying reference directory /tmp/XXXX/dpatch-test to work directory. dpatch-edit-patch: Now launching an interactive shell in your work directory. Edit your files. When you are done, exit the shell. When you exit the shell, your patch will be automatically updated based on the changes in your work directory. If you wish to abort the process, exit the shell such that it returns an exit code of "230". This is typically done by exiting the shell with the command 'exit 230'. dpatch-edit-patch: * Creating new patch /tmp/XXXX/dpatch-test/debian/patches/02_create_two.dpatch dpatch-edit-patch: Warning: debian/patches/00template not exist, using hardcoded default. dpatch-edit-patch: /tmp/XXXX/dpatch-test/debian/patches/02_create_two.dpatch created. dpatch-edit-patch: * /tmp/XXXX/dpatch-test/debian/patches/02_create_two.dpatch exists, this patch will be updated. dpatch-edit-patch: * Copying /tmp/XXXX/dpatch-test to reference directory. dpatch-edit-patch: * Cleaning /tmp/XXXX/dpatch-test --- Cleaning dh_testdir dh_testroot dh_clean -k dh_clean: dh_clean -k is deprecated; use dh_prep instead dh_clean: Compatibility levels before 5 are deprecated. dpatch deapply-all 01_edpatch not applied to ./ . rm -rf patch-stamp debian/patched make: Nothing to be done for `unpatch'. 01_edpatch not applied to ./ . dpatch-edit-patch: Warning: 02_create_two.dpatch is not listed in debian/patches/00list, no other patches will be applied to the working directory. dpatch-edit-patch: * Copying reference directory /tmp/XXXX/dpatch-test to work directory. dpatch-edit-patch: * Applying current 02_create_two.dpatch for editing. applying patch 02_create_two to ./ ... ok. dpatch-edit-patch: Now launching an interactive shell in your work directory. Edit your files. When you are done, exit the shell. When you exit the shell, your patch will be automatically updated based on the changes in your work directory. If you wish to abort the process, exit the shell such that it returns an exit code of "230". This is typically done by exiting the shell with the command 'exit 230'. dpatch-edit-patch: Updating patch /tmp/XXXX/dpatch-test/debian/patches/02_create_two.dpatch dpatch-edit-patch: @DPATCH@ tag found, preserving dpatch header. dpatch-edit-patch: /tmp/XXXX/dpatch-test/debian/patches/02_create_two.dpatch updated. diff gives zero output; date should have changed #! /bin/sh /usr/share/dpatch/dpatch-run ## 02_create_two.dpatch by Gergely Nagy ## ## All lines beginning with `## DP:' are a description of the patch. ## DP: No description. @DPATCH@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' dpatch-test~/02_create_patch.sh dpatch-test/02_create_patch.sh --- dpatch-test~/02_create_patch.sh 1970-01-01 01:00:00.000000000 +0100 +++ dpatch-test/02_create_patch.sh 2011-08-13 09:46:12.757717394 +0200 @@ -0,0 +1,33 @@ +#!/bin/bash +##: check generation of initial patch +##: Bug#321320: also check the generated patch file +# Junichi Uekawa 19 June 2005, updated 6 Aug 2005. +set -e + +cd $PKGPATH + +echo 'echo this-is-a-line > one1 ' | dpatch-edit-patch 01_edpatch +echo 01_edpatch > debian/patches/00list +debian/rules patch + +echo '=== check file one1 contains the right content' +[ `cat one1` = this-is-a-line ] +debian/rules unpatch + +echo '=== check file one1 does not exist' +[ ! -f one1 ] + +# additional checks; try creating a patch file. +echo "cp -p ${SOURCE_DIR}/02_create_patch.sh . " | dpatch-edit-patch 02_create_two +cp debian/patches/02_create_two.dpatch{,~~} +echo "exit 0" | dpatch-edit-patch 02_create_two + +# 'patch' will update the timestamp. The following command +# should output '11', not 0. + +if diff -u debian/patches/02_create_two.dpatch{~~,} > /dev/null; then + : +else + echo 'diff gives zero output; date should have changed' + cat debian/patches/02_create_two.dpatch{~~,} +fi #! /bin/sh /usr/share/dpatch/dpatch-run ## 02_create_two.dpatch by Gergely Nagy ## ## All lines beginning with `## DP:' are a description of the patch. ## DP: No description. @DPATCH@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' dpatch-test~/02_create_patch.sh dpatch-test/02_create_patch.sh --- dpatch-test~/02_create_patch.sh 1970-01-01 01:00:00.000000000 +0100 +++ dpatch-test/02_create_patch.sh 2011-08-14 02:58:46.000000000 +0200 @@ -0,0 +1,33 @@ +#!/bin/bash +##: check generation of initial patch +##: Bug#321320: also check the generated patch file +# Junichi Uekawa 19 June 2005, updated 6 Aug 2005. +set -e + +cd $PKGPATH + +echo 'echo this-is-a-line > one1 ' | dpatch-edit-patch 01_edpatch +echo 01_edpatch > debian/patches/00list +debian/rules patch + +echo '=== check file one1 contains the right content' +[ `cat one1` = this-is-a-line ] +debian/rules unpatch + +echo '=== check file one1 does not exist' +[ ! -f one1 ] + +# additional checks; try creating a patch file. +echo "cp -p ${SOURCE_DIR}/02_create_patch.sh . " | dpatch-edit-patch 02_create_two +cp debian/patches/02_create_two.dpatch{,~~} +echo "exit 0" | dpatch-edit-patch 02_create_two + +# 'patch' will update the timestamp. The following command +# should output '11', not 0. + +if diff -u debian/patches/02_create_two.dpatch{~~,} > /dev/null; then + : +else + echo 'diff gives zero output; date should have changed' + cat debian/patches/02_create_two.dpatch{~~,} +fi dpatch/tests/log/07_dpatch_edit_patch_description_preserve.sh.log0000644000000000000000000000454011621616712022527 0ustar check to see the description set in 06 is preserved. after editing. dpatch deapply-all 03_description not applied to ./ . 02_another not applied to ./ . 01_edpatch not applied to ./ . rm -rf patch-stamp debian/patched dpatch-edit-patch: * /tmp/XXXX/dpatch-test/debian/patches/03_description.dpatch exists, this patch will be updated. dpatch-edit-patch: * Copying /tmp/XXXX/dpatch-test to reference directory. dpatch-edit-patch: * Cleaning /tmp/XXXX/dpatch-test --- Cleaning dh_testdir dh_testroot dh_clean -k dh_clean: dh_clean -k is deprecated; use dh_prep instead dh_clean: Compatibility levels before 5 are deprecated. dpatch deapply-all 03_description not applied to ./ . 02_another not applied to ./ . 01_edpatch not applied to ./ . rm -rf patch-stamp debian/patched make: Nothing to be done for `unpatch'. 03_description not applied to ./ . 02_another not applied to ./ . 01_edpatch not applied to ./ . dpatch-edit-patch: * Applying patches applying patch 01_edpatch to ./ ... ok. applying patch 02_another to ./ ... ok. dpatch-edit-patch: * Copying reference directory /tmp/XXXX/dpatch-test to work directory. dpatch-edit-patch: * Applying current 03_description.dpatch for editing. applying patch 03_description to ./ ... ok. dpatch-edit-patch: Now launching an interactive shell in your work directory. Edit your files. When you are done, exit the shell. When you exit the shell, your patch will be automatically updated based on the changes in your work directory. If you wish to abort the process, exit the shell such that it returns an exit code of "230". This is typically done by exiting the shell with the command 'exit 230'. dpatch-edit-patch: Updating patch /tmp/XXXX/dpatch-test/debian/patches/03_description.dpatch dpatch-edit-patch: @DPATCH@ tag found, preserving dpatch header. dpatch-edit-patch: /tmp/XXXX/dpatch-test/debian/patches/03_description.dpatch updated. dpatch apply-all applying patch 01_edpatch to ./ ... ok. applying patch 02_another to ./ ... ok. applying patch 03_description to ./ ... ok. dpatch cat-all >patch-stamp touch patch-stamp === check file contains the right content dpatch deapply-all reverting patch 03_description from ./ ... ok. reverting patch 02_another from ./ ... ok. reverting patch 01_edpatch from ./ ... ok. rm -rf patch-stamp debian/patched === check file does not exist === check the description ## DP: Description of this patch dpatch/tests/log/05_edit_with_patched.sh.log0000644000000000000000000000466011621616710016231 0ustar Check editing of patch while source has applied patches. Bug: #314494 dpatch apply-all applying patch 01_edpatch to ./ ... ok. applying patch 02_another to ./ ... ok. dpatch cat-all >patch-stamp touch patch-stamp dpatch-edit-patch: * /tmp/XXXX/dpatch-test/debian/patches/01_edpatch.dpatch exists, this patch will be updated. dpatch-edit-patch: Error: Patch 01_edpatch.dpatch is applied on working directory, use --clean option dpatch-edit-patch: * /tmp/XXXX/dpatch-test/debian/patches/01_edpatch.dpatch exists, this patch will be updated. dpatch-edit-patch: * Cleaning /tmp/XXXX/dpatch-test --- Cleaning dh_testdir dh_testroot dh_clean -k dh_clean: dh_clean -k is deprecated; use dh_prep instead dh_clean: Compatibility levels before 5 are deprecated. dpatch deapply-all reverting patch 02_another from ./ ... ok. reverting patch 01_edpatch from ./ ... ok. rm -rf patch-stamp debian/patched make: Nothing to be done for `unpatch'. 02_another not applied to ./ . 01_edpatch not applied to ./ . dpatch-edit-patch: * Applying patches dpatch-edit-patch: * Copying reference directory /tmp/XXXX/dpatch-test to work directory. dpatch-edit-patch: * Applying current 01_edpatch.dpatch for editing. applying patch 01_edpatch to ./ ... ok. dpatch-edit-patch: Now launching an interactive shell in your work directory. Edit your files. When you are done, exit the shell. When you exit the shell, your patch will be automatically updated based on the changes in your work directory. If you wish to abort the process, exit the shell such that it returns an exit code of "230". This is typically done by exiting the shell with the command 'exit 230'. dpatch-edit-patch: Updating patch /tmp/XXXX/dpatch-test/debian/patches/01_edpatch.dpatch dpatch-edit-patch: @DPATCH@ tag found, preserving dpatch header. dpatch-edit-patch: /tmp/XXXX/dpatch-test/debian/patches/01_edpatch.dpatch updated. dpatch-edit-patch: * Not deleting reference directory /tmp/XXXX/dpatch-test/, as it is the same as source directory. dpatch deapply-all 02_another not applied to ./ . 01_edpatch not applied to ./ . rm -rf patch-stamp debian/patched dpatch apply-all applying patch 01_edpatch to ./ ... ok. applying patch 02_another to ./ ... ok. dpatch cat-all >patch-stamp touch patch-stamp === check file one1 contains the right content dpatch deapply-all reverting patch 02_another from ./ ... ok. reverting patch 01_edpatch from ./ ... ok. rm -rf patch-stamp debian/patched === check file one1 does not exist dpatch/tests/log/11_dpep_debianonly_origtargz_in_upstream.sh.log0000644000000000000000000001166511621616715022420 0ustar Check that --debianonly option is working in dpatch-edit-patch with the auto-detection, finding the .tar.gz in ../upstream directory. Bug: #315719 -- patch to use ../upstream Depends on 10_dpep_debianonly.sh for setting up the environment. Bug: #317775 -- fallback when orig.tar.gz does not exist does not work. + cd /tmp/XXXX/dpatch-test/../debianonly/dpatch-test + mv ../upstream ../hidden-upstream + echo 'echo yet-more-patch > 11 ' ++ pwd + dpatch-edit-patch -P/tmp/XXXX/debianonly/dpatch-test/../upstream --debianonly -d test 11_test_patch dpatch-edit-patch: * /tmp/XXXX/debianonly/dpatch-test/debian/patches/11_test_patch.dpatch does not exist, it will be created as a new dpatch. dpatch-edit-patch: * debian/-only layout selected dpatch-edit-patch: Error: unable to obtain upstream tarball, DPEP_GETORIGTARGZ is unset + : + mv ../hidden-upstream ../upstream + echo 'echo yet-more-patch-2 > 11 ' ++ pwd ++ pwd + dpatch-edit-patch -P/tmp/XXXX/debianonly/dpatch-test/../upstream --debianonly=/tmp/XXXX/debianonly/dpatch-test/../upstream/dpatch-test_0.1.orig.tar.gz -d test 11_test_patch dpatch-edit-patch: * /tmp/XXXX/debianonly/dpatch-test/debian/patches/11_test_patch.dpatch does not exist, it will be created as a new dpatch. dpatch-edit-patch: * debian/-only layout selected dpatch-edit-patch: * unpacking /tmp/XXXX/debianonly/upstream/dpatch-test_0.1.orig.tar.gz dpatch-edit-patch: * Copying /tmp/XXXX/debianonly/dpatch-test to reference directory. dpatch-edit-patch: * Cleaning /tmp/XXXX/dpatch-test --- Cleaning dh_testdir dh_testroot dh_clean -k dh_clean: dh_clean -k is deprecated; use dh_prep instead dh_clean: Compatibility levels before 5 are deprecated. dpatch deapply-all 03_description not applied to ./ . 02_another not applied to ./ . 01_edpatch not applied to ./ . rm -rf patch-stamp debian/patched make: Nothing to be done for `unpatch'. 03_description not applied to ./ . 02_another not applied to ./ . 01_edpatch not applied to ./ . dpatch-edit-patch: Warning: * No base-patch supplied, not applying any patches. dpatch-edit-patch: * Copying reference directory /tmp/XXXX/dpatch-test to work directory. dpatch-edit-patch: Now launching an interactive shell in your work directory. Edit your files. When you are done, exit the shell. When you exit the shell, your patch will be automatically updated based on the changes in your work directory. If you wish to abort the process, exit the shell such that it returns an exit code of "230". This is typically done by exiting the shell with the command 'exit 230'. dpatch-edit-patch: * Creating new patch /tmp/XXXX/debianonly/dpatch-test/debian/patches/11_test_patch.dpatch dpatch-edit-patch: Warning: debian/patches/00template not exist, using hardcoded default. dpatch-edit-patch: /tmp/XXXX/debianonly/dpatch-test/debian/patches/11_test_patch.dpatch created. + echo 'echo yet-more-patch-3 > 11 ' ++ pwd ++ pwd + dpatch-edit-patch --origtargzpath=/tmp/XXXX/debianonly/dpatch-test/../upstream --debianonly=/tmp/XXXX/debianonly/dpatch-test/../upstream/dpatch-test_0.1.orig.tar.gz -d test 11_test_patch dpatch-edit-patch: * /tmp/XXXX/debianonly/dpatch-test/debian/patches/11_test_patch.dpatch exists, this patch will be updated. dpatch-edit-patch: * debian/-only layout selected dpatch-edit-patch: * unpacking /tmp/XXXX/debianonly/upstream/dpatch-test_0.1.orig.tar.gz dpatch-edit-patch: * Copying /tmp/XXXX/debianonly/dpatch-test to reference directory. dpatch-edit-patch: * Cleaning /tmp/XXXX/dpatch-test --- Cleaning dh_testdir dh_testroot dh_clean -k dh_clean: dh_clean -k is deprecated; use dh_prep instead dh_clean: Compatibility levels before 5 are deprecated. dpatch deapply-all 03_description not applied to ./ . 02_another not applied to ./ . 01_edpatch not applied to ./ . rm -rf patch-stamp debian/patched make: Nothing to be done for `unpatch'. 03_description not applied to ./ . 02_another not applied to ./ . 01_edpatch not applied to ./ . dpatch-edit-patch: Warning: 11_test_patch.dpatch is not listed in debian/patches/00list, no other patches will be applied to the working directory. dpatch-edit-patch: * Copying reference directory /tmp/XXXX/dpatch-test to work directory. dpatch-edit-patch: * Applying current 11_test_patch.dpatch for editing. applying patch 11_test_patch to ./ ... ok. dpatch-edit-patch: Now launching an interactive shell in your work directory. Edit your files. When you are done, exit the shell. When you exit the shell, your patch will be automatically updated based on the changes in your work directory. If you wish to abort the process, exit the shell such that it returns an exit code of "230". This is typically done by exiting the shell with the command 'exit 230'. dpatch-edit-patch: Updating patch /tmp/XXXX/debianonly/dpatch-test/debian/patches/11_test_patch.dpatch dpatch-edit-patch: @DPATCH@ tag found, preserving dpatch header. dpatch-edit-patch: /tmp/XXXX/debianonly/dpatch-test/debian/patches/11_test_patch.dpatch updated. + grep yet-more-patch debian/patches/11_test_patch.dpatch +yet-more-patch-3 dpatch/tests/log/03_edit_patch.sh.log0000644000000000000000000000347211621616706014670 0ustar Check that modifying of patch file works. dpatch deapply-all 01_edpatch not applied to ./ . rm -rf patch-stamp debian/patched dpatch-edit-patch: * /tmp/XXXX/dpatch-test/debian/patches/01_edpatch.dpatch exists, this patch will be updated. dpatch-edit-patch: * Copying /tmp/XXXX/dpatch-test to reference directory. dpatch-edit-patch: * Cleaning /tmp/XXXX/dpatch-test --- Cleaning dh_testdir dh_testroot dh_clean -k dh_clean: dh_clean -k is deprecated; use dh_prep instead dh_clean: Compatibility levels before 5 are deprecated. dpatch deapply-all 01_edpatch not applied to ./ . rm -rf patch-stamp debian/patched make: Nothing to be done for `unpatch'. 01_edpatch not applied to ./ . dpatch-edit-patch: * Applying patches dpatch-edit-patch: * Copying reference directory /tmp/XXXX/dpatch-test to work directory. dpatch-edit-patch: * Applying current 01_edpatch.dpatch for editing. applying patch 01_edpatch to ./ ... ok. dpatch-edit-patch: Now launching an interactive shell in your work directory. Edit your files. When you are done, exit the shell. When you exit the shell, your patch will be automatically updated based on the changes in your work directory. If you wish to abort the process, exit the shell such that it returns an exit code of "230". This is typically done by exiting the shell with the command 'exit 230'. dpatch-edit-patch: Updating patch /tmp/XXXX/dpatch-test/debian/patches/01_edpatch.dpatch dpatch-edit-patch: @DPATCH@ tag found, preserving dpatch header. dpatch-edit-patch: /tmp/XXXX/dpatch-test/debian/patches/01_edpatch.dpatch updated. dpatch apply-all applying patch 01_edpatch to ./ ... ok. dpatch cat-all >patch-stamp touch patch-stamp === check file one1 contains the right content dpatch deapply-all reverting patch 01_edpatch from ./ ... ok. rm -rf patch-stamp debian/patched === check file one1 does not exist dpatch/tests/log/14_dpatch_edit_patch_without_DPATCH.sh.log0000644000000000000000000000454711621616716021030 0ustar test dpatch editing without @DPATCH@. dpatch-edit-patch: * /tmp/XXXX/dpatch-test/debian/patches/04_dpatch_test.dpatch exists, this patch will be updated. dpatch-edit-patch: * Copying /tmp/XXXX/dpatch-test to reference directory. dpatch-edit-patch: * Cleaning /tmp/XXXX/dpatch-test --- Cleaning dh_testdir dh_testroot dh_clean -k dh_clean: dh_clean -k is deprecated; use dh_prep instead dh_clean: Compatibility levels before 5 are deprecated. dpatch deapply-all 03_description not applied to ./ . 02_another not applied to ./ . 01_edpatch not applied to ./ . rm -rf patch-stamp debian/patched make: Nothing to be done for `unpatch'. 03_description not applied to ./ . 02_another not applied to ./ . 01_edpatch not applied to ./ . dpatch-edit-patch: Warning: 04_dpatch_test.dpatch is not listed in debian/patches/00list, no other patches will be applied to the working directory. dpatch-edit-patch: * Copying reference directory /tmp/XXXX/dpatch-test to work directory. dpatch-edit-patch: * Applying current 04_dpatch_test.dpatch for editing. applying patch 04_dpatch_test to ./ ... ok. dpatch-edit-patch: Now launching an interactive shell in your work directory. Edit your files. When you are done, exit the shell. When you exit the shell, your patch will be automatically updated based on the changes in your work directory. If you wish to abort the process, exit the shell such that it returns an exit code of "230". This is typically done by exiting the shell with the command 'exit 230'. dpatch-edit-patch: Updating patch /tmp/XXXX/dpatch-test/debian/patches/04_dpatch_test.dpatch dpatch-edit-patch: Warning: @DPATCH@ tag not found, debian/patches/00template not found. Using hardcoded default. dpatch-edit-patch: /tmp/XXXX/dpatch-test/debian/patches/04_dpatch_test.dpatch updated. #! /bin/sh /usr/share/dpatch/dpatch-run ## 04_dpatch_test.dpatch by Gergely Nagy ## ## All lines beginning with `## DP:' are a description of the patch. ## DP: No description. @DPATCH@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' dpatch-test~/desc dpatch-test/desc --- dpatch-test~/desc 1970-01-01 01:00:00.000000000 +0100 +++ dpatch-test/desc 2011-08-14 02:58:54.000000000 +0200 @@ -0,0 +1 @@ +08 === check the filename ## 04_dpatch_test.dpatch by Gergely Nagy dpatch/tests/log/04_add_new_patch.sh.log0000644000000000000000000000355511621616707015350 0ustar Check new patch addition works. dpatch deapply-all 01_edpatch not applied to ./ . rm -rf patch-stamp debian/patched dpatch-edit-patch: * /tmp/XXXX/dpatch-test/debian/patches/02_another.dpatch does not exist, it will be created as a new dpatch. dpatch-edit-patch: * Copying /tmp/XXXX/dpatch-test to reference directory. dpatch-edit-patch: * Cleaning /tmp/XXXX/dpatch-test --- Cleaning dh_testdir dh_testroot dh_clean -k dh_clean: dh_clean -k is deprecated; use dh_prep instead dh_clean: Compatibility levels before 5 are deprecated. dpatch deapply-all 01_edpatch not applied to ./ . rm -rf patch-stamp debian/patched make: Nothing to be done for `unpatch'. 01_edpatch not applied to ./ . dpatch-edit-patch: * Applying patches applying patch 01_edpatch to ./ ... ok. dpatch-edit-patch: * Copying reference directory /tmp/XXXX/dpatch-test to work directory. dpatch-edit-patch: Now launching an interactive shell in your work directory. Edit your files. When you are done, exit the shell. When you exit the shell, your patch will be automatically updated based on the changes in your work directory. If you wish to abort the process, exit the shell such that it returns an exit code of "230". This is typically done by exiting the shell with the command 'exit 230'. dpatch-edit-patch: * Creating new patch /tmp/XXXX/dpatch-test/debian/patches/02_another.dpatch dpatch-edit-patch: Warning: debian/patches/00template not exist, using hardcoded default. dpatch-edit-patch: /tmp/XXXX/dpatch-test/debian/patches/02_another.dpatch created. dpatch apply-all applying patch 01_edpatch to ./ ... ok. applying patch 02_another to ./ ... ok. dpatch cat-all >patch-stamp touch patch-stamp === check file one2 contains the right content dpatch deapply-all reverting patch 02_another from ./ ... ok. reverting patch 01_edpatch from ./ ... ok. rm -rf patch-stamp debian/patched === check file one2 does not exist dpatch/tests/log/12_dpatch_with-cpp.sh.log0000644000000000000000000000067611621616715015645 0ustar check --with-cpp functionality. === change 00list debian/patches/01_edpatch.dpatch (Gergely Nagy ): No description. debian/patches/02_another.dpatch (Gergely Nagy ): No description. debian/patches/01_edpatch.dpatch (Gergely Nagy ): debian/patches/02_another.dpatch (Gergely Nagy ): === put back 00list as it was dpatch/tests/log/15_dpatch_apply_with_error.sh.log0000644000000000000000000000777611621616717017520 0ustar create two patches that conflict, and make sure applying both fails. 01_edpatch 02_another 03_description dpatch-edit-patch: * /tmp/XXXX/dpatch-test/debian/patches/05_conflicting1.dpatch does not exist, it will be created as a new dpatch. dpatch-edit-patch: * Copying /tmp/XXXX/dpatch-test to reference directory. dpatch-edit-patch: * Cleaning /tmp/XXXX/dpatch-test --- Cleaning dh_testdir dh_testroot dh_clean -k dh_clean: dh_clean -k is deprecated; use dh_prep instead dh_clean: Compatibility levels before 5 are deprecated. dpatch deapply-all 03_description not applied to ./ . 02_another not applied to ./ . 01_edpatch not applied to ./ . rm -rf patch-stamp debian/patched make: Nothing to be done for `unpatch'. 03_description not applied to ./ . 02_another not applied to ./ . 01_edpatch not applied to ./ . dpatch-edit-patch: Warning: * No base-patch supplied, not applying any patches. dpatch-edit-patch: * Copying reference directory /tmp/XXXX/dpatch-test to work directory. dpatch-edit-patch: Now launching an interactive shell in your work directory. Edit your files. When you are done, exit the shell. When you exit the shell, your patch will be automatically updated based on the changes in your work directory. If you wish to abort the process, exit the shell such that it returns an exit code of "230". This is typically done by exiting the shell with the command 'exit 230'. dpatch-edit-patch: * Creating new patch /tmp/XXXX/dpatch-test/debian/patches/05_conflicting1.dpatch dpatch-edit-patch: Warning: debian/patches/00template not exist, using hardcoded default. dpatch-edit-patch: /tmp/XXXX/dpatch-test/debian/patches/05_conflicting1.dpatch created. dpatch-edit-patch: * /tmp/XXXX/dpatch-test/debian/patches/05_conflicting2.dpatch does not exist, it will be created as a new dpatch. dpatch-edit-patch: * Copying /tmp/XXXX/dpatch-test to reference directory. dpatch-edit-patch: * Cleaning /tmp/XXXX/dpatch-test --- Cleaning dh_testdir dh_testroot dh_clean -k dh_clean: dh_clean -k is deprecated; use dh_prep instead dh_clean: Compatibility levels before 5 are deprecated. dpatch deapply-all 03_description not applied to ./ . 02_another not applied to ./ . 01_edpatch not applied to ./ . rm -rf patch-stamp debian/patched make: Nothing to be done for `unpatch'. 03_description not applied to ./ . 02_another not applied to ./ . 01_edpatch not applied to ./ . dpatch-edit-patch: Warning: * No base-patch supplied, not applying any patches. dpatch-edit-patch: * Copying reference directory /tmp/XXXX/dpatch-test to work directory. dpatch-edit-patch: Now launching an interactive shell in your work directory. Edit your files. When you are done, exit the shell. When you exit the shell, your patch will be automatically updated based on the changes in your work directory. If you wish to abort the process, exit the shell such that it returns an exit code of "230". This is typically done by exiting the shell with the command 'exit 230'. dpatch-edit-patch: * Creating new patch /tmp/XXXX/dpatch-test/debian/patches/05_conflicting2.dpatch dpatch-edit-patch: Warning: debian/patches/00template not exist, using hardcoded default. dpatch-edit-patch: /tmp/XXXX/dpatch-test/debian/patches/05_conflicting2.dpatch created. applying patch 05_conflicting1 to ./ ... ok. applying patch 05_conflicting2 to ./ ... failed. attempting to revert failed patch 05_conflicting2 from ./: md5sums match, proceeding ... done (neither success nor failure guaranteed) reverting patch 05_conflicting1 from ./ ... ok. applying patch 05_conflicting1 to ./ ... patching file 10 applying patch 05_conflicting2 to ./ ... The next patch would create the file 10, which already exists! Applying it anyway. patching file 10 Hunk #1 FAILED at 1. 1 out of 1 hunk FAILED -- saving rejects to file 10.rej attempting to revert failed patch 05_conflicting2 from ./: md5sums match, proceeding ... patching file 10 Hunk #1 FAILED at 1. File 10 is not empty after patch, as expected 1 out of 1 hunk FAILED -- saving rejects to file 10.rej reverting patch 05_conflicting1 from ./ ... patching file 10 dpatch/tests/log/06_dpatch_edit_patch_description.sh.log0000644000000000000000000000451011621616711020607 0ustar check to see if '-d' command-line option works at all. This didn't work in 2.0.13, since 'dpatch_template_hardcoded' doesn't call 'dpatch' with the description. dpatch deapply-all 02_another not applied to ./ . 01_edpatch not applied to ./ . rm -rf patch-stamp debian/patched dpatch-edit-patch: * /tmp/XXXX/dpatch-test/debian/patches/03_description.dpatch does not exist, it will be created as a new dpatch. dpatch-edit-patch: * Copying /tmp/XXXX/dpatch-test to reference directory. dpatch-edit-patch: * Cleaning /tmp/XXXX/dpatch-test --- Cleaning dh_testdir dh_testroot dh_clean -k dh_clean: dh_clean -k is deprecated; use dh_prep instead dh_clean: Compatibility levels before 5 are deprecated. dpatch deapply-all 02_another not applied to ./ . 01_edpatch not applied to ./ . rm -rf patch-stamp debian/patched make: Nothing to be done for `unpatch'. 02_another not applied to ./ . 01_edpatch not applied to ./ . dpatch-edit-patch: Warning: * No base-patch supplied, not applying any patches. dpatch-edit-patch: * Copying reference directory /tmp/XXXX/dpatch-test to work directory. dpatch-edit-patch: Now launching an interactive shell in your work directory. Edit your files. When you are done, exit the shell. When you exit the shell, your patch will be automatically updated based on the changes in your work directory. If you wish to abort the process, exit the shell such that it returns an exit code of "230". This is typically done by exiting the shell with the command 'exit 230'. dpatch-edit-patch: * Creating new patch /tmp/XXXX/dpatch-test/debian/patches/03_description.dpatch dpatch-edit-patch: Warning: debian/patches/00template not exist, using hardcoded default. dpatch-edit-patch: /tmp/XXXX/dpatch-test/debian/patches/03_description.dpatch created. dpatch apply-all applying patch 01_edpatch to ./ ... ok. applying patch 02_another to ./ ... ok. applying patch 03_description to ./ ... ok. dpatch cat-all >patch-stamp touch patch-stamp === check file contains the right content dpatch deapply-all reverting patch 03_description from ./ ... ok. reverting patch 02_another from ./ ... ok. reverting patch 01_edpatch from ./ ... ok. rm -rf patch-stamp debian/patched === check file does not exist === check the description ## DP: Description of this patch === check the filename ## 03_description.dpatch by Gergely Nagy dpatch/tests/log/13_dpatch-edit-patch-null.sh.log0000644000000000000000000000026611621616716017017 0ustar check dpatch-edit-patch without command-line options. === dpatch-edit-patch with NULL command-line option dpatch-edit-patch: Error: patchname is empty, please specify, aborting. dpatch/tests/log/10_dpep_debianonly.sh.log0000644000000000000000000000536711621616714015722 0ustar Check that --debianonly option is working in dpatch-edit-patch Also try checking that given a wrong full path, it will error out.; message fixed in 317758 + cd /tmp/XXXX/dpatch-test/.. + mkdir debianonly + mkdir debianonly/upstream + mkdir debianonly/dpatch-test + cp -r /tmp/XXXX/dpatch-test/debian debianonly/dpatch-test + tar cfz debianonly/upstream/dpatch-test_0.1.orig.tar.gz dpatch-test + cd debianonly/dpatch-test + echo 'echo another-patch > 10 ' + dpatch-edit-patch --debianonly=../upstream/dpatch-test_0.1.orig.tar.gz -d test 10_test_patch dpatch-edit-patch: * /tmp/XXXX/debianonly/dpatch-test/debian/patches/10_test_patch.dpatch does not exist, it will be created as a new dpatch. dpatch-edit-patch: * debian/-only layout selected dpatch-edit-patch: * unpacking /tmp/XXXX/debianonly/upstream/dpatch-test_0.1.orig.tar.gz dpatch-edit-patch: * Copying /tmp/XXXX/debianonly/dpatch-test to reference directory. dpatch-edit-patch: * Cleaning /tmp/XXXX/dpatch-test --- Cleaning dh_testdir dh_testroot dh_clean -k dh_clean: dh_clean -k is deprecated; use dh_prep instead dh_clean: Compatibility levels before 5 are deprecated. dpatch deapply-all 03_description not applied to ./ . 02_another not applied to ./ . 01_edpatch not applied to ./ . rm -rf patch-stamp debian/patched make: Nothing to be done for `unpatch'. 03_description not applied to ./ . 02_another not applied to ./ . 01_edpatch not applied to ./ . dpatch-edit-patch: Warning: * No base-patch supplied, not applying any patches. dpatch-edit-patch: * Copying reference directory /tmp/XXXX/dpatch-test to work directory. dpatch-edit-patch: Now launching an interactive shell in your work directory. Edit your files. When you are done, exit the shell. When you exit the shell, your patch will be automatically updated based on the changes in your work directory. If you wish to abort the process, exit the shell such that it returns an exit code of "230". This is typically done by exiting the shell with the command 'exit 230'. dpatch-edit-patch: * Creating new patch /tmp/XXXX/debianonly/dpatch-test/debian/patches/10_test_patch.dpatch dpatch-edit-patch: Warning: debian/patches/00template not exist, using hardcoded default. dpatch-edit-patch: /tmp/XXXX/debianonly/dpatch-test/debian/patches/10_test_patch.dpatch created. + echo 'echo even more > 10 ' + dpatch-edit-patch --debianonly=../upstream/dpatch-test_0.1.orig.tar.gz- -d test 10_test_patch dpatch-edit-patch: * /tmp/XXXX/debianonly/dpatch-test/debian/patches/10_test_patch.dpatch exists, this patch will be updated. dpatch-edit-patch: * debian/-only layout selected dpatch-edit-patch: Error: ../upstream/dpatch-test_0.1.orig.tar.gz-, given on command line, does not exist + echo success success + grep another-patch debian/patches/10_test_patch.dpatch +another-patch dpatch/tests/log/08_dpatch_list_patch.sh.log0000644000000000000000000000610711621616713016242 0ustar check dpatch-list-patch works. Depends on 06,07. Also, run dpatch-edit-patch with -d option, and check that -d only has effect on newly created patches === output of dpatch-list-patch Patches that would be applied: debian/patches/01_edpatch.dpatch (Gergely Nagy ): No description. debian/patches/02_another.dpatch (Gergely Nagy ): No description. debian/patches/03_description.dpatch (Gergely Nagy ): Description of this patch === check for obvious entries in output of dpatch-list-patch debian/patches/01_edpatch.dpatch (Gergely Nagy ): No description. No description. debian/patches/03_description.dpatch (Gergely Nagy ): Description of this patch === Edit patch with an attempt for changed description dpatch deapply-all 03_description not applied to ./ . 02_another not applied to ./ . 01_edpatch not applied to ./ . rm -rf patch-stamp debian/patched dpatch-edit-patch: * /tmp/XXXX/dpatch-test/debian/patches/03_description.dpatch exists, this patch will be updated. dpatch-edit-patch: * Copying /tmp/XXXX/dpatch-test to reference directory. dpatch-edit-patch: * Cleaning /tmp/XXXX/dpatch-test --- Cleaning dh_testdir dh_testroot dh_clean -k dh_clean: dh_clean -k is deprecated; use dh_prep instead dh_clean: Compatibility levels before 5 are deprecated. dpatch deapply-all 03_description not applied to ./ . 02_another not applied to ./ . 01_edpatch not applied to ./ . rm -rf patch-stamp debian/patched make: Nothing to be done for `unpatch'. 03_description not applied to ./ . 02_another not applied to ./ . 01_edpatch not applied to ./ . dpatch-edit-patch: * Applying patches applying patch 01_edpatch to ./ ... ok. applying patch 02_another to ./ ... ok. dpatch-edit-patch: * Copying reference directory /tmp/XXXX/dpatch-test to work directory. dpatch-edit-patch: * Applying current 03_description.dpatch for editing. applying patch 03_description to ./ ... ok. dpatch-edit-patch: Now launching an interactive shell in your work directory. Edit your files. When you are done, exit the shell. When you exit the shell, your patch will be automatically updated based on the changes in your work directory. If you wish to abort the process, exit the shell such that it returns an exit code of "230". This is typically done by exiting the shell with the command 'exit 230'. dpatch-edit-patch: Updating patch /tmp/XXXX/dpatch-test/debian/patches/03_description.dpatch dpatch-edit-patch: @DPATCH@ tag found, preserving dpatch header. dpatch-edit-patch: /tmp/XXXX/dpatch-test/debian/patches/03_description.dpatch updated. === Make sure dpatch-list-patch picks up the new description Patches that would be applied: debian/patches/01_edpatch.dpatch (Gergely Nagy ): No description. debian/patches/02_another.dpatch (Gergely Nagy ): No description. debian/patches/03_description.dpatch (Gergely Nagy ): Description of this patch Description of this patch dpatch/tests/04_add_new_patch.sh0000755000000000000000000000073411621425704014001 0ustar #!/bin/bash ##: Check new patch addition works. # Junichi Uekawa 19 June 2005. set -e cd $PKGPATH debian/rules unpatch echo 'echo another-patch > one2 ' | dpatch-edit-patch 02_another 01_edpatch echo 02_another >> debian/patches/00list debian/rules patch echo '=== check file one2 contains the right content' [ `cat one2` = another-patch ] [ `cat one1` = this-is-a-modified-line ] debian/rules unpatch echo '=== check file one2 does not exist' [ ! -f one2 ] [ ! -f one1 ] dpatch/tests/tests/0000755000000000000000000000000011621616736011524 5ustar dpatch/tests/test.log.summary0000644000000000000000000000071211621616717013537 0ustar [OK] 01_create_env.sh [OK] 02_create_patch.sh [OK] 03_edit_patch.sh [OK] 04_add_new_patch.sh [OK] 05_edit_with_patched.sh [OK] 06_dpatch_edit_patch_description.sh [OK] 07_dpatch_edit_patch_description_preserve.sh [OK] 08_dpatch_list_patch.sh [OK] 10_dpep_debianonly.sh [OK] 11_dpep_debianonly_origtargz_in_upstream.sh [OK] 12_dpatch_with-cpp.sh [OK] 13_dpatch-edit-patch-null.sh [OK] 14_dpatch_edit_patch_without_DPATCH.sh [OK] 15_dpatch_apply_with_error.sh dpatch/tests/13_dpatch-edit-patch-null.sh0000755000000000000000000000047211621425704015453 0ustar #!/bin/bash # Junichi Uekawa 16 Dec 2005 ##: check dpatch-edit-patch without command-line options. set -e cd $PKGPATH echo '=== dpatch-edit-patch with NULL command-line option' if echo | dpatch-edit-patch ; then exit 1; else true fi if [ -f debian/patches/.dpatch ]; then exit 1; else true fi dpatch/tests/03_edit_patch.sh0000755000000000000000000000065311621425704013324 0ustar #!/bin/bash ##: Check that modifying of patch file works. # Junichi Uekawa 19 June 2005. set -e cd $PKGPATH #make sure it's unpatched debian/rules unpatch echo 'echo this-is-a-modified-line > one1 ' | dpatch-edit-patch 01_edpatch debian/rules patch echo '=== check file one1 contains the right content' [ `cat one1` = this-is-a-modified-line ] debian/rules unpatch echo '=== check file one1 does not exist' [ ! -f one1 ] dpatch/tests/10_dpep_debianonly.sh0000755000000000000000000000213711621425704014351 0ustar #!/bin/bash # Junichi Uekawa 11 Jul 2005. ##: Check that --debianonly option is working in dpatch-edit-patch set -ex # uses debianonly/ # debianonly/upstream directory for tar.gz # debianonly/dpatch-test/debian directory for debian directory. cd $PKGPATH/.. mkdir debianonly mkdir debianonly/upstream mkdir debianonly/dpatch-test # create the orig.tar.gz and a debian directory cp -r $PKGPATH/debian debianonly/dpatch-test tar cfz debianonly/upstream/dpatch-test_0.1.orig.tar.gz dpatch-test cd debianonly/dpatch-test # try running dpatch-edit-patch with full path to the orig.tar.gz echo 'echo another-patch > 10 ' | dpatch-edit-patch --debianonly=../upstream/dpatch-test_0.1.orig.tar.gz -d test 10_test_patch ##: Also try checking that given a wrong full path, it will error out.; ##: message fixed in 317758 if echo 'echo even more > 10 ' | dpatch-edit-patch --debianonly=../upstream/dpatch-test_0.1.orig.tar.gz- -d test 10_test_patch; then echo Wrong-path test failed! exit 1 else echo success fi #cat debian/patches/10_test_patch.dpatch grep "another-patch" debian/patches/10_test_patch.dpatch dpatch/tests/run-test.sh0000755000000000000000000000135611621616703012501 0ustar #!/bin/bash # run the tests # see ./README for details. set -e export TESTDIR=$(mktemp -d) export PKGPATH="$TESTDIR/dpatch-test" export LANG=C export LC_ALL=C export SOURCE_DIR=$(pwd) ( set -ex run_test () { echo $1 chmod a+x $1 ( sed -n 's/^##:/ /p' < $1 echo if ./$1 2>&1; then echo [OK] $1 >> test.log.summary else echo [FAIL] $1 >> test.log.summary fi ) | tee log/$1.tmp # process /tmp/XXX/ dir pathnames so that we have consistent log output # every time; helps to have a consistent output. sed -e's,/tmp/[^/]*/,/tmp/XXXX/,g' < log/$1.tmp > log/$1.log rm log/$1.tmp } : > test.log.summary install -d log/ for TEST in [0-9][0-9]_*.sh; do run_test "$TEST" done rm -r "$TESTDIR" ) dpatch/tests/08_dpatch_list_patch.sh0000755000000000000000000000202311621425704014673 0ustar #!/bin/bash # Junichi Uekawa 11 Jul 2005. ##: check dpatch-list-patch works. ##: Depends on 06,07. set -e cd $PKGPATH echo '=== output of dpatch-list-patch' dpatch-list-patch echo '=== check for obvious entries in output of dpatch-list-patch' dpatch-list-patch | grep debian/patches/01_edpatch.dpatch dpatch-list-patch | grep "No description" dpatch-list-patch | grep debian/patches/03_description.dpatch dpatch-list-patch | grep "Description of this patch" ##: Also, run dpatch-edit-patch with -d option, and check that ##: -d only has effect on newly created patches echo '=== Edit patch with an attempt for changed description' #make sure it's unpatched debian/rules unpatch echo 'echo 08 > desc ' | \ dpatch-edit-patch -d '08 Changed description' 03_description echo '=== Make sure dpatch-list-patch picks up the new description' dpatch-list-patch if dpatch-list-patch | grep "08 Changed description"; then echo "This should not come here." exit 1 else : fi dpatch-list-patch | grep "Description of this patch" dpatch/tests/12_dpatch_with-cpp.sh0000755000000000000000000000127011621425704014272 0ustar #!/bin/bash # Junichi Uekawa 16 Dec 2005 ##: check --with-cpp functionality. set -e cd $PKGPATH echo '=== change 00list' cat > debian/patches/00list < debian/patches/00list <$PKGPATH/file1 1. This is file 1 2. which is an example file 3. to test that dpatch works EOF cat <$PKGPATH/file2 1. This is file 2 2. which is an example file 3. to test that dpatch works EOF ( cd "$TESTDIR" &&\ tar cfz dpatch-test_0.1.orig.tar.gz dpatch-test/ ) # create Debian directories. mkdir -p "$PKGPATH/debian/patches/" touch "$PKGPATH/debian/patches/00list" cp ../samples/rules/rules.new.dh "$PKGPATH/debian/rules" chmod a+x "$PKGPATH/debian/rules" touch "$PKGPATH/Makefile" cat < "$PKGPATH/debian/control" Source: dpatch-test Section: devel Priority: extra Maintainer: Dpatch Maintainers Standards-Version: 3.6.1 Package: dpatch-test Architecture: all Description: testsuite This is a package generated by the testsuite EOF cat < "$PKGPATH/debian/changelog" dpatch-test (0.1) UNRELEASED; urgency=low * this is nothing -- nobody Sat, 18 Jun 2005 22:39:07 +0000 EOF dpatch/tests/README0000644000000000000000000000133611621425704011236 0ustar [Testsuite documentation] This directory contains the testsuite for dpatch. Run the run-test.sh program with this directory as current directory. This testsuite requires the following packages installed: dpatch (it will not run the test against the source) debhelper The order of scripts is important; to add new tests, add it after the existing tests. The tests are of [0-9][0-9]_*.sh style. The exit code of the scripts are used to convey success/fail of tests. 0: success non-0: failure The log of execution is stored as test.log.summary, and log of individual runs are stored in log/$SCRIPTNAME compare the output between releases to find regression. -- 11 Jul 2005, Junichi Uekawa dpatch/scripts/0000755000000000000000000000000011671675726010720 5ustar dpatch/scripts/dpatch-list-patch.10000644000000000000000000000232011671675726014310 0ustar .\" Hey, EMACS: -*- nroff -*- .TH DPATCH-LIST-PATCH 1 "Dec 13, 2011" DPATCH .SH NAME dpatch-list-patch \- List available patches .SH SYNOPSIS .B dpatch\-list\-patch .RI [ options ] .SH DESCRIPTION This manual page documents briefly the .B dpatch\-list\-patch command which simply lists the available patches in a dpatch-based source tree together with their accompanying comments. .SH WARNING .B dpatch is deprecated, please switch to the `3.0 (quilt)' Debian source package format instead. See .I http://wiki.debian.org/Projects/DebSrc3.0#FAQ for a short guide on how to do it. .SH OPTIONS Without any options dpatch\-list\-patch will list the patches in the current source tree. .TP .B \-s, \-\-sourcedir Source directory. Defaults to \fI.\fR .TP .B \-h, \-\-help Show summary of options. .SH "SEE ALSO" .BR "dpatch" "(1), " .BR "dpatch" "(7), " .BR "dpatch.make" "(7), " .BR "dpatch\-edit\-patch" "(1), " .BR "dpatch\-convert\-diffgz" "(1)" .RI "Files in " "/usr/share/doc/dpatch/" .SH AUTHOR dpatch\-list\-patch was written by Junichi Uekawa . .br This manual page was written by Gergely Nagy . .\" arch-tag: a6567a76-6d0a-4d13-ae6d-a91a7fda0e82 dpatch/scripts/dpatch-list-patch0000755000000000000000000000143311621425704014140 0ustar #! /bin/sh ## dpatch-list-patch -- List available patches ## (C) 2003 Junichi Uekawa ## ## Released under the terms of the GNU GPLv2. ## Move to likely debian dir while ! test -d ./debian -o "$(pwd)" = "/" ; do cd ..; done ## Setup defaults DPLP_SRCDIR=$(pwd) ## Parse commandline dplp_usage () { echo "dpatch-list-patch, list available patches" echo " usage: dpatch-list-patch [-s|--sourcedir s]" } TEMP=$(getopt -n dpatch-list-patch -l help,sourcedir: -- +hs: "$@") eval set -- ${TEMP} while test "$1" != "--"; do case $1 in -s|--sourcedir) shift DPLP_SRCDIR=$1 ;; -h|--help) dplp_usage exit 0 ;; esac shift done echo "Patches that would be applied:" cd ${DPLP_SRCDIR} dpatch cat-all # arch-tag: fbd2892f-32fc-4a37-9a4d-8a0772ace95c dpatch/scripts/Makefile0000644000000000000000000000055711621612301012336 0ustar top_srcdir := .. include ../config.mk all clean: ; install: install --mode 0755 dpatch-convert-diffgz ${DESTDIR}${bindir}/ install --mode 0644 dpatch-convert-diffgz.1 ${DESTDIR}${man1dir}/ install --mode 0755 dpatch-list-patch ${DESTDIR}${bindir}/ install --mode 0644 dpatch-list-patch.1 ${DESTDIR}${man1dir}/ # arch-tag: 300ce63b-4d2e-4e55-8b36-720122051d35 dpatch/scripts/dpatch-convert-diffgz.10000644000000000000000000000224211671675726015172 0ustar .\" Hey, EMACS: -*- nroff -*- .TH DPATCH-CONVERT_DIFFGZ 1 "Dec 13, 2011" DPATCH .SH NAME dpatch-convert-diffgz \- Convert a debian .diff.gz to a dpatch file .SH SYNOPSIS .BI dpatch\-convert\-diffgz " patchno patchname" .br .BI dpatch\-convert\-diffgz " patchno_patchname" .SH DESCRIPTION This manual page documents briefly the .B dpatch\-convert\-diffgz command which simply generates a dpatch file from an existing Debian .diff.gz file. It does so, by building the sources with dpkg-buildpackage, and operating on the resulting Debian .diff.gz. .SH WARNING .B dpatch is deprecated, please switch to the `3.0 (quilt)' Debian source package format instead. See .I http://wiki.debian.org/Projects/DebSrc3.0#FAQ for a short guide on how to do it. .SH "SEE ALSO" .BR "dpatch" "(1), " .BR "dpatch" "(7), " .BR "dpatch.make" "(7), " .BR "dpatch\-edit\-patch" "(1), " .BR "dpatch\-list\-patch" "(1) " .RI "Files in " "/usr/share/doc/dpatch/" .SH AUTHOR dpatch\-convert\-diffgz was written by Junichi Uekawa . .br This manual page was written by Gergely Nagy . .\" arch-tag: d42717d2-2974-4709-9f99-1076d6e2851b dpatch/scripts/dpatch-convert-diffgz0000755000000000000000000000365311621612301015014 0ustar #! /bin/sh ## try and get a dpatch file from Debian diff.gz file. ## Copyright 2003 Junichi Uekawa. ## licensed under GPL version 2. # before running this code, you need to have prepared your debian/rules # as described in dpatch manual, and you need to have an empty # debian/patches/00list # # You can also use this script to add new patches. # # enjoy, # 15 Jan 2003, Junichi Uekawa set -e if [ ! -e /usr/bin/filterdiff ]; then echo "dpatch-convert-diffgz: filterdiff not found, aborting!" >&2 echo " (consider installing patchutils)" >&2 exit 1 fi while ! test -d ./debian -o "$(pwd)" = "/" ; do cd ..; done if [ $# -eq 2 ]; then DPCD_PATCHNO="$1" DPCD_PATCHNAME="$(basename $2 .dpatch)" elif [ $# -eq 1 ]; then DPCD_PATCHNO=$(echo "$1" | cut -d "_" -f1) DPCD_PATCHNAME=$(basename $(echo "$1" | cut -d "_" -f2-) .dpatch) fi DPCD_PATCHDIR=debian/patches if [ -z "$DPCD_PATCHNAME" ] || [ "$DPCD_PATCHNAME" = ".dpatch"; then cat <> ${DPCD_PATCHDIR}/00list fakeroot debian/rules patch # arch-tag: 5d7cf9b9-459c-4a5e-8a62-6bc1efa16e21 dpatch/samples/0000755000000000000000000000000011621425704010655 5ustar dpatch/samples/sample.00template0000644000000000000000000000122511621425704014033 0ustar #!/bin/sh # Sample debian/patches/00template script # era Thu May 15 23:24:07 2003 # This simply creates the equivalent of the hard-coded template. # Adapt and hack to suit your needs. file="$1" shift description="$@" fullnameguess="$(getent passwd $(id -un) | cut -f5 -d: | cut -f1 -d,)" domainguess=$([ -f /etc/mailname ] && cat /etc/mailname || hostname -f) emailguess="${DEBEMAIL:-${EMAIL:-$(logname)@${domainguess}}}" cat < ## ## All lines beginning with \`## DP:' are a description of the patch. ## DP: ${description:-No description} @DPATCH@ EOF dpatch/samples/rules/0000755000000000000000000000000011621612301011776 5ustar dpatch/samples/rules/rules.new.non-dh0000644000000000000000000000227611621425704015045 0ustar #! /usr/bin/make -f # Sample dpatch rules file. Only example. Nothing else. :) # This one uses the new way with dpatch from dpatch 2.x # For this example see the 00list.new.non-dh file too! CFLAGS = -g ifneq (,$(findstring noopt,${DEB_BUILD_OPTIONS})) CFLAGS += -O0 else CFLAGS += -O2 endif build: patch # Note that the above targets ("build" and "patch") are both phony, and # as such will always be considered out-of-date. If you don't want build: # to be re-run each time, see sample.rules test -e debian/control # Build your package here touch build-stamp clean: clean1 unpatch clean1: test -e debian/control && test xroot = x`whoami` rm -rf debian/files* core debian/*substvars build # Clean it up binary-arch: build test -e debian/control && test xroot = x`whoami` # Do everything you need to get a .deb out of it patch: patch-stamp patch-stamp: dpatch --with-cpp apply-all dpatch --with-cpp call-all -a=pkg-info >patch-stamp unpatch: dpatch --with-cpp deapply-all rm -rf patch-stamp debian/patched binary-indep: ; binary: binary-indep binary-arch .PHONY: binary binary-arch binary-indep clean clean1 build patch unpatch # arch-tag: b7ec2cca-c71a-4df1-a306-6761643ffb27 dpatch/samples/rules/rules.non-dh0000644000000000000000000000160511621425704014250 0ustar #! /usr/bin/make -f # Sample dpatch rules file. Only example. Nothing else. :) CFLAGS = -g ifneq (,$(findstring noopt,${DEB_BUILD_OPTIONS})) CFLAGS += -O0 else CFLAGS += -O2 endif include /usr/share/dpatch/dpatch.make build: patch # Note that the above targets ("build" and "patch") are both phony, and # as such will always be considered out-of-date. If you don't want build: # to be re-run each time, see sample.rules test -e debian/control # Build your package here touch build-stamp clean: clean1 unpatch clean1: test -e debian/control && test xroot = x`whoami` rm -rf debian/files* core debian/*substvars build # Clean it up binary-arch: build test -e debian/control && test xroot = x`whoami` # Do everything you need to get a .deb out of it binary-indep: ; binary: binary-indep binary-arch .PHONY: binary binary-arch binary-indep clean clean1 build patch unpatch dpatch/samples/rules/00list.new.non-dh0000644000000000000000000000075411621425704015025 0ustar /* * arch-tag: f7c1c1ff-89ea-40bb-8aac-889d6fb3d840 */ #if DEB_BUILD_ARCH == "m68k" 01a_doathingthatsfast #else // Fast machine, it doesnt hurt 01_dotherightbutslowthing #endif /* The next one does really nothing. But thats not important. It only shows you that you can have comments if you use the --with-cpp switch. Of course you can do everything that the cpp lets you do and not only stupid, small-line comments. If it makes sense is up to you. */ 02_nothingdone dpatch/samples/rules/Makefile0000644000000000000000000000047311621612301013442 0ustar top_srcdir := ../.. include ../../config.mk SAMPLES = rules.dh rules.non-dh rules.new.dh rules.new.non-dh \ 00list.new.non-dh rules.dh7 all clean: ; install: install -d ${DESTDIR}${sampledir}/rules install -m 0644 ${SAMPLES} ${DESTDIR}/${sampledir}/rules/ # arch-tag: c13082da-1c0a-4a33-a965-464b133e7985 dpatch/samples/rules/rules.dh70000644000000000000000000000020611621612301013532 0ustar #! /usr/bin/make -f ## ## Sample dpatch rules file, to be used with debhelper >= 7, and ## dpatch >= 2.0.32. %: dh $@ --with dpatch dpatch/samples/rules/rules.dh0000644000000000000000000000173111621425704013460 0ustar #!/usr/bin/make -f # # Sample dpatch rules file. Only example. Nothing else. :) export DH_COMPAT = 4 # Include dpatch stuff. include /usr/share/dpatch/dpatch.make CFLAGS = -Wall -g ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) CFLAGS += -O0 else CFLAGS += -O2 endif build: build-stamp build-stamp: patch-stamp @echo "--- Compiling" dh_testdir # Do something to build your package here touch build-stamp clean: clean1 unpatch clean1: @echo "--- Cleaning" dh_testdir dh_testroot dh_clean -k # Clean your build tree install: build-stamp dh_testdir dh_testroot dh_clean -k dh_installdirs # Install it here # Build architecture-independent files here. binary-indep: build install # Build architecture-dependent files here. binary-arch: build install dh_testdir dh_testroot dh_installdocs # And all the other dh_* stuff you need for your package. binary: binary-indep binary-arch .PHONY: binary clean binary-indep binary-arch build install patch unpatch \ clean1 dpatch/samples/rules/rules.new.dh0000644000000000000000000000260611621425704014252 0ustar #!/usr/bin/make -f # # Sample dpatch rules file. Only example. Nothing else. :) # This one uses the new way with dpatch from dpatch 2.x export DH_COMPAT = 4 CFLAGS = -Wall -g ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) CFLAGS += -O0 else CFLAGS += -O2 endif build: build-stamp build-stamp: patch @echo "--- Compiling" dh_testdir # Do something to build your package here touch build-stamp clean: clean1 unpatch clean1: @echo "--- Cleaning" dh_testdir dh_testroot dh_clean -k # Clean your build tree install: build-stamp dh_testdir dh_testroot dh_clean -k dh_installdirs # Install it here # Build architecture-independent files here. binary-indep: build install # Build architecture-dependent files here. binary-arch: build install dh_testdir dh_testroot dh_installdocs # And all the other dh_* stuff you need for your package. # And now the simple things for dpatch. Here we only apply/unapply the patches. # You can do more things with dpatch, like having patches only applied on # a special architecture - see the non-dh version of the sample for this! patch: patch-stamp patch-stamp: dpatch apply-all dpatch cat-all >patch-stamp touch patch-stamp unpatch: dpatch deapply-all rm -rf patch-stamp debian/patched binary: binary-indep binary-arch .PHONY: binary clean binary-indep binary-arch build install patch unpatch \ clean1 # arch-tag: b125e86e-5880-4af8-9169-5ffb7f24f054 dpatch/samples/Makefile0000644000000000000000000000042211621425704012313 0ustar top_srcdir := .. include ../config.mk SAMPLES = sample.00template all clean: ; install: ${MAKE} -C rules $@ ${MAKE} -C dpatch $@ install -d ${DESTDIR}${sampledir} install -m 0644 ${SAMPLES} ${DESTDIR}/${sampledir}/ # arch-tag: e7d31caf-a56d-4006-8982-ead43c005e57 dpatch/samples/dpatch/0000755000000000000000000000000011621425704012120 5ustar dpatch/samples/dpatch/Makefile0000644000000000000000000000037211621425704013562 0ustar top_srcdir := ../.. include ../../config.mk SAMPLES = 01_config.dpatch all clean: ; install: install -d ${DESTDIR}${sampledir}/dpatch install -m 0644 ${SAMPLES} ${DESTDIR}/${sampledir}/dpatch/ # arch-tag: d16a7900-a9c3-4750-9ed4-ffd07f120bdb dpatch/samples/dpatch/01_config.dpatch0000644000000000000000000000125611621425704015056 0ustar #! /bin/sh -e ## config.dpatch ## Ralf Treinen ## ## All lines beginning with `## DP:' are a description of the patch. ## DP: replace all config.{guess,sub} by the vesion installed in ## DP: /usr/share/misc dpatch_patch () { find . -name config.guess -o -name config.sub \ | tar cf debian/patched/config.guess+sub.tar -T - find . -name config.guess \ -exec ln -sf /usr/share/misc/config.guess '{}' \; find . -name config.sub \ -exec ln -sf /usr/share/misc/config.sub '{}' \; } dpatch_unpatch () { tar xf debian/patched/config.guess+sub.tar } DPATCH_LIB_NO_DEFAULT=1 . /usr/share/dpatch/dpatch.lib.sh # arch-tag: 8a610a57-687b-4395-8ff2-79265c0a4eb3 dpatch/docs/0000755000000000000000000000000011621612301010130 5ustar dpatch/docs/README.svn-mergeWithUpstream0000644000000000000000000000525711621612301015300 0ustar HOWTO use dpatch with a debian/-only VCS layout =============================================== This HOWTO has been primarily written for users of svn-buildpackage in mergeWithUpstream mode. In this case, normally only the debian/- directory and patches (normally in debian/patches/) are stored under VCS-control. This setup does not include the complete package source. However, dpatch already can handle this layout perfectly via the -b swtich. Optional to this switch you can give the full path to the .orig.tar.gz tarball, e.g.: $ dpatch-edit-patch -b /usr/local/src/foo/foo-1.0.tar.gz If you do not provide the tarball, dpatch tries to call the hook script set in conf_getorigtargz (in $HOME/.dpatch.conf) or in the DPEP_GETORIGTARGZ environment variable. See the dpatch-edit-patch manual for the exact steps taken. Using the first option, you can configure dpatch to look at the "right" place by defining conf_origtargzpath in ${HOME}/.dpatch.conf. Say for example your sources always reside in /usr/local/src/packages/${PACKAGE}, then add the following to your .dpatch.conf (BASH syntax!) /---- .dpatch.conf ----------------------------------------------------------- # the following is necessary, because dpatch maybe determines the variables # too late PACKAGENAME="$(dpkg-parsechangelog | \ sed -n '/^Source:/{s/^Source:[[:space:]]\+\(.*\)/\1/;p;q}')" UPSTREAMVERSION="$(dpkg-parsechangelog | \ sed -n '/^Version:/{s/^Version:[[:space:]]\+\([0-9]\+:\)\?\([^-]\+\).*/\2/;p;q}')" # simply adjust the following variable for your needs conf_origtargzpath="/usr/local/src/packages/${PACKAGENAME}" \----------------------------------------------------------------------------- Maybe you have different locations, because you are part of several projects. In this case, you can do the following: /---- .dpatch.conf ----------------------------------------------------------- # the following is necessary, because dpatch maybe determines the variables # too late PACKAGENAME="$(dpkg-parsechangelog | \ sed -n '/^Source:/{s/^Source:[[:space:]]\+\(.*\)/\1/;p;q}')" UPSTREAMVERSION="$(dpkg-parsechangelog | \ sed -n '/^Version:/{s/^Version:[[:space:]]\+\([0-9]\+:\)\?\([^-]\+\).*/\2/;p;q}')" # simply adjust the following test and variable for your needs if [[ `pwd` =~ '^.*/debian-med/trunk/packages/.*$' ]] then conf_origtargzpath="/usr/local/src/packages/debian-med/trunk/packages/${PACKAGENAME}" else conf_origtargzpath="/usr/local/src/packages/${PACKAGENAME}" fi \----------------------------------------------------- So you simply run $ dpatch-edit-patch -b in your VCS copy and dpatch automatically figures out the correct place to look for the upstream tarball. -- Daniel Leidert, January 2008 # vim:tw=78 dpatch/docs/README.source0000644000000000000000000000274311621612301012315 0ustar This package uses dpatch to manage all modifications to the upstream source. Changes are stored in the source package as diffs in debian/patches and applied during the build. To get the fully patched source after unpacking the source package, cd to the root level of the source package and run: debian/rules patch Removing a patch is as simple as removing its entry from the debian/patches/00list file, and please also remove the patch file itself. Creating a new patch is done with "dpatch-edit-patch patch XX_patchname" where you should replace XX with a new number and patchname with a descriptive shortname of the patch. You can then simply edit all the files your patch wants to edit, and then simply "exit 0" from the shell to actually create the patch file. To tweak an already existing patch, call "dpatch-edit-patch XX_patchname" and replace XX_patchname with the actual filename from debian/patches you want to use. To clean up afterwards again, "debian/rules unpatch" will do the work for you - or you can of course choose to call "fakeroot debian/rules clean" all together. --- this documentation is part of dpatch package, and may be used by packages using dpatch to comply with policy on README.source. This documentation is meant to be useful to users who are not proficient in dpatch in doing work with dpatch-based packages. Please send any improvements to the BTS of dpatch package. original text by Gerfried Fuchs, edited by Junichi Uekawa 10 Aug 2008. dpatch/docs/README.History0000644000000000000000000000174211621612301012454 0ustar History of `dpatch' =================== The history of dpatch dates back to the slink era, when around late October, 1998, the GCC maintainers (according to the changelog, Matthias Klose and Dan Jacobowitz) implemented its first version. It was quite complex, but the design remained the same throughout the years, only minor fixes were made. Then, somewhen during 2001 September, Gergely Nagy borrowed the code from gcc, simplified it a great deal, making it use debian/patches/00list instead of relying on filenames, timestamps or other funky stuff. And then, in 2002 December, armed by dpatch-edit-patch, the system is being generalised, to fit all the needs we can think of, and being released for public consumption. Since then, quite a few people contributed ideas and code. It seems, dpatch was not such a bad idea! :) --- Since 2005, Junichi Uekawa picked it up. With quilt and cdbs it looked like the system may be deprecated, but it's still live and kicking. Interesting. dpatch/debian/0000755000000000000000000000000011714165276010443 5ustar dpatch/debian/pbuilder-test/0000755000000000000000000000000011621425704013216 5ustar dpatch/debian/pbuilder-test/01_runtest0000644000000000000000000000011511621425704015142 0ustar #!/bin/bash cd tests apt-get install -y --force-yes debhelper ./run-test.sh dpatch/debian/changelog0000644000000000000000000010557111714165062012317 0ustar dpatch (2.0.35) unstable; urgency=low * Mark the package Multi-Arch: foreign, thanks Riku Voipio . (Closes: #658974) -- Gergely Nagy Tue, 07 Feb 2012 10:07:31 +0100 dpatch (2.0.34) unstable; urgency=high * The magic that was supposed to reset the timestamps of patched files failed to take the --workdir option into account. This has now been corrected. (Closes: #651948) Urgency high because this bug breaks any build that uses --workdir, and has patchutils installed. -- Gergely Nagy Tue, 13 Dec 2011 17:19:05 +0100 dpatch (2.0.33) unstable; urgency=low * dpatch is now DEPRECATED, please do not use it for new packages. + NEWS and manual pages updated accordingly. * dpatch-edit-patch does not fail anymore when there is binary data in the patch. Patch from Ben Brown (Closes: #638864). -- Gergely Nagy Sun, 23 Oct 2011 23:09:08 +0200 dpatch (2.0.32) unstable; urgency=low * New Maintainer (Closes: #562697). * Add build-arch and build-indep targets, as suggested by Lintian. * Bump Standards-Version to 3.9.2. * Convert to format "3.0 (native)". * Update the Vcs-* fields. * Convert debian/changelog to DEP-5 format. * Include documentation to work with debian/-only VCS layouts. Thanks, Daniel Leidert! (Closes: #449190) * Bugs fixed: + dpatch-edit-patch now allows colons in directory names. Patch from Sandro Tosi (Closes: #405493). + dpatch-edit-patch accepts the (documented) -r option (Closes: #388658). + Depend on dpkg-dev, for dpkg-architecture (Closes: #473680). + Print errors to stderr (Closes: #559168). + dpatch.make correctly sets the patch and unpatch targets as .PHONY (Closes: #456919). + CPP mode sets DEB_BUILD_ARCH_$arch correctly on non-linux archs (Closes: #355278). + Corrected dpatch(1) to make the patch/unpatch aliases clear (Closes: #372787). + Fixed documentation of how dpatch-edit-patch determines the author's name (Closes: #407306). + dpatch-edit-patch now properly respects $DPEP_TMPDIR (Closes: #403903). + dpatch-edit-patch now properly detects upstream versions with a hyphen (Closes: #445179). * New features: + dpatch-edit-patch can pass extra options to diff (via the DPEP_DIFF_OPTIONS environment variable, or -O command-line option) (Closes: #330594). + debhelper 7 (dh) support added, patch from Hideki Yamane (Debian-JP) (Closes: #573567) + dpatches using dpatch.lib.sh's default patching mechanism will now also reset the timestamps of all patched files to be the same accross all files, if patchutils is installed (Closes: #466364). + dpatch-convert-diffgz now accepts PATCHNO_PATCHNAME format arguments too, similar to dpatch-edit-patch (Closes: #328730). + dpatch.make's patch target can now (optionally) depend on other make targets (Closes: #400888). + dpatch-edit-patch now export two variables to the subshell: DPEP_SHELL_REFDIR and DPEP_SHELL_WORKDIR (see the manual for details) (Closes: #481237). + dpatch-edit-patch can now (optionally) remove timestamps from the diffs it generates. See the manual page for details (Closes: #342774). * Features removed: + dpatch-get-origtargz is gone. With debian/rules get-orig-source and uupdate, it is of no use anymore. It was a source of bugs, however, and did not work with anything else but tar.gz archives. (Closes: #391776) + dpatch-cowdancer-patch was removed aswell, because due to the dpatch-get-origtargz removal, it would've needed an update. But I never used it, don't understand it, and would rather remove a tool than ship a broken one. + dpatch-edit-patch does not automatically attempt to fetch the original tarball when called with the -b option. It will still try to execute any hooks set, however. -- Gergely Nagy Sun, 21 Aug 2011 11:43:30 +0200 dpatch (2.0.31) unstable; urgency=low * fix: /usr/share/dpatch/dpatch-edit-patch.functions: line 140: shifti: command not found (closes: #498609), thanks to Daniel Leidert * remove Gergely Nagy and Joerg Jaspert from Uploaders field; they haven't uploaded in five years. (closes: #519349) -- Junichi Uekawa Sat, 21 Mar 2009 23:29:38 +0900 dpatch (2.0.30) unstable; urgency=low * add README.source, thanks to Gerfried Fuchs (closes: #491092) * debian/control: standards-version 3.8.0 * Bug fix: "dpatch: --desc vs. --desc-only", thanks to gregor herrmann (Closes: #470155). * depend on bash => 3.0-6 for pipefail -- Junichi Uekawa Sun, 10 Aug 2008 23:46:17 +0900 dpatch (2.0.29) unstable; urgency=low * add Vcs-Git and Vcs-Browser tags. * Using the -a -0 options twice to the same patch makes it overridden (Closes: #452702) -- Junichi Uekawa Sat, 26 Jan 2008 11:44:34 +0900 dpatch (2.0.28) unstable; urgency=low * Bug fix: "dpatch: manpage refers to DPGO_ORIGTARPATH but real variable is DPGO_ORIGTARGZPATH", thanks to Sylvain Le Gall (Closes: #444231). * Bug fix: "d-e-p: cmdline flag to automatically append new patch name to 00list", thanks to Sandro Tosi (Closes: #316588). * Bug fix: "/usr/bin/dpatch-edit-patch: d-e-p: cmdline flag for applying all patches when creating new patch", thanks to Sandro Tosi (Closes: #316587). * Bug fix: "Fix hyphens in man page and update FSF address in copyright.", thanks to Kumar Appaiah (Closes: #446049). * Bug fix: "dpatch: fails when $HOME contains spaces", thanks to Martin Koeppe (Closes: #440044). * Bug fix: "dpatch-edit-patch: when tarball retrieve fails, error msg is incomplete", thanks to Kurt B. Kaiser (Closes: #443140). * Bug fix: "dpatch-get-origtargz: doesn't use canonical tarball name for retrieved file", thanks to Kurt B. Kaiser (Closes: #443144). -- Junichi Uekawa Sun, 28 Oct 2007 13:47:55 +0900 dpatch (2.0.27) unstable; urgency=low * Bug fix: "dpatch: [patch] README.git - wording fixes", thanks to Jari Aalto (Closes: #435790). * Apply patch: "dpatch-edit-patch --debianonly=PATH tries to unpack PATH", thanks to Daniel Leidert (Closes: #426423). -- Junichi Uekawa Fri, 03 Aug 2007 21:28:59 +0900 dpatch (2.0.26) unstable; urgency=low * Bug fix: "Stray 'q' in dpatch-edit-patch.functions breaks --shell (-l) argument to dpatch-edit-patch", thanks to Paul TBBle Hampson (Closes: #429051). * README.arch -> README.git: update contents to match current status quo. * dpatch.make.7: document patch-stamp usage, and update manpage example from the rules file snippet from samples/ directory. - Bug fix: "Undocumented sideeffect of forcing build to run", thanks to Marcin Owsiany (Closes: #429723). * Bug fix: "Cowdancer support for dpatch-edit-patch", thanks to Paul TBBle Hampson (Closes: #429048). - add dpatch-cowdancer-patch command for running dpatch-edit-patch with cowdancer. -- Junichi Uekawa Mon, 25 Jun 2007 21:19:59 +0900 dpatch (2.0.25) unstable; urgency=low * specify dpatch command to use bash, to use 'set -o pipefail', for users who are using dash as their /bin/sh. (Closes: #425966). -- Junichi Uekawa Sun, 27 May 2007 02:59:06 +0900 dpatch (2.0.23) unstable; urgency=low * Bug fix: "dpatch: option -v causes errors to be ignored", thanks to Peter Eisentraut (Closes: #396738). -- Junichi Uekawa Sun, 20 May 2007 08:27:35 +0900 dpatch (2.0.22) unstable; urgency=low * dpatch-edit-patch: default ignore directory was "CVS .svn", it is now "CVS .svn .git .arch .hg _darcs .bzr" * add pbuilder-test. * Bump Standards-Version to 3.7.2 -- Junichi Uekawa Tue, 8 May 2007 02:02:24 +0900 dpatch (2.0.21) unstable; urgency=low * Bug fix: "dpatch: wrong example in manpage", thanks to Loic Le Guyader (Closes: #398452). The sample file was already fixed, but the manpage had the wrong version. * Bug fix: "Make dpatch-edit-patch updated patch to have a permission from umask, not 711", thanks to Daniel Leidert (Closes: #398495). -- Junichi Uekawa Wed, 15 Nov 2006 21:31:35 +0900 dpatch (2.0.20) unstable; urgency=low [Junichi Uekawa] * dpatch-edit-patch, dpatch-get-origtargz: support epoch (Closes: #368250). * Bug fix: "possible issues with /usr/share/doc/dpatch/examples/rules/rules.new.dh.gz", thanks to Marc Haber (Closes: #357820). -- Junichi Uekawa Fri, 2 Jun 2006 23:19:56 +0900 dpatch (2.0.19) unstable; urgency=low [Junichi Uekawa] * Fix spelling mistake in manual pages (Closes: #357440). * Bug fix: "dpatch: [manual] Missing SEE ALSO dpatch-list-patch(1)", thanks to Jari Aalto (Closes: #352424). -- Junichi Uekawa Sat, 25 Mar 2006 14:44:03 +0900 dpatch (2.0.18) unstable; urgency=low * Bug fix: "dpatch-convert-diffgz creates inconsistant 00list", thanks to Charles Fry (Closes: #328400). Remove document that refers to '01-patchname.dpatch' as the format for 00list file (dpatch.1), and update to document the real practice. * Bug fix: "dpatch-edit-patch produces locale-dependent patch output", thanks to Peter Eisentraut (Closes: #341103). * fix obvious typo, list-up-tp -> list-up-to -- Junichi Uekawa Sat, 11 Feb 2006 23:33:32 +0900 dpatch (2.0.17) unstable; urgency=low * Fix a bug where dpatch-edit-patch writes a garbage filename when @DPATCH@ is not there on editing a patch. - tests/14_dpatch_edit_patch_without_DPATCH.sh * Bug fix: "dpatch-get-origtargz: bug when origtgz is a symlink", thanks to Enrico Tassi (Closes: #344691). -- Junichi Uekawa Sat, 28 Jan 2006 08:21:15 +0900 dpatch (2.0.16) unstable; urgency=low * Bug fix: "dpatch: manpage typo: s/ th / the /", thanks to Justin Pryzby (Closes: #337160). * Bug fix: "dpatch suggests wrong cpp build dependency", thanks to Matthias Klose (Closes: #333005). * Bug fix: "examples/rules/rules.new.non-dh.gz uses undocumented --with-cpp option", thanks to Matthias Klose (Closes: #333006). * Bug fix: "dpatch-edit-patch should fail when no patchname specified", thanks to Charles Fry (Closes: #328731). -- Junichi Uekawa Fri, 16 Dec 2005 08:16:54 +0900 dpatch (2.0.15) unstable; urgency=low * Bug fix: "dpatch: prettier diff -u headers", thanks to Peter Samuelson (Closes: #321320). - update testsuites. (dancerj) * Man page SEE ALSO update (dancerj) - dpatch-edit-patch.1 (closes: #320664) - dpatch-list-patch.1 - dpatch-get-origtargz.1 - dpatch-convert-diffgz.1 * Remove reference to README file which is no longer there - dpatch-edit-patch.1 (closes: #328288) - dpatch-list-patch.1 -- Junichi Uekawa Sun, 18 Sep 2005 07:29:05 +0900 dpatch (2.0.14) unstable; urgency=low * Fix typo in dpatch.7 manpage. Thanks to A Costa. (mh) Closes: #312427 * Fix more typos. (mh) * Fix dpatch-get-origtargz which had the apt-get source return code reversed. (mh) * add testsuite in tests/ directory. (dancerj) * dpatch-edit-patch.functions (dpep_template_hardcoded): change to accept patch description lines. (dancerj) - -d option works now with hardcoded default, when 00template does not exist. * dpatch-edit-patch.1, dpatch-edit-patch: new option --stampdir to specify debian/patched directory. (dancerj) * Bug fix: "running dpatch-edit-patch in a patched source tree leads to errors during clean target" (Closes: #314494). (dancerj) - This is also a response for request of OOo patch system. Rather than taking that approach, we check more rigorously. (Closes: #290820) - dpep: Check for debian/patched/patch.dpatch, and require --clean option to be specified in that case. - tests/05_edit_with_patched now passes. * dpatch-edit-patch does not give out an error message when --debianonly flag is given a nonexisting file, patch from mh. (closes: #317758) tests/10_dpep_debianonly.sh output is fixed. * Feature implementation: "dpatch-get-origtargz does not found upstream tarballs in ../upstream", thanks to Stefano Zacchiroli (Closes: #315719) * Fix curl detection. (mh) (Closes: #317757) * Standards-Version: 3.6.2 (no changes needed) (mh) -- Marc Haber Tue, 19 Jul 2005 15:43:58 +0000 dpatch (2.0.13) unstable; urgency=low * upload to unstable. -- Marc Haber Mon, 6 Jun 2005 21:33:52 +0000 dpatch (2.0.12) experimental; urgency=low * Marc Haber: + New maintainer team: Maintainers point to dpatch-maintainers@ lists.alioth.debian.org, team members are in Uploaders. + (dpatch-get-origtargz): New script to find upstream tarball, also available for third parties (for example a svn-buildpackage hook). (Closes: #291666) + (dpatch-edit-patch): Adapt to use external code + (dpatch-edit-patch): Allow replacing of dpatch-get-origtargz by a user-supplied hook script. Discussion of this feature is in BTS #291668. + (dpatch-edit-patch): Add config file debian/patches/00dpatch.conf where selected configuration variables can be set from within the package. (Closes: #291668). + (dpatch-edit-patch): re-work dpep parameter processing to use getopt. (Closes: #291665) + (dpatch-edit-patch): dereference all symlinks on reference or work copy cration. (Closes: #275700) + (dpatch_lowlevel.shpp): display correct path to *.dpatch.failed. (Closes: #306978) + (dpatch.make): do not reverse UNPATCHLIST. (Closes: #305023) + (dpatch-edit-patch): Exclude CVS and .svn from the reference and working copy (configurable via the --exclude option). (Closes: #209112) * Junichi Uekawa: + (dpatch-convert-diffgz.1): Clarify documentation to say that it is using 'Debian' .diff.gz created throught dpkg-buildpackage. -- Marc Haber Sun, 15 May 2005 14:38:32 +0000 dpatch (2.0.11) experimental; urgency=low * Gergely Nagy: + Fix 01_config.dpatch; thanks, Peter Eisentraut. (Closes: #274533). + Fix dpatch-edit-patch(1) by removing the executable template docs; patch from Nico Golde. (Closes: #254689) + Update dpatch(1) example section, mentioning parallel builds. Patch from Eduard Bloch. (Closes: #271831) + Removed the README, as fast everything in it is duplicated on the manual pages, and those are kept up to date. + Swapped Joerg and myself (Maintainer<->Uploaders). Chocolate, flowers and whatnot to my room, please. + Fixed dpatch-edit-patch's --help option parsing. + debian/control (Suggests): Added curl, as dpatch-edit-patch might use it in some cases, if available. * Marc Haber: + [dpatch-edit-patch]: Changed the default behaviour to not clean the work drirectory, and added a --clean switch to restore the former mode of operation. (Closes: #288282) + [dpatch-edit-patch]: Added a --debianonly switch to support debian/-only source package layouts. (Closes: #288284) -- Gergely Nagy Sun, 16 Jan 2005 14:06:55 +0100 dpatch (2.0.10) unstable; urgency=high * Gergely Nagy: + Install NEWS.Debian; thanks, Peter Eisentraut. (Closes: #275163). + Urgency set to high, so we can get in sarge, maybe. -- Gergely Nagy Thu, 7 Oct 2004 10:04:05 +0200 dpatch (2.0.9) unstable; urgency=low * Nico Golde: + Fixed dpatch-convert-diffgz.1, patch from Helge Kreutzmann. (Closes: #242893) + Fixed dpatch deapply documentation, patch from Shaul Karl. (Closes: #255476) * Gergely Nagy + Fixed dpatch-edit-patch local information leak, patch from Darren Salt. (Closes: #240709) + Modified the default templates to call patch with -g0. Requested by John V. Belmonte. (Closes: #259662) + Extracted commonly used dpatch scriptlet code, providing two new ways to make a dpatch scriptlet shorter and lighter. See NEWS.Debian for details. Thanks to Tobias Grimm, Thomas Günther for their ideas. (Closes: #259356) + Made dpatch-edit-patch call dpatch deapply-all directly, upon cleaning. Request from Bastian Kleineidam. (Closes: #260666) -- Gergely Nagy Tue, 17 Aug 2004 16:35:53 +0200 dpatch (2.0.8) unstable; urgency=low * Fix typo in dpatch-edit-patch from previous upload -- David B. Harris Tue, 16 Mar 2004 23:17:13 -0500 dpatch (2.0.7) unstable; urgency=medium * dpatch/dpatch_lowlevel.shpp: + Don't create stampfile if the patch failed to apply, create stampfile.failed instead + When applying a patch failes, record its md5sum in stampfile.failed + When unapplying patches, if .failed exists and the md5sum matches still matches, ignore failure (a half-applied patch will be successfully reverted if the patch hasn't changed) * dpep/dpatch-edit-patch: Don't mistakenly apply patch in source tree (which it will if you're editing the first patch in 00list). (Closes: #235596) * debian/control: Change my Uploaders: email address from my private one to dbharris@debian.org -- David B. Harris Mon, 1 Mar 2004 13:13:26 -0500 dpatch (2.0.6) unstable; urgency=high * Gergely Nagy: - dpep/dpatch-edit-patch: When editing a pre-existing patch, force dpatch to skip creating stamp files (as they'd show up in the diff, which is a Bad Thing). - dpatch/dpatch_patchset.shpp: Fixed a serious file name comparsion bug (noticed by David B Harris). * David B Harris: - dpep/dpatch-edit-patch: Use 'debian/rules clean unpatch' to clean the source tree before replication - this allows for one to ship a regular-style source package (with all the patches applied to the tree) even if dpatch is used. Thanks, Bill Allombert. (Closes: #195823) - Use 'grep -F' instead of 'egrep -F'. The latter is seriously broken. -- Gergely Nagy Mon, 23 Feb 2004 21:26:34 +0100 dpatch (2.0.5) unstable; urgency=medium * David B Harris: - Mention in the manpage that if a maintainer wants to preprocess their 00list with cpp, they need to add it to Build-Depends or Build-Depends-Indep, as it isn't a dpatch dependency. - dpatch/dpatch_lowlevel.shpp: Make sure stampfile is put in place even if patching fails - without this, a half-applied dpatch wouldn't be un-half-applied via 'debian/rules unpatch'. Future attempts to 'debian/rules patch', even with a fixed dpatch, would fail. - dpatch/dpatch_template.shpp: Add @DPATCH@ tag to generated template - dpep/dpatch-edit-patch: Fix bug where if the interactive subshell exited with *anything* other than 0, the script would abort (and not clean up, at that). The intention is to only abort if the shell exits with code 230 (ie: the developer explicitly goes 'exit 230'). - dpep/dpatch-edit-patch{,.functions}: Port to using new /usr/bin/dpatch calls instead of reimplementing the (old) dpatch.make. Also support an executable 00template (which is supposed to dump the dpatch header to STDOUT) via DPEP_OPTION_EXEC_TEMPLATE=1 in 00options. Not yet documented. -- David B Harris Tue, 17 Feb 2004 04:24:14 -0500 dpatch (2.0.4) unstable; urgency=low * Gergely Nagy: - Handle empty 00list files correctly, patch from Daniel Kobras. (Closes: #228556) - Fixed dpatch-convert-diffgz, which was broken some time ago. * David B. Harris: - Use `head -n 1' instead of `head -1', patch from Robert Luberda. (Closes: #229941) - Added support for debian/patches/00options (see man page for details). -- Gergely Nagy Sun, 15 Feb 2004 12:55:34 +0100 dpatch (2.0.3) unstable; urgency=medium * Gergely Nagy: - Do not ship NEWS.Debian. (Noticed by Jordi Mallach and Joey Hess) (Closes: #227991) - Updated README to note that there are cases when patch-stamp should be a prerequisite of something else than build-stamp. (Closes: #197956) - Implemented configuration file support (no documentation yet, sorry). -- Gergely Nagy Sun, 18 Jan 2004 14:49:00 +0100 dpatch (2.0.2) unstable; urgency=low * Gergely Nagy: - dpatch --workdir does not cd to the destination directory anymore. Add a --chdir option to restore the old behaviour. - README made clear about patch order. Thanks to Steve Greenland for noticing. (Closes: #223876) - Written a short dpatch(7). - Fixed bashisms, thanks to Ian Dichkovsky. (Closes: #224879) - Made dpatch patch-template work with a diff on its STDIN. -- Gergely Nagy Sat, 10 Jan 2004 13:28:20 +0100 dpatch (2.0.1) experimental; urgency=low * Gergely Nagy: - Fixed example installation, noticed by Geert Stappers. (Closes: #217136) - Include README.arch in the binary package. Patch from Geert Stappers. (Closes: #221976) - Mention README.arch in the README. Patch from Geert Stappers. (Closes: #221979) - Update README.arch, so it has commands for tla 1.0 too. Omission noticed by Geert Stappers. (Closes: #221980) - Restore dpatch1 compatibility. Noticed and solution provided by Geert Stappers. (Closes: #222006) - Implemented "dpatch log" and added a "--verbose" option to the apply and deapply sub-commands. Requested by Geert Stappers. (Closes: #222103) -- Gergely Nagy Sat, 6 Dec 2003 20:51:59 +0100 dpatch (2.0.0) experimental; urgency=low * Gergely Nagy: - Rewritten dpatch to be a stand-alone script, with a compatibility dpatch.make wrapper. - As a side effect, this fixes the following bugs: + #203999: dpatch: Extension check in unpatch is leaking. + #217040: leaks private information from development environment + #209107: dpatch: reserving some of the patch $1 namespace for package use. + #209109: dpatch: like to expliticly patch a random src tree copy. + #217045: should revert half-failed patches (Use dpatch --force for this functionality) - Reorganised the examples, and added a new one: + #217136: dpatch example : config.{guess,sub}. Thanks to Ralf Treinen. -- Gergely Nagy Sun, 16 Nov 2003 15:28:31 +0100 dpatch (1.24) unstable; urgency=medium * David B Harris: - Revert broken @DPATCH@ preservation behaviour, which was introduced by a submitted patch some time ago. Thanks to Eduard Bloch for pointing it out. (Closes: #203968) -- David B Harris Sun, 3 Aug 2003 06:42:42 -0400 dpatch (1.23) unstable; urgency=low * Henrique de Moraes Holschuh: - dpatch.make (PATCHLIST): Only expand this once. (UNPATCHLIST): Likewise. (DEB_BUILD_ARCH): New variable. (DPATCH_ARCH): Use ${DEB_BUILD_ARCH}, to be far more friendly to existing practice. - README: Added a note about dpatch.make's usage of ${PACKAGE}, and a warning about some dpatch-* tools not respecting ${PATCHLIST}. * Gergely Nagy: - dpatch.make (PATCHLIST): Removed the sorting stuff. - dpatch-list-patch: Likewise. * The removal of the sorting stuff, and Henrique's changes: (Closes: #203353). -- Gergely Nagy Thu, 31 Jul 2003 12:33:04 +0200 dpatch (1.22) unstable; urgency=low * Brown paper bag release: - 'dpatch.make:45: *** unterminated call to function `shell': missing `)' fixed, caused all builds with 1.21 to break. Let us never upload on Friday the 13th again. -- David B Harris Sat, 14 Jun 2003 04:01:28 -0400 dpatch (1.21) unstable; urgency=low * Gergely Nagy: - dpatch.make (PATCHLIST_ALL): Do not hide stderr. (PATCHLIST_ARCH): Likewise. Patch from Joshua Kwan and Era Eriksson. (Closes: #195626) * David B Harris: - dpatch-edit-patch.functions (dpep_template_hardcoded): Don't append .dpatch to patch filename, dpep-edit-patch does that for us. Thanks James Troup, Closes: #196329 - dpatch-edit-patch: Fix bad sed call (Closes: #196893) -- Gergely Nagy Fri, 13 Jun 2003 22:52:52 +0200 dpatch (1.20) unstable; urgency=low * David B. Harris: - dpatch-edit-patch, dpatch-edit-patch.functions, dpatch-edit-patch.1: + The meaning of CLI option -k (keep temporary working directory) was reversed. Thanks to Era Eriksson for the patch :) (Closes: #193392) + Another patch from Era - thanks again! This one allows debian/patches/00template to be executable. See the manpage for more details. (Closes: #193481) * Gergely Nagy: - debian/control (Standards-Version): Bumped to 3.5.10.0. - dpatch.make (PATCHLIST_ALL): Redirect stderr to /dev/null. (PATCHLIST_ARCH): Likewise. Noticed by James Troup. (Closes: #195104) - debian/rules (binary-indep): Mark all files in ${DPATCH}/etc as conffiles. - dpatch-list-patch: Use "$( (" instead of "$((". The latter is treated as an aritmetic expression by dash, thus parsing fails. With a space between the two parens, it is correctly recognised as a nested command substitution thingy. - dpatch-convert-diffgz: Addedd support for epochs. Patch from Junichi Uekawa. (Closes: #195443) -- David B Harris Mon, 26 May 2003 03:00:28 -0400 dpatch (1.19) unstable; urgency=low * Gergely Nagy: - dpatch-edit-patch.1: Corrected a typo. Noticed by Stephen Quinney (Closes: #190557) - dpatch-list-patch (dplp_print_info): New function. This handles adding the .dpatch suffix when necessary. Use this to print information about a dpatch. Also, if there is no debian/patches/00list, use some clever GNU make trickery to extract ${PATCHLIST} out of debian/rules (probably needs polishing though) - dpatch-convert-diffgz: Remove the .dpatch suffix from DPCD_PATCHNAME, if any. - dpatch.make (patch): Check if $$patch exists, and only append a .dpatch prefix if it doesn't. (unpatch): Likewise. (PATCHLIST_ALL): Allow `#' comments in the patch list (ie, filter them out) (PATCHLIST_ARCH): Likewise. Patch from Bastian Kleineidam. (Closes: #192509) - The last two entries, as well as the next two, Closes: #191277 - README: Updated according to recent changes. * David B Harris: - dpatch-edit-patch: Loosen the format of debian/patches/00list. Now somebody can supply the .dpatch extension therein, should they choose to do so. - dpatch-list-patch: Add comment-line support for dpatch-list-patch. (closes the other half of #192509) - Include a bash context-sensitive completion definition file, /etc/bash_completion.d/dpatch_edit_patch, kindly written by Bastian Kleineidam and cleaned up by myself. (Closes: #191453) -- Gergely Nagy Fri, 9 May 2003 00:51:20 +0200 dpatch (1.18) unstable; urgency=low * David B Harris: - README: Clarify format of debian/patches/00list (Closes: #190343) * Gergely Nagy: - dpatch-edit-patch.1: Minor markup fixes and enhancements. -- Gergely Nagy Wed, 23 Apr 2003 17:24:57 +0200 dpatch (1.17) unstable; urgency=low * David B. Harris: - dpatch-edit-patch(1) rewrite. Please read `man dpatch-edit-patch', and/or /usr/share/doc/dpatch/README, it has changed a great deal. Basically, now you just 'dpatch-edit-patch dpathname', where dpatchname is exactly as it would be listed in 00list. dpep will spawn a subshell. Edit your files. Exit the subshell. The dpatch will be created or updated, as is required. (Closes: #187959) - Rewrite manpage for dpatch-edit-patch. Thanks to Andreas Metzler for the current groff formatting. (Closes: #188486) - Clarify examples and README with respect to phony targets and what that means. * Joerg Jaspert: - Added David B. Harris to Uploaders Field. -- Joerg Jaspert Fri, 11 Apr 2003 16:36:43 +0200 dpatch (1.16) unstable; urgency=low * Gergely Nagy: - The `Figure out something to put here, and delete this' release. - dpatch.make (patch): (patch-stamp): Create a subdirectory under debian/patched, if necessary. Patch from David B Harris. (unpatch): Remove patch-stampT too. Suggestion from Joshua Kwan. (Closes: #186522) * Joerg Jaspert: - Added a paragraph about usage of .PHONY or stamp-files to the README and changed one example rules file so we show both ways of playing with it. This (closes: #187293) -- Joerg Jaspert Sun, 6 Apr 2003 01:19:23 +0200 dpatch (1.15) unstable; urgency=low * The `Feh, you missed me!' release. * dpatch-edit-patch.1: Fixed a typo I introduced when importing Andreas' work. Noticed by him. * debian/control (Standards-Version): Bumped to 3.5.9.0. (Description): Rearranged a bit, to look more structured. * dpatch-edit-patch: Bail out if ${DPEP_TMPDIR} does not exist. This way we can safely use mkdir to create ${DPEP_OUTDIR}, and then check its exit status. Fix suggested by David B Harris. (Closes: #182640) -- Gergely Nagy Sun, 16 Mar 2003 23:58:24 +0100 dpatch (1.14) unstable; urgency=low * The `dpatch-edit-patch is not broken, but shoot me anyway' release. * dpatch-convert-diffgz: Made it actually work. (Patch courtesy of Manuel Estrada Sainz) (Closes: #183976) * dpatch-edit-patch.1 (EXAMPLES): New section, heavily based on the work of Andreas Metzler. * The above change and parts of 1.13 together closes: #182644. -- Gergely Nagy Mon, 10 Mar 2003 15:44:15 +0100 dpatch (1.13) unstable; urgency=low * The `dpatch-edit-patch is broken' release. * dpatch-edit-patch: Bail out if the temporary directory already exists. (Closes: #182640) * dpatch-edit-patch: Describe in more detail what it does, for easier problem tracking. (Closes: #182641) * dpatch-edit-patch: Changed default description to something less lame and productive. * dpatch-edit-patch: Fixed a typo. * dpatch-edit-patch: Added ${DPEP_PKGNAME} to some more places, so it will actually work. * dpatch-edit-patch.1 (NOTES): New section, mentioning how the author information is determined. * The above ones fix the multi-problem bugreport from James Troup, except the EXAMPLES section in dpatch-edit-patch.1. * dpatch.make (unpatch): Remove debian/patched too. (Noticed by Steve Kowalik) * dpatch.make: Use make syntax, not shell, when determining DPATCH_ARCH. Thanks to Martin Loschwitz. (Closes: #183828) -- Gergely Nagy Thu, 27 Feb 2003 14:36:23 +0100 dpatch (1.12) unstable; urgency=low * dpatch-list-patch now really does what i announced in 1.10. Silly me. (closes: #182590) * Mention the needed Build-Depends in Readme. (closes: #182598) -- Joerg Jaspert Wed, 26 Feb 2003 22:00:14 +0100 dpatch (1.11) unstable; urgency=low * dpatch.make (patch): Accept single-char comments too. (Noticed by Steve Kowalik) -- Gergely Nagy Tue, 25 Feb 2003 14:28:40 +0100 dpatch (1.10) unstable; urgency=low * dpatch-list-patch now recognizes Comments that start with # DP: or ## DP: -- Joerg Jaspert Tue, 25 Feb 2003 11:31:33 +0100 dpatch (1.9) unstable; urgency=low * Now dpatch-edit-patch adds the source-package name to tmpdirs it creates. That way they dont conflict if you edit similar patchnumbers in different packages. (closes: #182134) -- Joerg Jaspert Tue, 25 Feb 2003 00:09:58 +0100 dpatch (1.8) unstable; urgency=low * Modified README to reflect latest changes to dpatch and its tools. If you are a better documentation writer: Please take a look at this file and make it readable. Thx. :) * Modified dpatch-list-patches to list patches that apply everywhere (eg. that are in 00list) and patches that apply only on specific Architectures (eg. listed in 00list.*) with different headers. * Modified Description to tell users that its easy to have architecture specific patches now. :) -- Joerg Jaspert Mon, 24 Feb 2003 23:35:01 +0100 dpatch (1.7) unstable; urgency=low * Modularized the patch list. It is now constructed from debian/patches/00list and 00list.${ARCH} (where ${ARCH} is the architecture we're building for). Also, one can override the PATCHLIST variable, and that will Just Work. So you can use dpatch without 00list too! :) * Applied meta-data preserving patch to dpatch-edit-patch, thanks to Eduard Bloch. (Closes: #182140) * Added dpatch-convert-diffgz from Junichi Uekawa (with minor modifications). (Closes: #176831) * debian/control (Recommends): Recommend dpkg-dev, fakeroot and patchutils, since we are using them in some of the scripts. -- Gergely Nagy Mon, 24 Feb 2003 18:17:10 +0100 dpatch (1.6) unstable; urgency=low * Applied tree-root finder patch by Junichi Uekawa. (Closes: #176507) * Added a modified version of dpatch-list-patch by Junichi. (Closes: #176633) * Also corrected some minor shortcomings in the dpatch-edit-patch manual, and wrote one for d-l-p. -- Gergely Nagy Sun, 19 Jan 2003 00:53:07 +0100 dpatch (1.5) unstable; urgency=low * Description and readme improvements, thx to era eriksson. (closes: #175000) -- Joerg Jaspert Thu, 2 Jan 2003 11:56:04 +0100 dpatch (1.4) unstable; urgency=low * Reverted dry-run test: Errors are handled by dpatch target in makefiles. * Use -p1 instead of -p0 in dpatch-edit-patch generated patch files. * There was the include for /usr/share/dpatch/dpatch.make missingin sample.rules2 -- Joerg Jaspert Tue, 31 Dec 2002 21:08:43 +0100 dpatch (1.3) unstable; urgency=low * Patch from Eduard Bloch: - better pattern to fish the EMAIL address - fixed some bashisms - --dry-run test before patching to prevent trouble when only parts of the patch fail -- Joerg Jaspert Sat, 28 Dec 2002 15:15:59 +0100 dpatch (1.2) unstable; urgency=low * Updated description. * Updated README. -- Joerg Jaspert Sat, 28 Dec 2002 02:23:40 +0100 dpatch (1.1) unstable; urgency=low * Added option to set description and name of the patch file. -- Joerg Jaspert Sat, 28 Dec 2002 01:18:50 +0100 dpatch (1.0) unstable; urgency=low * Initial Release. -- Joerg Jaspert Sat, 21 Dec 2002 00:59:29 +0100 dpatch/debian/control0000644000000000000000000000205411714164563012045 0ustar Source: dpatch Section: vcs Priority: optional Maintainer: Gergely Nagy Standards-Version: 3.9.2 Build-Depends-Indep: perl Vcs-Git: git://git.madhouse-project.org/debian/dpatch.git Vcs-Browser: http://git.madhouse-project.org/debian/dpatch/ Package: dpatch Architecture: all Multi-Arch: foreign Depends: bash (>= 3.0-6), dpkg-dev Recommends: fakeroot, patchutils Suggests: curl Description: patch maintenance system for Debian source packages dpatch is an easy to use patch system for Debian packages, somewhat similar to the dbs package, but much simpler to use. . It lets you store patches and other simple customization templates in debian/patches and otherwise does not require much reorganization of your source tree. To get the patches applied at build time you simply need to include a makefile snippet and then depend on the patch/unpatch target in the build or clean stage of debian/rules - or you can use the dpatch patching script directly. . It can easily apply patches only on specific architectures if needed. dpatch/debian/source/0000755000000000000000000000000011621626444011737 5ustar dpatch/debian/source/format0000644000000000000000000000001511621626444013146 0ustar 3.0 (native) dpatch/debian/NEWS0000644000000000000000000001072311651101737011135 0ustar dpatch (2.0.33) unstable; urgency=low As of now, dpatch is deprecated, superseded by the 3.0 (quilt) source format, and should not be used for new packages. Existing packages are strongly encouraged to migrate to the new source format, too. -- Gergely Nagy Sun, 23 Oct 2011 23:13:39 +0200 dpatch (2.0.32) unstable; urgency=low [dpatch.lib.sh / dpatch-run] The behaviour of dpatch.lib.sh (used by dpatch-run, and the default templates) was changed: it now resets the timestamp of all patched files to the same timestamp within a single dpatch, if and only if patchutils is installed. [debhelper] dpatch now also includes debhelper 7+ sequence support, and adding dpatch support to a dh-using rules file is as easy as this: %: dh $@ --with dpatch [dpatch-get-origtargz] dpatch-get-origtargz was removed, as it does not work with anything else but tar.gz archives, and was becoming a source of ugly bugs and workarounds. Consequently, the dpatch-edit-patch will not try to use it, either. -- Gergely Nagy Sun, 14 Aug 2011 10:53:59 +0200 dpatch (2.0.11) experimental; urgency=low With this version, the default behaviour of dpatch-edit-patch was changed to not clean the source tree before copying it. Also, a new option which is intended to ease working with trees under revision control that only have a debian/ directory, was added too. See the manual page for more information about these (the --clean and --debianonly options). Please test the new features, so we can iron out any bugs before the package hits unstable! -- Gergely Nagy Sun, 16 Jan 2005 14:38:58 +0100 dpatch (2.0.9) unstable; urgency=low This version of dpatch comes with two helper scripts, which make the creation of dpatch scriptlets easier. For the most simple cases, there is /usr/share/dpatch/dpatch-run, that should be used on the she-bang line, like this: #! /bin/sh /usr/share/dpatch/dpatch-run ## foo.dpatch -- by J. Random Hacker ## DP: Patch description [And here comes the patch in the usual diff format] This dpatch-run script will do all the shell magic to make the dpatch work. For advanced uses, where something other than patch is used for applying dpatches, there is /usr/share/dpatch/dpatch.lib.sh. This one is intended to be sourced by shell scripts. By default, it will still use patch, however, setting DPATCH_LIB_NO_DEFAULT to a non-empty value makes it call dpatch_patch and dpatch_unpatch, respectively. The main use of this shell library is to leave the command-line parsing and verification to the script. -- Gergely Nagy Sun, 15 Aug 2004 13:34:22 +0200 dpatch (2.0.0) experimental; urgency=low This is a complete rewrite of dpatch as a shell script with a well defined interface, which provides enormous flexibility. This makes it possible to do a set of interesting things with dpatch scriptlets, like adding custom arguments (pkg-info, for printing detailed patch information, and the like), filter the patch list through cpp, and many other interesting things. However, due to the amount of new code, we feel that this rewrite needs wider testing, hence this upload to experimental. Please help, and test this release, and report any problems you may encounter! -- Gergely Nagy Sun, 16 Nov 2003 15:28:31 +0100 dpatch (1.23) unstable; urgency=low Versions of dpatch up to and including version 1.22 had two developer-accessible methods of telling dpatch what patches to apply; debian/patches/00list, and the variable "$PATCHLIST". The variable $PATCHLIST was always sorted before patches were applied an unapplied, but the list from debian/patches/00list was only sorted when there was also an arch-specific list such as debian/patches/00list.${ARCH}. As of this version (1.23), dpatch no longer sorts the patch list, period. The maintainers feel that dpatch's user base is likely full of anal-retentive folk (very much like themselves :) who prefer specifying things in minute detail. If your package uses the $PATCHLIST variable to tell dpatch which patches to apply, or if you use debian/patches/00list as well as an arch-specific patch list, you may want to double-check that the patches apply in correct order when they aren't sorted. -- David B Harris Thu, 31 Jul 2003 06:15:05 -0400 dpatch/debian/rules0000755000000000000000000000534211651102126011510 0ustar #!/usr/bin/make -f # Gergely loves debhelper less - lets do it without debhelper then :) DPATCH = ${CURDIR}/debian/dpatch MAN1DIR = ${DPATCH}/usr/share/man/man1 MAN7DIR = ${DPATCH}/usr/share/man/man7 DOCDIR = ${DPATCH}/usr/share/doc/dpatch EXDIR = ${DOCDIR}/examples DOCS = README.History README.source README.svn-mergeWithUpstream build-dpatch: test -e debian/control ${MAKE} # add addon for debhelper7 pod2man -c Debhelper debhelper/dh_dpatch_patch debian/dh_dpatch_patch.1 pod2man -c Debhelper debhelper/dh_dpatch_unpatch debian/dh_dpatch_unpatch.1 build-arch: ; build-indep: build-dpatch build: build-arch build-indep testroot: test -e debian/control && test xroot = x`whoami` clean: testroot ${MAKE} clean rm -rf debian/files* ${DPATCH} rm -f debian/dh_dpatch_patch.1 debian/dh_dpatch_unpatch.1 # General compresser rule ${DOCDIR}/%.gz: docs/% gzip -9fc $< >$@ # Install directories installdirs: install -d ${DPATCH}/usr/bin \ ${DPATCH}/DEBIAN \ ${EXDIR} ${MAN1DIR} ${MAN7DIR} \ ${DPATCH}/etc/bash_completion.d \ ${DPATCH}/usr/share/perl5/Debian/Debhelper/Sequence # Install everything, save DEBIAN/ and stuff from debian/ install: build installdirs \ $(addsuffix .gz,$(addprefix ${DOCDIR}/,${DOCS})) # dpatch itself ${MAKE} install DESTDIR=${DPATCH} # history cp -r history ${DOCDIR}/ # install dh7 addons install -m0644 debhelper/dpatch.pm ${DPATCH}/usr/share/perl5/Debian/Debhelper/Sequence/ install -m0644 debian/dh_dpatch_patch.1 ${MAN1DIR} install -m0644 debian/dh_dpatch_unpatch.1 ${MAN1DIR} install -m0755 debhelper/dh_dpatch_* ${DPATCH}/usr/bin/ # Compress stuff find ${MAN1DIR} -type f -not -name '*.gz' | xargs gzip -9f find ${MAN7DIR} -type f -not -name '*.gz' | xargs gzip -9f find ${EXDIR} -type f -not -name '*.gz' | xargs gzip -9f find ${DOCDIR}/history -type d -name '.arch-ids' | xargs rm -rf find ${DOCDIR}/history -type f -not -name '*.gz' | xargs gzip -9f # Install the whole thing, including DEBIAN/ and stuff from debian/ binary-dpatch: testroot install gzip -9fc debian/NEWS >${DOCDIR}/NEWS.Debian.gz gzip -9fc debian/changelog >${DOCDIR}/changelog.gz install -m 0644 debian/copyright ${DOCDIR}/copyright cd ${DPATCH} >/dev/null ;\ find etc -type f -printf "/%p\n" >DEBIAN/conffiles cd ${DPATCH} >/dev/null; \ find * -type f ! -regex '^DEBIAN/.*' -print0 | \ xargs -r0 md5sum > DEBIAN/md5sums find ${DPATCH} -type f -name '*.gz' | xargs chmod 0644 find ${DPATCH}/DEBIAN -type f | xargs chmod 0644 dpkg-gencontrol -isp -P${DPATCH} dpkg --build ${DPATCH} .. binary-indep: binary-dpatch binary-arch: ; binary: binary-indep binary-arch .PHONY: build clean binary-indep binary-arch binary installdirs install \ binary-dpatch testroot # arch-tag: bb474018-43b6-4bc2-91bc-6d0129cd7639 dpatch/debian/copyright0000644000000000000000000000611411665131703012371 0ustar Format: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?revision=174&view=co&pathrev=174 Upstream-Name: dpatch Upstream-Contact: Gergely Nagy Source: git://git.madhouse-project.org/debian/dpatch.git Copyright: Copyright (C) 2002-2011 Gergely Nagy, Joerg Jaspert, David B Harris, Junichi Uekawa and others License: GPL-2+ Files: * Copyright: Copyright (C) 2002-2011 Gergely Nagy, Joerg Jaspert, David B Harris, Junichi Uekawa and others License: GPL-2+ Files: tools/shpp.awk Copyright: Copyright (C) 2003 Miles Bader License: GPL-2+ Files: scripts/dpatch-convert-diffgz Copyright: Copyright (C) 2003 Junichi Uekawa License: GPL-2+ Files: compat/dpatch.make.7 Copyright: Copyright (C) 2003 Gergely Nagy Copyright (C) 2007 Junichi Uekawa License: Permission is granted to make and distribute verbatim copies of this manual provided the copyright notice and this permission notice are preserved on all copies. . Permission is granted to copy and distribute modified versions of this manual under the conditions for verbatim copying, provided that the entire resulting derived work is distributed under the terms of a permission notice identical to this one. . Permission is granted to copy and distribute translations of this manual into another language, under the above conditions for modified versions, except that this permission notice may be stated in a translation approved by the Author. Files: dpatch/dpatch.1 dpatch/dpatch.7 Copyright: Copyright (C) 2003-2011 Gergely Nagy License: Permission is granted to make and distribute verbatim copies of this manual provided the copyright notice and this permission notice are preserved on all copies. . Permission is granted to copy and distribute modified versions of this manual under the conditions for verbatim copying, provided that the entire resulting derived work is distributed under the terms of a permission notice identical to this one. . Permission is granted to copy and distribute translations of this manual into another language, under the above conditions for modified versions, except that this permission notice may be stated in a translation approved by the Author. License: GPL-2+ 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 of the License, 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 package; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA . On Debian systems, the complete text of the GNU General Public License can be found in `/usr/share/common-licenses/GPL-2'. dpatch/compat/0000755000000000000000000000000011671675726010514 5ustar dpatch/compat/dpatch.make0000644000000000000000000000171511621612301012571 0ustar # -*- Makefile -*-, you silly Emacs! # vim: set ft=make: DPATCH_PACKAGE ?= ${DEB_SOURCE_PACKAGE} DPATCH_PACKAGE ?= ${PACKAGE} DPATCH_STAMPDIR ?= debian/patched DPATCH_STAMPFN ?= patch-stamp DPATCH_PREDEPS ?= ifdef PATCHLIST UNPATCHLIST := ${PATCHLIST} DPATCH_ALL := else DPATCH_ALL := -all endif ifneq (${DPATCH_STAMPDIR},debian/patched) _STAMPDIR := --stampdir=${DPATCH_STAMPDIR} endif ifdef DPATCH_WORKDIR _WORKDIR := --workdir ${DPATCH_WORKDIR} endif patch: ${DPATCH_STAMPFN} ${DPATCH_STAMPFN}: ${DPATCH_PREDEPS} test -d ${DPATCH_STAMPDIR} || install -d ${DPATCH_STAMPDIR} @echo "Patches applied in the Debian version of ${DPATCH_PACKAGE}:" > $@T @echo >> $@T dpatch ${_WORKDIR} apply${DPATCH_ALL} ${_STAMPDIR} ${PATCHLIST} dpatch ${_WORKDIR} cat${DPATCH_ALL} ${PATCHLIST} >>$@T mv -f $@T $@ unpatch: dpatch ${_WORKDIR} deapply${DPATCH_ALL} ${_STAMPDIR} ${UNPATCHLIST} rm -rf ${DPATCH_STAMPFN} ${DPATCH_STAMPFN}T ${DPATCH_STAMPDIR} .PHONY: patch unpatch dpatch/compat/Makefile0000644000000000000000000000042011621425704012130 0ustar top_srcdir := .. include ../config.mk all clean: ; install: install -d ${DESTDIR}${datadir}/dpatch install --mode 0644 dpatch.make ${DESTDIR}${datadir}/dpatch/ install --mode 0644 dpatch.make.7 ${DESTDIR}${man7dir}/ # arch-tag: cbe3a397-3a6e-466e-93bb-84eb7ba54976 dpatch/compat/dpatch.make.70000644000000000000000000001063611671675726012771 0ustar .\" -*- nroff -*- .\" This manual is for dpatch, a patch maintenance system for Debian. .\" It documents the dpatch.make compatibility wrapper. .\" .\" Copyright (C) 2003 Gergely Nagy .\" Copyright (C) 2007 Junichi Uekawa .\" .\" Permission is granted to make and distribute verbatim copies of this .\" manual provided the copyright notice and this permission notice are .\" preserved on all copies. .\" .\" Permission is granted to copy and distribute modified versions of this .\" manual under the conditions for verbatim copying, provided that the .\" entire resulting derived work is distributed under the terms of a .\" permission notice identical to this one. .\" .\" Permission is granted to copy and distribute translations of this .\" manual into another language, under the above conditions for modified .\" versions, except that this permission notice may be stated in a .\" translation approved by the Author. .TH DPATCH.MAKE 7 "Dec 13 2011" "DPATCH 2" "dpatch" .SH "NAME" dpatch.make \- simplistic wrapper around \fBdpatch\fR(1) for \fBmake\fR(1). .SH "SYNOPSIS" .BI include " /usr/share/dpatch/dpatch.make" .SH "DESCRIPTION" For backwards compatibility and ease of use, \fIdpatch.make\fR is provided along with \fBdpatch\fR(1). Its purpose is to implement generic \fBpatch\fR and \fBunpatch\fR rules that can be reused in \fIdebian/rules\fR scripts. .SH WARNING .B dpatch is deprecated, please switch to the `3.0 (quilt)' Debian source package format instead. See .I http://wiki.debian.org/Projects/DebSrc3.0#FAQ for a short guide on how to do it. .SH "USAGE" Using \fIdpatch.make\fR is rather straightforward: one has to include the file in \fIdebian/rules\fR, change the appropriate targets to depend on \fBpatch\fR and \fBunpatch\fR, and that is all it takes. Figuring out what the appropriate target is, requires some thought. Generally, one has a \fBbuild\fR target, or \fBconfig.status\fR, or \fBconfigure\fR (or any of these with a \fB\-stamp\fR suffix). Most of the time these are called first during the build, so one of these (the one that exists, and is not depended upon by another one) has to be modified to depend on the \fBpatch\fR target in \fIdpatch.make\fR. Doing the same for the \fBclean\fR target is easier. One only has to rename the old rule to, say, \fBclean\-patched\fR, then make a new one that has \fBclean\-patched\fR and \fBunpatch\fR in its list of prerequisites. .SH "CUSTOMISATION" There are a few variables which are used by \fIdpatch.make\fR, which can be set before including it, in order to change the systems behaviour a little. These variables are: .RS .B DEB_SOURCE_PACKAGE .RS This is the name of the source package, used when creating the stamp file. By default, it is empty. .RE .B DPATCH_STAMPDIR .RS This is the directory where stamp files will be put. Default is \fIdebian/patched\fR. .RE .B DPATCH_STAMPFN .RS The name of the stamp file, which contains the patch descriptions and other possible meta\-data. Default value is \fIpatch\-stamp\fR. .RE .B DPATCH_PREDEPS .RS A list of make targets to call before applying the dpatch. .RE .B DPATCH_WORKDIR .RS The target directory to apply patches to. By default, it is the current directory. .RE .B PATCHLIST .RS The list of patches to apply. This is an alternative to \fIdebian/patches/00list\fR \- that is, if this variable is not empty, the contents of \fI00list\fR will be ignored, and this variable will be used instead. .RE .RE .SH "EXAMPLE" .RS .sp .nf include /usr/share/dpatch/dpatch.make build: build-stamp build-stamp: patch-stamp ${MAKE} touch build-stamp clean: clean1 unpatch clean1: ${MAKE} clean rm \-rf debian/files debian/substvars debian/imaginary\-package .PHONY: patch unpatch ... . . . .fi .sp .RE .SH "SIDE EFFECTS" Using \fIdpatch.make\fR instead of calling dpatch directly has one side effect: it will create a file called \fIpatch\-stamp\fR containing some meta\-information extracted from the scriptlets. Depending on a phony \fIpatch\fR target directly from \fIbuild\fR target may cause \fIbuild\fR target to be reevaluated even when there is no change to be done. Instead, try making \fIbuild-stamp\fR depend on \fIpatch-stamp\fR as specified in this example. .SH "AUTHOR" Originally by Gergely Nagy. Modified by Junichi Uekawa. .SH "SEE ALSO" .BR "dpatch" "(1), " .BR "dpatch" "(7), " .BR "dpatch\-edit\-patch" "(1), " .BR "dpatch\-list\-patch" "(1), " .BR "dpatch\-convert\-diffgz" "(1)" dpatch/dpep/0000755000000000000000000000000011651102532010133 5ustar dpatch/dpep/dpatch-edit-patch.functions0000755000000000000000000001510411621705226015362 0ustar #!/bin/bash # Functions for use by dpatch-edit-patch # Currently include dpep_usage(), # dpep_template_apply(), dpep_template_hardcoded(), and dpep_message() DPEP_BASENAME="$(basename $0)" dpep_usage() { # Usage message. Expects no arguments and does nothing with them if they're # given. Must be 24 lines or less. cat < "$1" else cat debian/patches/00template > "$1" fi } dpep_template_hardcoded() { # Function to populate files with a template; # The patch name is $1 (which can be a temporary filename), # $2 is the new actual filename, and the rest is the description line for '# DP:'. # Up to 2.0.13 it used to iterate through all arguments # changed again in 2.0.17. local dpep_template__file dpep_template__dpatch_basename dpep_template__file=$1 dpep_template__filename=$2 shift; shift; dpep_template__dpatch_basename="$(basename "$dpep_template__filename")" dpatch patch-template "${dpep_template__dpatch_basename%%.dpatch}" \ "$@" > "$dpep_template__file" } dpep_message() { # Message function takes two or more arguments; the first argument is the # priority of the message, and the second (and further) arguments are the # message itself. Preferrably, you should pass the message as a single # argument; if you don't, formatting may not be preserved. case "$1" in error) shift; printf "%s: Error: %s\n" "$DPEP_BASENAME" "$*" >&2 ;; debug1) if [[ "$VERBOSITY" -ge "1" ]]; then shift; printf "%s: Debug1: %s\n" "$DPEP_BASENAME" "$*" >&2 fi ;; warn) if [[ "$VERBOSITY" -ge "-1" ]]; then shift; printf "%s: Warning: %s\n" "$DPEP_BASENAME" "$*" fi ;; norm) if [[ "$VERBOSITY" -ge "0" ]]; then shift; printf "%s: %s\n" "$DPEP_BASENAME" "$*" fi ;; esac } dpep_parse_options() { TEMP=$(getopt -o d:o:s:t:e:b::l:kchP:0ar:O:n \ --long description:,outdir:,sourcedir:,tmpdir:,exclude:,debianonly::,shell:,keeptemp,clean,help,origtargzpath:,add2list,applyall,rootcmd:,diffopts:,notimestamp \ -n 'dpatch-edit-patch' -- "$@") if [[ "$?" != "0" ]]; then dpep_usage dpep_message error "Bad command line given, aborting." exit 1 fi eval set -- "$TEMP" while true; do case "$1" in -s|--sourcedir) DPEP_SOURCEDIR="$2"; shift 2;; -t|--tmpdir) DPEP_TMPDIR="$2"; shift 2;; -p|--stampdir) DPEP_STAMPDIR="$2"; shift 2;; -e|--exclude) DPEP_EXCLUDE="$2"; shift 2;; -b|--debianonly) DPEP_DEBIANONLY=1; \ [[ -d $2 ]] && DPEP_ORIGTARGZPATH="$2" || DPEP_ORIGTARGZ="$2"; \ shift 2;; -P|--origtargzpath) DPEP_ORIGTARGZPATH="$2"; shift 2;; -k|--keeptemp) DPEP_KEEPTEMP=1; shift;; -c|--clean) DPEP_CLEAN=1; shift;; --cowcmd) DPEP_COWCMD="$2"; shift 2;; -r|--rootcmd) DPEP_ROOTCMD="$2"; shift 2;; -d|--description) DPEP_DESC="$2"; shift 2;; -l|--shell) DPEP_SHELL="$2"; shift 2;; -o|--outdir) DPEP_OUTDIR="$2"; shift 2;; -0|--add2list) DPEP_ADD2LIST=1; shift;; -a|--applyall) DPEP_APPLYALL=1; shift;; -O|--diffopts) DPEP_DIFF_OPTIONS="$2"; shift 2;; -n|--notimestamp) DPEP_OMIT_TIMESTAMP=1; shift;; -h|--help) dpep_usage; exit 0;; --) shift; break;; *) dpep_message error "Internal error parsing arguments"; exit 1;; esac done DPEP_COMMAND="patch" for argument in "$@"; do case "$argument" in patch) DPEP_COMMAND="patch" ;; unfuzzy) DPEP_COMMAND="unfuzzy" ;; *) case "$DPEP_COMMAND" in patch) if [[ -z "$DPEP_PATCH" ]]; then DPEP_PATCH="$argument" elif [[ -z "$DPEP_BASEPATCH" ]]; then DPEP_BASEPATCH="$argument" else dpep_usage dpep_message error "Extra argument: $argument" exit 1 fi continue ;; unfuzzy) if [[ -z "$DPEP_UNFUZZY_LIST" ]]; then DPEP_UNFUZZY_LIST="$argument" else DPEP_UNFUZZY_LIST="$DPEP_UNFUZZY_LIST $argument" fi continue ;; esac dpep_usage dpep_message error "Extra argument: $argument" exit 1 ;; esac shift done } dpep_cleanup() { # Clean up before exiting (unless requested to keep working dir) if [[ "$DPEP_KEEPTEMP" = 1 ]]; then # User has opted to keep working directory. dpep_message norm "* Your dpatch working directory, $WORKDIR, has not been deleted (as requested)." else rm -rf "$WORKDIR" fi if [[ "$REFDIR" = "$DPEP_SOURCEDIR" ]]; then dpep_message norm "* Not deleting reference directory $REFDIR/, as it is the same as source directory." else rm -rf "$REFPDIR" fi } dpatch/dpep/dpatch-edit-patch.10000644000000000000000000003132311651102532013502 0ustar .\" Hey, EMACS: -*- nroff -*- .TH DPATCH-EDIT-PATCH 1 "23 Oct 2011" DPATCH "dpatch users manual" .SH NAME dpatch\-edit\-patch \- maintain dpatch patches for a Debian source package .SH SYNOPSIS .B dpatch\-edit\-patch [\fIoptions\fP] command \fIdpatchname\fP [\fIbasepatch\fP] .SH DESCRIPTION This manual documents the .B "dpatch\-edit\-patch" command which maintains dpatch patches for a dpatch-using Debian source package. .B "dpatch\-edit\-patch" will copy the full tree to a temporary directory for working. .SH WARNING .B dpatch is deprecated, please switch to the `3.0 (quilt)' Debian source package format instead. See .I http://wiki.debian.org/Projects/DebSrc3.0#FAQ for a short guide on how to do it. .SH OPTIONS .B "dpatch\-edit\-patch" takes two forms of arguments; options and commands. Currently, the only command that exists is \(lqpatch\(rq, which allows you to create/edit dpatches. When no command is given, \(lqpatch\(rq is assumed. .SS COMMANDS: .TP .I patch This command requires one mandatory argument, and accepts one optional argument under certain circumstances. The mandatory argument is .IR "dpatchname" . This refers to a dpatch, as it would be listed in .IR "debian/patches/00list" . It is not necessary for .I "dpatchname" to exist prior to running .B "dpatch\-edit\-patch" "patch" .IR "dpatchname" . When .I dpatchname exists, .B dpatch\-edit\-patch will set up a working source tree, apply all dpatches listed in .I debian/patches/00list up to and including .IR dpatchname , and spawn an interactive shell for the developer. The developer then edits files in this working tree. When the developer is done, they exit the shell. .B dpatch\-edit\-patch then updates \fIdpatchname\fP to reflect the changes made. Should the developer wish to abort the process from the interactive shell, they need only cause the shell to exit with an exit value of 230. Typically, this is done by exiting the shell with the command .BR "exit 230" . Would the developer wish to see the patch one's currently works on without exiting the subshell, two environment variables are exported into the subshell to help with this: \fBDPEP_SHELL_REFDIR\fR, which is set to the reference directory's full name, and \fBDPEP_SHELL_WORKDIR\fR, which is set to the subshell's working directory. These two can be used to \- for example \- generate a diff between the reference version and the current tree: .RS .RS .I diff -urNa \fB$DPEP_SHELL_REFDIR\fR \fB$DPEP_SHELL_WORKDIR\fR .RE .RE When \fIdpatchname\fR does not exist, .B dpatch\-edit\-patch will assume that a new dpatch should be created. As with the above scenario, .B dpatch\-edit\-patch first creates a working source tree. If the optional argument .I basepatch is supplied, all dpatches in .I debian/patches/00list up to and including .I basepatch will be applied to the working tree. If .I basepatch is not supplied, no dpatches are applied to the working tree. When then developer exits the shell, .B dpatch\-edit\-patch will create .I dpatchname\fP. If .I debian/patches/00template does not exist, a hardcoded dpatch header and shell snippet will be used. If it exists and is not executable, it will be copied verbatim as the header and shell snippet. Its first parameter is the base filename of the .IR to\-be\-updated " or " to\-be\-created dpatch (useful for adding titles to the dpatch header). Its second parameter will be the description of the new patch. .SS OPTIONS For the following options, command\-line arguments take precedence over environment variables, which take precedence over configuration variables. Configuration variables are read from \fIdebian/patches/00dpatch.conf\fR and \fI~/.dpatch.conf\fR. .TP .IB "\-s, \-\-sourcedir=" value Directory containing unpacked Debian source package. Configuration variable \fBconf_sourcedir\fR (settable only in \fI~/.dpatch.conf\fR), environment variable \fBDPEP_SOURCEDIR\fR. Defaults to the current working directory. .TP .IB "\-o, \-\-outdir="value Directory where the updated or newly-created dpatch will be placed. Configuration variable \fBconf_outdir\fR (\fI~/.dpatch.conf\fR), environment variable \fBDPEP_OUTDIR\fR. Defaults to .I ./debian/patches/ .TP .IB "\-c, \-\-clean" Indicate to .B dpatch\-edit\-patch that the current work directory can safely be cleaned. If not given, .B dpatch\-edit\-patch tries to preserve partial or complete builds by first copying the current work directory to a reference directory before invoking \fIdebian/rules\fR clean on the reference directory. If given, the current directory is cleaned and then taken as a reference directory. Use this option if your source package is pretty large and no significant work is destroyed by cleaning. Configuration variable \fBconf_clean\fR (\fI~/.dpatch.conf\fR), Environment variable \fBDPEP_CLEAN\fR. .TP .IB "\-b, \-\-debianonly[="path] Indicate to .B dpatch\-edit\-patch that the current work directory only contains a debian subdirectory and that an upstream tarball is to be unpacked in the reference directory before copying the current work directory there. The optional argument is the path to the upstream tarball - including the tarball name. If no value is given, .B dpatch\-edit\-patch will use the hook script pointed to by \fBconf_getorigtargz\fR (\fI~/.dpatch.conf\fR) or \fBDPEP_GETORIGTARGZ\fR to obtain the upstream tarball. The hook script should take one argument: the destination directory where the fetched archive shall be put. Configuration variables: \fBconf_debianonly\fR (\fIdebian/patches/00dpatch.conf\fR) and \fBconf_origtargz\fR (\fI~/.dpatch.conf\fR), Environment Variables \fBDPEP_DEBIANONLY\fR and \fBDPEP_ORIGTARGZ\fR. .TP .IB "\-P, \-\-origtargzpath="path When .IB \-b is in use, specify the path where upstream tarballs should be looked for. .B path is a colon-separated list of directories. Configuration variables: \fBconf_origtargzpath\fR (\fI~/.dpatch.conf\fR), Environment Variables \fBDPEP_ORIGTARGZPATH\fR. .TP .IB "\-r, \-\-rootcmd="value Command used to gain root privileges used to clean DPEP_SOURCEDIR. Configuration variable \fBconf_rootcmd\fR, environment variable \fBDPEP_ROOTCMD\fR. Defaults to \fBfakeroot\fR, if installed. If none of the above are specified, and fakeroot is not installed, .B dpatch\-edit\-patch will abort. The dpatch authors strongly recommend the use of fakeroot for this purpose. .TP .IB "\-d, \-\-description="value Description used for a newly-created patch. Configuration variable \fBconf_newdesc\fR (\fI~/.dpatch.conf\fR), environment variable \fBDPEP_NEWDESC\fR, defaults to .I \(lqNo description.\(rq .TP .IB "\-k, \-\-keeptemp="value Boolean value, either \fI0\fR or \fI1\fR. Configuration variable \fBconf_keeptemp\fR (\fI~/.dpatch.conf\fR), environment variable \fBDPEP_KEEPTEMP\fR. When set to \fI1\fR, temporary working tree is not deleted when .B dpatch\-edit\-patch is done. .TP .IB "\-t, \-\-tmpdir="value Temporary directory within which .B dpatch\-edit\-patch will create the working source tree. Configuration variable \fBconf_tmpdir\fR (\fI~/.dpatch.conf\fR), environment variable \fBDPEP_TMPDIR\fR. Should none of the above be set, .B dpatch\-edit\-patch will first attempt to use the environment variable \fBTMPDIR\fR, and will fall back to .IR /tmp . .TP .IB "\-p, \-\-stampdir="value The directory .B dpatch has used for creating patch stamps. Used for checking if patch to be edited is already applied to the working tree. Configuration variable \fBconf_stampdir\fR (\fI~/.dpatch.conf\fR), environment variable \fBDPEP_STAMPDIR\fR. Should none of the above be set, .B dpatch\-edit\-patch will fall back to .B debian/patched .TP .IB "\-e, \-\-exclude="valuelist Space-separated list of file- and directory names that .B dpatch\-edit\-patch will exclude from being copied and diffed. Configuration variable \fBconf_exclude\fR (\fI~/.dpatch.conf\fR), environment variable \fBDPEP_EXCLUDE\fR. Defaults to "CVS .svn .git .arch .hg _darcs .bzr", which might cause you trouble if you use files named like that in your package. .TP .IB "\-O, \-\-diffopts="valuelist Extra options to directly pass to .B diff as-is. Configuration variable \fBconf_diffopts\fR (\fI~/.dpatch.conf\fR), environment variable \fBDPEP_DIFF_OPTIONS\fR. It is empty by default. .TP .IB "\-l, \-\-shell="shell Tell .B dpatch\-edit\-patch which shell to invoke. Configuration variable \fBconf_shell\fR (\fI~/.dpatch.conf\fR), environment variable \fBDPEP_SHELL\fR, defaulting to $SHELL and the user's default shell. .TP .IB "\-n, \-\-notimestamp" Tell .B dpatch\-edit\-patch to remove timestamps from the diffs it generates. Can also be set in \fIdebian/patches/00options\fR, with the \fBDPEP_OMIT_TIMESTAMPS\fR variable. .TP .IB "\-0, \-\-add2list" add the new patch to 00list file. .TP .IB "\-a, \-\-applyall" apply all available patches. .SH "EXAMPLES" .SS Create a new patch to be applied after an existing patch. To create a new patch, to be applied after an existing patch 90_ctrlkeyfix: .PP $ .B dpatch\-edit\-patch patch 95_newupstreamfix 90_ctrlkeyfix .nf dpatch\-edit\-patch: * debian/patches/95_newupstreamfix.dpatch does not exist, it will be created as a new dpatch. dpatch\-edit\-patch: * Cleaning /home/david/temp/sopwith\-1.6.0 ... dpatch\-edit\-patch: * Applying patches dpatch\-edit\-patch: ** Applying patch 90_ctrlkeyfix ... applied cleanly. dpatch\-edit\-patch: * Copying /home/david/temp/sopwith\-1.6.0 to work directory. ... .fi .ad $ .B editor files .br $ .B exit 0 .nf dpatch\-edit\-patch: * Creating new patch debian/patches/95_newupstreamfix.dpatch dpatch\-edit\-patch: Warning: debian/patches/00template does not exist, using hardcoded default. dpatch\-edit\-patch: debian/patches/95_newupstreamfix.dpatch created. .fi .ad .PP .SS Create a new patch not depending on existing patches To create a new patch, intended to be applied before any other patches (or a new patch which doesn't require other patches to be applied first): .PP $ .B dpatch\-edit\-patch 10_debianstrings .nf dpatch\-edit\-patch: * debian/patches/10_debianstrings.dpatch does not exist, it will be created as a new dpatch. dpatch\-edit\-patch: * Cleaning /home/david/temp/sopwith\-1.6.0 ... dpatch\-edit\-patch: Warning: * No base-patch supplied, not applying any patches. dpatch\-edit\-patch: * Copying /home/david/temp/sopwith\-1.6.0 to work directory. ... .fi .ad $ .B editor files .br $ .B exit 0 .nf ... dpatch\-edit\-patch: * Creating new patch debian/patches/10_debianstrings.dpatch dpatch\-edit\-patch: Warning: debian/patches/00template does not exist, using hardcoded default. dpatch\-edit\-patch: debian/patches/10_debianstrings.dpatch created. .fi .ad .PP .SS Edit an existing patch: .PP $ .B dpatch\-edit\-patch 10_debianstrings .nf dpatch\-edit\-patch: * debian/patches/10_debianstrings.dpatch exists, this patch will be updated. dpatch\-edit\-patch: * Cleaning /home/david/temp/sopwith\-1.6.0 ... dpatch\-edit\-patch: * Applying patches dpatch\-edit\-patch: * Copying /home/david/temp/sopwith\-1.6.0 to work directory. dpatch\-edit\-patch: * Applying current 10_debianstrings for editing. ... .fi .ad $ .B editor files .br $ .B exit 0 .nf dpatch\-edit\-patch: Updating patch debian/patches/10_debianstrings.dpatch dpatch\-edit\-patch: @DPATCH@ tag found, preserving dpatch header. dpatch\-edit\-patch: debian/patches/10_debianstrings.dpatch updated. .fi .ad .SH NOTES .B dpatch\-edit\-patch uses the \fBDEBFULLNAME\fR environment variable as the author's name. If it is unset, the author name will be left blank. .PP .B dpatch\-edit\-patch determines the author's email address for new patches using the following algorithm: .br 1) Should the \fBDEBEMAIL\fR environment variable exist, it is always used. .br 2) If the \fBEMAIL\fR environment variable exists, it will be used when \fBDEBEMAIL\fR does not exist. .br 3) Should neither of the first two attempts succeed, the email will be constructed using the login name of the user running .B dpatch\-edit\-patch combined with the output of \fBhostname \-f\fR. .PP When .B dpatch\-edit\-patch sets up a reference or a working directory, it dereferences all symlinks in the source. That allows relative links to continue working, and allows changes only to a single file and not to the linked file and the link target. If you use .B dpatch\-edit\-patch on source trees that have symbolic links, you might end up with a patch that is unapplyable to the original tree. .SH FILES .IR debian/patches/00dpatch.conf , .IR ~/.dpatch.conf . .SH "SEE ALSO" .BR "dpatch" "(1), " .BR "dpatch" "(7), " .BR "dpatch.make" "(7), " .BR "dpatch\-list\-patch" "(1), " .BR "dpatch\-convert\-diffgz" "(1)" .RI "Files in " "/usr/share/doc/dpatch/" .SH "AUTHOR" This manual page was written by David B Harris and modified in the course of development by Gergely Nagy , Marc Haber , Stefano Zacchiroli , and Junichi Uekawa . dpatch/dpep/Makefile0000644000000000000000000000072411621612301011573 0ustar top_srcdir := .. include ../config.mk all clean: ; install: install --mode 0755 dpatch-edit-patch ${DESTDIR}${bindir}/ install --mode 0644 dpatch-edit-patch.1 ${DESTDIR}${man1dir}/ install -d ${DESTDIR}${pkgdatadir} install --mode 0755 dpatch-edit-patch.functions ${DESTDIR}${pkgdatadir}/ install -d ${DESTDIR}${sysconfdir}/bash_completion.d install -m 0644 dpatch_edit_patch.bash_completion.d \ ${DESTDIR}${sysconfdir}/bash_completion.d/dpatch_edit_patch dpatch/dpep/dpatch-edit-patch0000755000000000000000000004212711625517424013365 0ustar #!/bin/bash set -e # Populate configuration variables. First check for a pre-existing environment # variable which we support; that should override the configuration variable, # which in turn overrides the default. Some configuration variables are only # allowed in ~/.dpatch.conf, some only in debian/patches/00dpatch.conf. # CLI option parsing comes later, and # will blindly set it to the option given therein; CLI options trump all. # Defining these vaiables here, allows users to set e.g. # conf_origtargzpath="/usr/local/src/packages/${PACKAGENAME}" PACKAGENAME="$(dpkg-parsechangelog | sed -n '/^Source:/{s/^Source:[[:space:]]\+\(.*\)/\1/;p;q}')" UPSTREAMVERSION="$(dpkg-parsechangelog | sed -n '/\(Version:\)/{s/^Version:[[:space:]]\+\([0-9]\+:\)\?\(.*\)/\2/p}' | rev | cut -d- -f 2- | rev)" # Read in the package's configuration file, should it exist. [[ -f debian/patches/00dpatch.conf ]] && . debian/patches/00dpatch.conf unset conf_sourcedir unset conf_outdir unset conf_clean DPEP_DEBIANONLY="${DPEP_DEBIANONLY:-${conf_debianonly:-}}" unset conf_newdesc unset conf_keeptemp unset conf_tmpdir unset conf_shell unset conf_stampdir # Read in the user's configuration file, should it exist. [[ -f ~/.dpatch.conf ]] && . ~/.dpatch.conf DPEP_SOURCEDIR="${DPEP_SOURCEDIR:-${conf_sourcedir:-$(pwd)}}" DPEP_OUTDIR="${DPEP_OUTDIR:-${conf_outdir:-$DPEP_SOURCEDIR/debian/patches}}" DPEP_STAMPDIR="${DPEP_STAMPDIR:-${conf_stampdir:-$DPEP_SOURCEDIR/debian/patched}}" DPEP_CLEAN="${DPEP_CLEAN:-${conf_clean:-}}" DPEP_ORIGTARGZ="${DPEP_ORIGTARGZ:-${conf_origtargz:-}}" DPEP_GETORIGTARGZ="${DPEP_GETORIGTARGZ:-${conf_getorigtargz:-}}" DPEP_DESC="${DPEP_NEWDESC:-${conf_newdesc:-No description.}}" DPEP_KEEPTEMP="${DPEP_KEEPTEMP:-${conf_keeptemp:-0}}" DPEP_TMPDIR="${DPEP_TMPDIR:-${conf_tmpdir:-${TMPDIR:-/tmp}}}" DPEP_SHELL="${DPEP_SHELL:-${conf_shell:-${SHELL:-$(getent passwd $(id -un) | cut -f7- -d:)}}}" DPEP_EXCLUDE="${DPEP_EXCLUDE:-${conf_exclude:-CVS .svn .git .arch .hg _darcs .bzr}}" DPEP_DIFF_OPTIONS="${DPEP_DIFF_OPTIONS:-${conf_diffopts:-}}" DPEP_ORIGTARGZPATH="${DPEP_ORIGTARGZPATH:-${conf_origtargzpath:-}}" # We special-case $DPEP_ROOTCMD later, after dpep_parse_options() VERBOSITY=0 # Import functions dpep_usage(), dpep_template(), dpep_parse_options(), # dpep_message(), dpep_parse_longopt_value() . /usr/share/dpatch/dpatch-edit-patch.functions dpep_parse_options "$@" || true # We special-case $DPEP_ROOTCMD here; if fakeroot doesn't exist and we haven't # been told explicitly what it should be, error out. (I refuse to use sudo as # any kind of default, even a fallback if fakeroot doesn't exist - way too # dangerous). We do this after option parsing, to ensure that they can supply a # ROOTCMD on the CLI. if [[ -z "$DPEP_ROOTCMD" ]]; then # We're only here if $DPEP_ROOTCMD hasn't already been set via either a CLI # argument or the environment variable itself. if [[ ! -z "$conf_rootcmd" ]]; then # If we're here, the configuration variable has been set DPEP_ROOTCMD="$conf_rootcmd" elif command -v fakeroot > /dev/null 2>&1; then # If we're here, nothing's been set, but fakeroot exists. DPEP_ROOTCMD="fakeroot" else # We're here, nothing's set, fakeroot's not found. Bail. dpep_message error " " printf "fakeroot is not installed, nor has the option --rootcmd been given, nor has the\n" printf "environment variable \$DPEP_ROOTCMD been set, nor has the configuration file\n" printf "variable conf_rootcmd been set. Please see the manual page for more details.\n" exit 1 fi fi # All argument and option parsing has been done. Time to accomplish something. # Change to source directory cd "$DPEP_SOURCEDIR" # $PWD: $DPEP_SOURCEDIR if [[ ! -e "debian/rules" ]]; then # Check to make sure we're in the toplevel directory of a Debian package; # if not, error out. dpep_message error "\"$DPEP_SOURCEDIR\" is not the toplevel directory of a Debian package, aborting." exit 1 fi # Source 00options, currently known options are DPATCH_OPTION_CPP # and DPEP_OPTION_EXEC_TEMPLATE [ -r "debian/patches/00options" ] && . debian/patches/00options # Check to see $DPEP_PATCH is empty, and fail now. if [[ "${DPEP_PATCH}" = "" ]]; then # If it doesn't have .dpatch, append it. dpep_message error "patchname is empty, please specify, aborting." exit 1 fi ## canonicalize DPATCH name here. ## DPEP_PATCH == xxx.dpatch ## DPEP_PATCHSIMPLENAME == xxx (without .dpatch) if [[ "${DPEP_PATCH}" = "${DPEP_PATCH%%.dpatch}" ]]; then # If it doesn't have .dpatch, append it. DPEP_PATCH="${DPEP_PATCH}.dpatch" fi # define the simple name without .dpatch. DPEP_PATCHSIMPLENAME=${DPEP_PATCH%%.dpatch} # $PWD: $DPEP_SOURCEDIR if [[ -e "$DPEP_OUTDIR/$DPEP_PATCH" ]]; then # Check to see if the patch we're told to edit exists; if not, we'll be # creating it. # The patch does already exist, let them know this. dpep_message norm "* $DPEP_OUTDIR/$DPEP_PATCH exists, this patch will be updated." # Also set this ... later on, we'll need to differentiate between editing # an existing patch, and creating a new one. DPEP_EDITPATCH=1 if [[ ! -z "$DPEP_BASEPATCH" ]]; then # Even though we're editing an already-existing patch, the user has # supplied a base-patch. Warn them that we will be ignoring this. dpep_message warn "We are editing an already-existing patch, but a base-patch of $DPEP_BASEPATCH has been supplied - ignoring." # We patch up to $DPEP_BASEPATCH in the workdir later, so we assign to # it the patch we'll be editing DPEP_BASEPATCH="$DPEP_PATCH" else # They haven't supplied a base-patch, which is nice and sane, so we # assign to it the patch we'll be editing, for the same reason as # above; we'll be applying it to the working directory. DPEP_BASEPATCH="$DPEP_PATCH" fi else # Patch doesn't exist, we aren't editing it. DPEP_EDITPATCH=0 dpep_message norm "* $DPEP_OUTDIR/$DPEP_PATCH does not exist, it will be created as a new dpatch." # Check to ensure that, if we've been given a base-patch, it exists; # otherwise we really need to abort. If we haven't been supplied one, # that's fine if [[ ! -z "$DPEP_BASEPATCH" ]]; then if [[ "$DPEP_BASEPATCH" = "${DPEP_BASEPATCH%%.dpatch}" ]]; then # The user didn't supply a .dpatch extension, so we supply it. DPEP_BASEPATCH="$DPEP_BASEPATCH.dpatch" fi if [[ ! -e "debian/patches/$DPEP_BASEPATCH" ]]; then dpep_message error "Base-patch $(pwd)/debian/patches/$DPEP_BASEPATCH does not exist, aborting." fi fi fi # built appropriate options for tar and diff to exclude files # is DPEP_EXCLUDE is empty, this will be empty as well. DPEP_TAR_EXCLUDE="$(echo $DPEP_EXCLUDE | sed 's/\([^[:space:]]\+\)/--exclude \1/g')" DPEP_DIFF_EXCLUDE="$(echo $DPEP_EXCLUDE | sed 's/\([^[:space:]]\+\)/--exclude=\1/g')" # Start preparing the working copy. # $PWD: $DPEP_SOURCEDIR # Sanity checking to ensure that our temporary directory exists and is # writable. if [[ ! -d "$DPEP_TMPDIR" ]]; then dpep_message error "Temporary directory $DPEP_TMPDIR does not exist, aborting." exit 1 elif [[ ! -w "$DPEP_TMPDIR" ]]; then dpep_message error "Temporary directory $DPEP_TMPDIR is not writable, aborting." exit 1 fi # $PWD: $DPEP_SOURCEDIR # Hopefully mktemp(1), part of debianutils, does the Right Thing :) We're # pretty sure it does :) WORKDIR="$(mktemp -d ${DPEP_TMPDIR}/dpep-work.XXXXXX)" dpep_message debug1 "Working directory is $WORKDIR" if [ -n "$DPEP_CLEAN" ]; then REFDIR="$DPEP_SOURCEDIR" dpep_message debug1 "Using source directory $DPEP_SOURCEDIR as reference directory" else if [ -f "$DPEP_STAMPDIR/$DPEP_PATCH" ]; then dpep_message error "Patch $DPEP_PATCH is applied on working directory, use --clean option" exit 1 fi REFPDIR="$(mktemp -d ${DPEP_TMPDIR}/dpep-ref.XXXXXX)" dpep_message debug1 "Reference directory is $REFPDIR" if [ -n "$DPEP_DEBIANONLY" ]; then dpep_message norm "* debian/-only layout selected" if [ -z "$DPEP_ORIGTARGZ" ]; then ORIGTARGZ="${PACKAGENAME}_${UPSTREAMVERSION}.orig.tar.gz" export DPGO_ORIGTARGZPATH="$DPEP_ORIGTARGZPATH" if [ -z "$DPEP_GETORIGTARGZ" ]; then dpep_message error "unable to obtain upstream tarball, DPEP_GETORIGTARGZ is unset" exit 1 fi if ! eval "$DPEP_GETORIGTARGZ $REFPDIR"; then dpep_message error "unable to obtain upstream tarball, $DPEP_GETORIGTARGZ failed" exit 1 fi else if [ -e "$DPEP_ORIGTARGZ" ]; then ORIGTARGZ="$(readlink -f "$DPEP_ORIGTARGZ")" else dpep_message error "$DPEP_ORIGTARGZ, given on command line, does not exist" exit 1 fi fi cd "$REFPDIR" dpep_message norm "* unpacking $ORIGTARGZ" tar --extract --gzip --file $ORIGTARGZ # this heuristic is stolen from dpkg-source if [ "$(find . -maxdepth 1 -mindepth 1 -type d -print | wc -l)" -eq 1 ]; then if [ "$(readlink -f "$(find . -maxdepth 1 -mindepth 1 -type d -print)")" != "$(readlink -f "$(basename "$DPEP_SOURCEDIR")")" ]; then mv "$(find . -maxdepth 1 -mindepth 1 -type d -print)" "$(basename "$DPEP_SOURCEDIR")" fi else mkdir "$(basename "$DPEP_SOURCEDIR")" find . -maxdepth 1 -mindepth 1 -type d -name "$(basename "$DPEP_SOURCEDIR")" -prune -o -print0 | \ xargs --null mv --target-directory="$(basename "$DPEP_SOURCEDIR")" fi fi cd "$REFPDIR" dpep_message norm "* Copying $DPEP_SOURCEDIR to reference directory." mkdir -p "$(basename "$DPEP_SOURCEDIR")" tar --create --file - --dereference $DPEP_TAR_EXCLUDE --directory "$DPEP_SOURCEDIR" . | \ tar --extract --file - --directory "$(basename "$DPEP_SOURCEDIR")" REFDIR="$REFPDIR/$(basename $DPEP_SOURCEDIR)" fi cd "$REFDIR" # $PWD: reference directory # Copy, clean, and clone $DPEP_SOURCEDIR dpep_message norm "* Cleaning $REFDIR" $DPEP_ROOTCMD debian/rules clean unpatch dpatch deapply-all if [ "$DPEP_APPLYALL" = 1 ]; then # check for error condition: if add2list is also specified, the patch name should not exist. if [ "$DPEP_ADD2LIST" = 1 ]; then if ! dpatch list-all | grep -F "$DPEP_PATCHSIMPLENAME" > /dev/null 2>&1; then # the patch is not in 00list, we are safe : else # the patch is in 00list, we are unsafe dpep_message error "--applyall and --add2list is specified, but the patch already exists, aborting." exit 1 fi fi # applying all patches listed in debian/patches/00list dpep_message norm "Applying all patches" dpatch apply-all else # here we have to check if to apply some patches, up to "base patch" or whatever if [[ ! -z "$DPEP_BASEPATCH" ]]; then if ! dpatch list-all | grep -F "${DPEP_BASEPATCH%%.dpatch}" > /dev/null 2>&1; then if [[ "$DPEP_EDITPATCH" = 1 ]]; then dpep_message warn "$DPEP_PATCH is not listed in debian/patches/00list, no other patches will be applied to the working directory." else dpep_message error "Base-patch is not listed in debian/patches/00list, aborting." exit 1 fi else dpep_message norm "* Applying patches" if [ "$DPEP_EDITPATCH" = 1 ]; then DPEP_apply_until="$(dpatch list-all | grep -B1 -F "${DPEP_PATCH%%.dpatch}" | head -n 1)" # Check below to see if our "apply-until" patch is the same as # the one we're editing. If it is, it happens to be the first in # 00list. That's a bug, we'll hack around it by explicitly # checking for it, and if we find it, we'll do nothing here if [ ! "$DPEP_apply_until" = "${DPEP_PATCH%%.dpatch}" ]; then dpatch apply-until "$DPEP_apply_until" fi else dpatch apply-until "${DPEP_BASEPATCH%%.dpatch}" fi fi else dpep_message warn "* No base-patch supplied, not applying any patches." fi fi dpep_message norm "* Copying reference directory $REFDIR to work directory." cd "$WORKDIR" mkdir "$(basename "$DPEP_SOURCEDIR")" tar --create --file - --dereference $DPEP_TAR_EXCLUDE --directory "$REFDIR" . | \ tar --extract --file - --directory "$(basename "$DPEP_SOURCEDIR")" # this was previously cp --dereference --archive "$REFDIR" $(basename "$DPEP_SOURCEDIR") # Change to the workdirectory, apply the patch we're editing if we're # editing one, and launch an interactive shell. cd "$WORKDIR/$(basename "$DPEP_SOURCEDIR")" if [[ "$DPEP_EDITPATCH" = "1" ]]; then dpep_message norm "* Applying current $DPEP_PATCH for editing." if ! dpatch apply --no-stamp "$DPEP_PATCH"; then dpep_message warn "Could not apply the patch we want to edit -- not aborting, as you may want to work with the .rejs." fi fi cat < "$DIFFHOLDER" || true # Diff created, let's switch back to the original directory, and start the # process of updating or creating the patch. cd "$DPEP_SOURCEDIR" if [[ "$DPEP_EDITPATCH" = "0" ]]; then # We're creating a new patch, so this is relatively easy. dpep_message norm "* Creating new patch $DPEP_OUTDIR/$DPEP_PATCH" # We don't know for sure that any directories are created, so let's create # them now. PATCHDIR="$DPEP_OUTDIR/$(dirname "$DPEP_PATCH")" NEWPATCH="$DPEP_OUTDIR/$DPEP_PATCH" [[ ! -d "$PATCHDIR" ]] && mkdir -p "$PATCHDIR" if [[ ! -e "debian/patches/00template" ]]; then dpep_message warn "debian/patches/00template not exist, using hardcoded default." dpep_template_hardcoded "$NEWPATCH" "$NEWPATCH" "$DPEP_DESC" else dpep_message norm "Using debian/patches/00template" dpep_template_apply "$NEWPATCH" "$DPEP_DESC" fi # Okay, headers and shell snippets all set up. Now copy the actual patch text. cat "$DIFFHOLDER" >> "$NEWPATCH" dpep_message norm "$NEWPATCH created." else # Damnit, we're editing a patch. This is _never_ fun :) OLDPATCH="$DPEP_OUTDIR/$DPEP_PATCH" dpep_message norm "Updating patch $OLDPATCH" # Need another temporary file. NEWPATCH="$(tempfile -m 666 -d "$WORKDIR")" DPEP_TAGLINENUM="$(grep -an '^@DPATCH@$' "$OLDPATCH" | head -n1 | cut -f1 -d:)" if [ "$DPEP_TAGLINENUM" ]; then # They have our tag, so we can preserve their headers. dpep_message norm "@DPATCH@ tag found, preserving dpatch header." head -n "$DPEP_TAGLINENUM" "$OLDPATCH" > "$NEWPATCH" elif [[ -e "debian/patches/00template" ]]; then # Okay, they don't have a tag - damn them. But they at least have a # template. dpep_message warn "@DPATCH@ tag not found, using debian/patches/00template" dpep_template_apply "$OLDPATCH" "$DPEP_DESC" else # They have neither a @DPATCH@ tag, *NOR* a template. Damn, they just suck. dpep_message warn "@DPATCH@ tag not found, debian/patches/00template not found. Using hardcoded default." dpep_template_hardcoded "$NEWPATCH" "$OLDPATCH" "$DPEP_DESC" fi # Okay, the headers and shell snippets are in place. Move the diff there now. cat "$DIFFHOLDER" >> "$NEWPATCH" mv "$NEWPATCH" "$OLDPATCH" dpep_message norm "$OLDPATCH updated." fi # chmod +x the dpatch, just in case. chmod +x "$DPEP_OUTDIR/$DPEP_PATCH" # Check to see if we have to add the newly created patch into 00list if [[ $DPEP_ADD2LIST = "1" ]]; then # ok we have to add it; let's first check if the file exists or not if [[ ! -e "debian/patches/00list" ]]; then # 00list file missing, easier situation: we create it with just the new patch inside echo "$DPEP_PATCHSIMPLENAME" > debian/patches/00list dpep_message norm "File $(pwd)/debian/patches/00list created and patch added to it" else # 00list exists; we have to check if the current patch is already in the list or not # if it's already in 00list we do nothing, otherwise we add it at the end of the file if ! dpatch list-all | grep -F "$DPEP_PATCHSIMPLENAME" > /dev/null 2>&1; then # the patch is not in 00list, so we can add it at the end of the file echo "$DPEP_PATCHSIMPLENAME" >> debian/patches/00list dpep_message norm "Patch added at the end of file $(pwd)/debian/patches/00list" fi fi fi # Okay, we're all done. Do the cleanup. dpep_cleanup # arch-tag: ef9b2d2d-2026-4f10-b88d-330ea9039b14 dpatch/dpep/dpatch_edit_patch.bash_completion.d0000644000000000000000000001247511621425704017113 0ustar #-*- mode: shell-script;-*- # Inputs: # $1 -- name of the command whose arguments are being completed # $2 -- word being completed # $3 -- word preceding the word being completed # $COMP_LINE -- current command line # $COMP_PONT -- cursor position # $COMP_WORDS -- array containing individual words in the current # command line # $COMP_CWORD -- index into ${COMP_WORDS} of the word containing the # current cursor position # Output: # COMPREPLY array variable contains possible completions # # Syntax: # dpatch-edit-patch [options] command dpatchname [basepatch] # have dpatch-edit-patch && _dpatch_edit_patch() { local shopt_aliases_opt i cur prev mode options rootcmds patches patchlist DPEP_DO_GETOPTION local DPEP_SOURCEDIR DPEP_OUTDIR DPEP_TMPDIR DPEP_ROOTCMD DPEP_NEWDESC DPEP_KEEPTEMP local conf_sourcedir conf_outdir conf_tmpdir conf_rootcmd conf_newdesc conf_keeptemp case "$(shopt expand_aliases)" in *on) shopt_aliases_opt="-s";; *off) shopt_aliases_opt="-u";; esac shopt -u expand_aliases COMPREPLY=() cur=${COMP_WORDS[COMP_CWORD]} prev=${COMP_WORDS[COMP_CWORD-1]} # options options='-s -o -r -d -k -t --sourcedir --outdir --rootcmd \ --description --keeptemp --tmpdir' rootcmds='fakeroot sudo' # commands (added to patches) patches=patch # Read in the user's configuration file, should it exist. [[ -f ~/.dpatch.conf ]] && . ~/.dpatch.conf # default dirs DPEP_SOURCEDIR=${DPEP_SOURCEDIR:-${conf_sourcedir:-$(pwd)}} DPEP_OUTDIR=${DPEP_OUTDIR:-${conf_outdir:-$DPEP_SOURCEDIR/debian/patches}} # parse options mode=all for (( i=1; i < ${#COMP_WORDS[@]}; i++ )); do arg="${COMP_WORDS[$i]}" #echo "i=$i arg=\"$arg\"" if [ -z "$arg" ]; then if [ -z "$DPEP_DO_GETOPTION" ]; then mode=all fi continue fi if [ -n "$DPEP_DO_GETOPTION" ]; then eval "$DPEP_DO_GETOPTION$arg" DPEP_DO_GETOPTION="" continue fi case "$arg" in -s|--sourcedir) DPEP_DO_GETOPTION="DPEP_SOURCEDIR=" options=${options//+(-s|--sourcedir)/} mode=file ;; --sourcedir=*) DPEP_SOURCEDIR="$(printf "%s" "$arg" | cut -f2- -d= )" options=${options//+(-s|--sourcedir)/} cur=${cur/--sourcedir=/} mode=file ;; -o|--outdir) DPEP_DO_GETOPTION="DPEP_OUTDIR=" options=${options//+(-o|--outdir)/} mode=file ;; --outdir=*) DPEP_OUTDIR="$(printf "%s" "$arg" | cut -f2- -d= )" options=${options//+(-o|--outdir)/} cur=${cur/--outdir=/} mode=file ;; -t|--tmpdir) DPEP_DO_GETOPTION="DPEP_TMPDIR=" options=${options//+(-t|--tmpdir)/} mode=file ;; --tmpdir=*) DPEP_TMPDIR="$(printf "%s" "$arg" | cut -f2- -d= )" options=${options//+(-t|--tmpdir)/} cur=${cur/--tmpdir=/} mode=file ;; -r|--rootcmd) DPEP_DO_GETOPTION="DPEP_ROOTCMD=" options=${options//+(-r|--rootcmd)/} mode=rootcmd ;; --rootcmd=*) DPEP_ROOTCMD="$(printf "%s" "$arg" | cut -f2- -d= )" options=${options//+(-r|--rootcmd)/} mode=all ;; -d|--description) DPEP_DO_GETOPTION="DPEP_NEWDESC=" options=${options//+(-d|--description)/} mode=file ;; --description=*) DPEP_NEWDESC="$(printf "%s" "$arg" | cut -f2- -d= )" options=${options//+(-d|--description)/} mode=file ;; -*) mode=options ;; patch) mode=patch patches="" ;; *) mode=patch ;; esac done #echo "mode=$mode" case "$mode" in options) # standard completion on options COMPREPLY=( $( compgen -W "$options" -- "$cur" ) ) ;; none) # the user has to type a text return 0 ;; file) # files and directories _filedir ;; rootcmd) # a root command COMPREPLY=( $( compgen -W "$rootcmds" -- "$cur" ) ) ;; patch|all) # a list of patches ("patch") or all options and patches ("all") if [ "$mode" = "all" ]; then COMPREPLY=( $( compgen -W "$options" -- "$cur" ) ) fi # check for debian source dir if [ ! -e "$DPEP_SOURCEDIR/debian/rules" ]; then return 0 fi # check for output dir if [ ! -d "$DPEP_OUTDIR" ]; then return 0 fi # search patches patchlist=$(ls $DPEP_OUTDIR/00list* 2>/dev/null) if [ -z "$patchlist" ]; then return 0 fi patches="$(cat $patchlist | grep -v ^\# 2>/dev/null) $patches" COMPREPLY=( ${COMPREPLY[@]} $( compgen -W "$patches" -- "$cur" ) ) ;; esac shopt "$shopt_aliases_opt" expand_aliases return 0 } [ "$have" ] && complete -F _dpatch_edit_patch $filenames dpatch-edit-patch # arch-tag: 448345aa-f5c7-4e20-89d7-4f7df0288228