[devscripts] 01/01: Rename debpatch to debdiff-apply. (Closes: #867738, #867743)
Ximin Luo
infinity0 at debian.org
Mon Jul 10 17:04:09 UTC 2017
This is an automated email from the git hooks/post-receive script.
infinity0 pushed a commit to branch master
in repository devscripts.
commit 2b5d7f24c02d5a6d3432b305c62b7eca09247685
Author: Ximin Luo <infinity0 at debian.org>
Date: Mon Jul 10 18:56:09 2017 +0200
Rename debpatch to debdiff-apply. (Closes: #867738, #867743)
---
README | 14 +++++++-------
conf.default.in | 8 ++++----
debian/changelog | 6 ++++++
debian/control | 4 ++--
debian/copyright | 2 +-
po4a/devscripts-po4a.conf | 4 ++--
scripts/Makefile | 2 +-
scripts/{debpatch => debdiff-apply} | 14 +++++++-------
scripts/{debpatch.1 => debdiff-apply.1} | 18 +++++++++---------
scripts/debdiff.1 | 2 +-
10 files changed, 40 insertions(+), 34 deletions(-)
diff --git a/README b/README
index b4ad148..000ab35 100644
--- a/README
+++ b/README
@@ -90,6 +90,13 @@ And now, in mostly alphabetical order, the scripts:
For a deeper comparison one can use the diffoscope package.
[wdiff, patchutils]
+- debdiff-apply: Apply unified diffs of two Debian source packages, such as
+ those generated by debdiff, to a target Debian source package. Any changes
+ to debian/changelog are dealt with specially, to avoid the conflicts that
+ changelog diffs typically produce when applied naively. May be used to check
+ that old patches still apply to newer versions of those packages.
+ [python3-debian, python3-unidiff, quilt]
+
- debi: Installs the current package by using the setuid root debpkg
script described below. It assumes that the current package has
just been built (for example by debuild), and the .deb lives in the
@@ -97,13 +104,6 @@ And now, in mostly alphabetical order, the scripts:
ability to install the package with a very short command is very
useful when troubleshooting packages.
-- debpatch: Apply unified diffs of two Debian source packages, such as those
- generated by debdiff, to a target Debian source package. Any changes to
- debian/changelog are dealt with specially, to avoid the conflicts that
- changelog diffs typically produce when applied naively. May be used to check
- that old patches still apply to newer versions of those packages.
- [python3-debian, python3-unidiff, quilt]
-
- debpkg: A wrapper for dpkg used by debi to allow convenient testing
of packages. For debpkg to work, it needs to be made setuid root,
and this needs to be performed by the sysadmin -- it is not
diff --git a/conf.default.in b/conf.default.in
index 48633dd..4998bf2 100644
--- a/conf.default.in
+++ b/conf.default.in
@@ -275,15 +275,15 @@
# Unpack tarballs found in the top level source directory.
# DEBDIFF_UNPACK_TARBALLS=yes
+##### debdiff-apply
+#
+# No variables currently
+
##### debi
#
# debc recognises the DEBRELEASE_DEBS_DIR variable; see debrelease
# below for more information.
-##### debpatch
-#
-# No variables currently
-
##### debpkg
#
# No variables currently
diff --git a/debian/changelog b/debian/changelog
index 19d5978..9bf7577 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+devscripts (2.17.8) UNRELEASED; urgency=medium
+
+ * Rename debpatch to debdiff-apply. (Closes: #867738, #867743)
+
+ -- Ximin Luo <infinity0 at debian.org> Mon, 10 Jul 2017 18:54:04 +0200
+
devscripts (2.17.7) unstable; urgency=medium
[ Paul Wise ]
diff --git a/debian/control b/debian/control
index b5bdf3c..92e24c7 100644
--- a/debian/control
+++ b/debian/control
@@ -157,9 +157,9 @@ Description: scripts to make the life of a Debian Package maintainer easier
- debdiff: compare two versions of a Debian package to check for
added and removed files. Use the diffoscope package for deep comparisons.
[wdiff, patchutils]
- - debi: install a just-built package
- - debpatch: apply unified diffs of two Debian source packages, such as those
+ - debdiff-apply: apply unified diffs of two Debian source packages, such as
generated by debdiff, to a target source package [python3-unidiff, quilt]
+ - debi: install a just-built package
- debpkg: dpkg wrapper to be able to manage/test packages without su
- debrepro: reproducibility tester for Debian packages [faketime,
diffoscope, disorderfs]
diff --git a/debian/copyright b/debian/copyright
index f3f40dc..c22adda 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -21,7 +21,7 @@ the GPL, version 2 or later.
- annotate-output, debdiff and nmudiff are released under version 2
(only) of the GPL.
-- debpatch, debsnap, diff2patches and git-deborig are released under
+- debdiff-apply, debsnap, diff2patches and git-deborig are released under
version 3 or later of the GPL
- deb-reversion is under the Artistic License version 2.0.
diff --git a/po4a/devscripts-po4a.conf b/po4a/devscripts-po4a.conf
index 792c2db..da7d782 100644
--- a/po4a/devscripts-po4a.conf
+++ b/po4a/devscripts-po4a.conf
@@ -42,10 +42,10 @@
$lang:$lang/debcommit.$lang.pl add_$lang:?add_$lang/translator_pod.add
[type:man] ../scripts/debdiff.1 \
$lang:$lang/debdiff.$lang.1 add_$lang:?add_$lang/translator_man.add
+[type:man] ../scripts/debdiff-apply.1 \
+ $lang:$lang/debdiff-apply.$lang.1 add_$lang:?add_$lang/translator_man.add
[type:man] ../scripts/debi.1 \
$lang:$lang/debi.$lang.1 add_$lang:?add_$lang/translator_man.add
-[type:man] ../scripts/debpatch.1 \
- $lang:$lang/debpatch.$lang.1 add_$lang:?add_$lang/translator_man.add
[type:man] ../scripts/debpkg.1 \
$lang:$lang/debpkg.$lang.1 add_$lang:?add_$lang/translator_man.add
[type:pod] ../scripts/debrepro.pod \
diff --git a/scripts/Makefile b/scripts/Makefile
index 7c4494e..4fe2ea4 100644
--- a/scripts/Makefile
+++ b/scripts/Makefile
@@ -23,7 +23,7 @@ BC_BUILD_DIR:=bash_completion
COMPLETION = $(patsubst %.bash_completion,$(BC_BUILD_DIR)/%,$(COMPL_FILES))
COMPL_DIR := $(shell pkg-config --variable=completionsdir bash-completion)
PKGNAMES:=wnpp-alert wnpp-check mk-build-deps rmadison mass-bug debsnap dd-list build-rdeps who-uploads transition-check getbuildlog dcontrol grep-excuses rc-alert whodepends dget pts-subscribe pts-unsubscribe debcheckout
-PYTHON3_SCRIPTS:=debpatch sadt suspicious-source wrap-and-sort
+PYTHON3_SCRIPTS:=debdiff-apply sadt suspicious-source wrap-and-sort
GEN_MAN1S += debrepro.1 devscripts.1 mk-origtargz.1 uscan.1
diff --git a/scripts/debpatch b/scripts/debdiff-apply
similarity index 96%
rename from scripts/debpatch
rename to scripts/debdiff-apply
index 9b326ab..8381436 100755
--- a/scripts/debpatch
+++ b/scripts/debdiff-apply
@@ -40,9 +40,9 @@ basename = os.path.basename
C = subprocess.check_call
# this can be any valid value, it doesn't appear in the final output
-DCH_DUMMY_TAIL = "\n -- debpatch dummy tool <infinity0 at debian.org> " \
+DCH_DUMMY_TAIL = "\n -- debdiff-apply dummy tool <infinity0 at debian.org> " \
"Thu, 01 Jan 1970 00:00:00 +0000\n\n"
-CHBLOCK_DUMMY_PACKAGE = "debpatch PLACEHOLDER"
+CHBLOCK_DUMMY_PACKAGE = "debdiff-apply PLACEHOLDER"
TRY_ENCODINGS = ["utf-8", "latin-1"]
DISTRIBUTION_DEFAULT = "experimental"
@@ -128,7 +128,7 @@ def check_patch(patch_str, *args, **kwargs):
**kwargs).returncode == 0
-def debpatch(patch, patch_name, args):
+def debdiff_apply(patch, patch_name, args):
# don't change anything if...
dry_run = args.target_version or args.source_version
@@ -218,7 +218,7 @@ def main(args):
parser.add_argument(
'--target-version', action="store_true",
help="Don't apply the patch; instead print out the new version of the "
- "package debpatch(1) would generate, when the patch is applied to the "
+ "package debdiff-apply(1) would generate, when the patch is applied to the "
"the given target package, as specified by the other arguments.",
)
parser.add_argument(
@@ -247,7 +247,7 @@ def main(args):
group1.add_argument(
'-d', '--directory', default=None,
help="Extract the .dsc into this directory, which won't be cleaned up "
- "after debpatch(1) exits. If not given, then it will be extracted to a "
+ "after debdiff-apply(1) exits. If not given, then it will be extracted to a "
"temporary directory.",
)
args = parser.parse_args(args)
@@ -277,7 +277,7 @@ def main(args):
# change directory before applying patches
if os.path.isdir(args.orig_dsc_or_dir):
os.chdir(args.orig_dsc_or_dir)
- debpatch(patch, patch_name, args)
+ debdiff_apply(patch, patch_name, args)
elif os.path.isfile(args.orig_dsc_or_dir):
dscfile = args.orig_dsc_or_dir
parts = os.path.splitext(os.path.basename(dscfile))
@@ -292,7 +292,7 @@ def main(args):
origdir = os.getcwd()
workaround_dpkg_865430(dscfile, origdir, stdout)
os.chdir(builddir)
- did_patch = debpatch(patch, patch_name, args)
+ did_patch = debdiff_apply(patch, patch_name, args)
if dry_run or not did_patch:
return
os.chdir(origdir)
diff --git a/scripts/debpatch.1 b/scripts/debdiff-apply.1
similarity index 92%
rename from scripts/debpatch.1
rename to scripts/debdiff-apply.1
index 9b60186..03ec9d5 100644
--- a/scripts/debpatch.1
+++ b/scripts/debdiff-apply.1
@@ -12,20 +12,20 @@
.\"
.\" See file /usr/share/common-licenses/GPL-3 for more details.
.\"
-.TH DEBPATCH 1 "Debian Utilities" "DEBIAN"
+.TH debdiff-apply 1 "Debian Utilities" "DEBIAN"
.SH NAME
-debpatch \- apply a debdiff to a Debian source package
+debdiff-apply \- apply a debdiff to a Debian source package
.SH SYNOPSIS
-.B debpatch
+.B debdiff-apply
[options] [orig_dsc_or_dir] [patch_file]
.br
-.B debpatch
+.B debdiff-apply
[options] < [patch_file]
.SH DESCRIPTION
-.B debpatch
+.B debdiff-apply
takes a \fIpatchfile\fR that describes the differences between two Debian
source packages \fIold\fR and \fInew\fR, and applies it to a target Debian
source package \fIorig\fR.
@@ -42,7 +42,7 @@ exact behaviour may be tweaked in the future, so one should not rely on it.
.PP
If \fIpatchfile\fR does not apply to \fIorig\fR, even after the special-casing
of \fIdebian/changelog\fR, no changes are made and
-.BR debpatch (1)
+.BR debdiff-apply (1)
will exit with a non-zero error code.
.SH ARGUMENTS
@@ -83,7 +83,7 @@ version.
.TP
\fB\-\-target\-version\fR
Don't apply the patch; instead print out the new version of the package
-.BR debpatch (1)
+.BR debdiff-apply (1)
would generate, when the patch is applied to the the given target
package, as specified by the other arguments.
.SS "For .dsc patch targets:"
@@ -99,11 +99,11 @@ then try building it again.
.TP
\fB\-d\fR DIRECTORY, \fB\-\-directory\fR DIRECTORY
Extract the .dsc into this directory, which won't be cleaned up after
-.BR debpatch (1)
+.BR debdiff-apply (1)
exits. If not given, then it will be extracted to a temporary directory.
.SH AUTHORS
-\fBdebpatch\fR and this manual page were written by Ximin Luo
+\fBdebdiff-apply\fR and this manual page were written by Ximin Luo
<infinity0 at debian.org>
.PP
Both are released under the GNU General Public License, version 3 or later.
diff --git a/scripts/debdiff.1 b/scripts/debdiff.1
index 6ea0628..177c509 100644
--- a/scripts/debdiff.1
+++ b/scripts/debdiff.1
@@ -232,7 +232,7 @@ Normally the exit value will be 0 if no differences are reported and 1
if any are reported. If there is some fatal error, the exit code will
be 255.
.SH "SEE ALSO"
-.BR debpatch (1),
+.BR debdiff-apply (1),
.BR diffstat (1),
.BR dpkg-deb (1),
.BR interdiff (1),
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/devscripts.git
More information about the devscripts-devel
mailing list