Bug#599456: unblock: git-dpm/0.2.1-1
Package: release.debian.org
User: release.debian.org@packages.debian.org
Usertags: unblock
Please consider unblocking git-dpm/0.2.1-1 which includes
some bugfixes distilled out of git-dpm/0.3.0-1 (in experimental).
------------Diffstat of the unpacked source:------------------
debian/changelog | 6 ++++++
NEWS | 5 +++++
ChangeLog | 12 ++++++++++++
configure.ac | 2 +-
configure | 20 ++++++++++----------
git-dpm.sh | 23 +++++++++++++----------
index.html | 1 +
7 files changed, 48 insertions(+), 21 deletions(-)
------------Diffstat of the unpacked .deb:--------------------
DEBIAN/control | 2 +-
DEBIAN/md5sums | 14 +++++++-------
usr/bin/git-dpm | 25 ++++++++++++++-----------
usr/share/doc/git-dpm/NEWS | 5 +++++
usr/share/doc/git-dpm/changelog | 12 ++++++++++++
usr/share/doc/git-dpm/changelog.Debian | 6 ++++++
usr/share/doc/git-dpm/index.html | 1 +
usr/share/doc/git-dpm/manpage.html | 2 +-
usr/share/doc/git-dpm/manpage.pdf |binary
9 files changed, 47 insertions(+), 20 deletions(-)
-------------------Changes to the source----------------------
(reordered and annotated for easier reading)
Changes to changelogs and NEWS stuff
diff -u -r -N git-dpm-0.2.0-1/debian/changelog git-dpm-0.2.1-1/debian/changelog
--- git-dpm-0.2.0-1/debian/changelog 2010-07-29 12:24:43.000000000 +0200
+++ git-dpm-0.2.1-1/debian/changelog 2010-10-07 17:48:16.000000000 +0200
@@ -1,3 +1,9 @@
+git-dpm (0.2.1-1) unstable; urgency=low
+
+ * new bugfix release
+
+ -- Bernhard R. Link <brlink@debian.org> Thu, 07 Oct 2010 17:48:16 +0200
+
git-dpm (0.2.0-1) unstable; urgency=low
* new version
diff -u -r -N git-dpm-0.2.0-1/NEWS git-dpm-0.2.1-1/NEWS
--- git-dpm-0.2.0-1/NEWS 2010-07-29 12:19:52.000000000 +0200
+++ git-dpm-0.2.1-1/NEWS 2010-10-07 17:33:35.000000000 +0200
@@ -1,3 +1,8 @@
+Changes between 0.2.0 and 0.2.1:
+- fix some error and diagnostic messages
+- fix error causing git-dpm init to sometimes lose a specified upstream branch
+- fix typos crippling git-dpm import and git-dpm merge-patched --amend
+
Changes between 0.1.2 and 0.2.0:
- add import-dsc command
- add support for importing dpatch patches
diff -u -r -N git-dpm-0.2.0-1/ChangeLog git-dpm-0.2.1-1/ChangeLog
--- git-dpm-0.2.0-1/ChangeLog 2010-07-29 12:20:04.000000000 +0200
+++ git-dpm-0.2.1-1/ChangeLog 2010-10-07 17:32:56.000000000 +0200
@@ -1,3 +1,15 @@
+2010-10-06 fix merge-patched: proper diagnotics and cleanup if nothing to do
+2010-10-03 fix typo in variable name (only fixing an confusing message, though) (cherry picked from commit e955e5fe542d434e76bef2ef3774989f65e8b29a)
+2010-10-03 fix typo causing --amend no effect with git-dpm's merge-patched
+2010-10-03 fix wrong variable in debug output and warnings of git-dpm init (cherry picked from commit 59fdb76dc111980aa1e87930c93a6ee40dfe2d4b)
+2010-10-03 fix typo causing wrong old commits computed in git-dpm import (cherry picked from commit a18b011c6e733a03a41b20392e4b28b28011ed6c)
+2010-10-03 remove wrong reverence of level in apply_next_dpatch_patch (cherry picked from commit f26a92624dd9a48ba5b4f58630e6165a197ee01a)
+2010-10-02 fix miswritten variable name (cherry picked from commit e58326478b3eaeee028af47e534af1c85cf65f55)
+2010-10-01 fix typo in variable name
+2010-08-20 add link to the Debian Wiki to the documentation
+2010-08-16 fix git-dpm init in the case the upstream branch does not yet exist
+2010-08-03 list import-dsc in commands printed by --help
+2010-07-28 prepare 0.2.0
2010-07-29 fix some typos and errors in the manpage
2010-07-28 add warning about non-patch dpatch scripts to manpage
2010-07-29 get rid of roff table in manpage. Only causes problems
The new version (and copied a few times by autoconf):
diff -u -r -N git-dpm-0.2.0-1/configure.ac git-dpm-0.2.1-1/configure.ac
--- git-dpm-0.2.0-1/configure.ac 2010-07-29 12:19:52.000000000 +0200
+++ git-dpm-0.2.1-1/configure.ac 2010-10-07 17:32:56.000000000 +0200
@@ -2,7 +2,7 @@
dnl Process this file with autoconf to produce a configure script
dnl
-AC_INIT(git-dpm, 0.2.0, git-scm-devel@alioth.debian.org)
+AC_INIT(git-dpm, 0.2.1, git-scm-devel@alioth.debian.org)
AC_CONFIG_SRCDIR(git-dpm.sh)
AC_CONFIG_AUX_DIR(ac)
AM_INIT_AUTOMAKE([-Wall -Werror -Wno-portability])
diff -u -r -N git-dpm-0.2.0-1/configure git-dpm-0.2.1-1/configure
--- git-dpm-0.2.0-1/configure 2010-07-29 12:20:43.000000000 +0200
+++ git-dpm-0.2.1-1/configure 2010-10-07 17:34:33.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.65 for git-dpm 0.2.0.
+# Generated by GNU Autoconf 2.65 for git-dpm 0.2.1.
#
# Report bugs to <git-scm-devel@alioth.debian.org>.
#
@@ -551,8 +551,8 @@
# Identity of this package.
PACKAGE_NAME='git-dpm'
PACKAGE_TARNAME='git-dpm'
-PACKAGE_VERSION='0.2.0'
-PACKAGE_STRING='git-dpm 0.2.0'
+PACKAGE_VERSION='0.2.1'
+PACKAGE_STRING='git-dpm 0.2.1'
PACKAGE_BUGREPORT='git-scm-devel@alioth.debian.org'
PACKAGE_URL=''
@@ -1183,7 +1183,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures git-dpm 0.2.0 to adapt to many kinds of systems.
+\`configure' configures git-dpm 0.2.1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1249,7 +1249,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of git-dpm 0.2.0:";;
+ short | recursive ) echo "Configuration of git-dpm 0.2.1:";;
esac
cat <<\_ACEOF
@@ -1334,7 +1334,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-git-dpm configure 0.2.0
+git-dpm configure 0.2.1
generated by GNU Autoconf 2.65
Copyright (C) 2009 Free Software Foundation, Inc.
@@ -1351,7 +1351,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by git-dpm $as_me 0.2.0, which was
+It was created by git-dpm $as_me 0.2.1, which was
generated by GNU Autoconf 2.65. Invocation command line was
$ $0 $@
@@ -2160,7 +2160,7 @@
# Define the identity of the package.
PACKAGE='git-dpm'
- VERSION='0.2.0'
+ VERSION='0.2.1'
cat >>confdefs.h <<_ACEOF
@@ -2975,7 +2975,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by git-dpm $as_me 0.2.0, which was
+This file was extended by git-dpm $as_me 0.2.1, which was
generated by GNU Autoconf 2.65. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3028,7 +3028,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-git-dpm config.status 0.2.0
+git-dpm config.status 0.2.1
configured by $0, generated by GNU Autoconf 2.65,
with options \\"\$ac_cs_config\\"
diff -u -r -N git-dpm-0.2.0-1/git-dpm.sh git-dpm-0.2.1-1/git-dpm.sh
The fix for git-dpm init sometimes losing the specified upstream branch:
@@ -1990,6 +1992,7 @@
if test -z "$UPSTREAMREV" ; then
debugout "Creating '$UPSTREAMBRANCH'..."
gitcmd branch "$UPSTREAMBRANCH" "$NEWUPSTREAMREV"
+ UPSTREAMREV="$NEWUPSTREAMREV"
elif [ x"$UPSTREAMREV" = x"$NEWUPSTREAMREV" ] ; then
debugout "'$UPSTREAMBRANCH' already as it should be..."
elif [ "x$HEADBRANCH" != "x$UPSTREAMBRANCH" ] ; then
Fixing git-dpm merge-patched --amend:
@@ -671,7 +672,7 @@
disallow_nonlinear=false
;;
--amend)
- ammendmerge=true
+ amendmerge=true
;;
--)
shift
The fix for git-dpm import doing strange things sometimes:
@@ -3998,7 +4001,7 @@
if [ "$format" = "diff" ] && test -n "$oldverbatimcommit" && isancestor "$verbatimUPSTREAMREV" "$oldverbatimcommit" ; then
# Those are most likely already in the DEBIANREV ones above,
# but by adding them they get priority for the tail below
- gitcmd rev-list --pretty="format:%H %T %P" --reverse "${verbatimUPSTREAM}..${oldverbatimcommit}" | sed '/^commit/d' >> "$gitdir/dpm/oldcommits"
+ gitcmd rev-list --pretty="format:%H %T %P" --reverse "${verbatimUPSTREAMREV}..${oldverbatimcommit}" | sed '/^commit/d' >> "$gitdir/dpm/oldcommits"
fi
not_yet_merged=true
Improvements to help strings, hint and error messages:
@@ -73,6 +73,7 @@
linearize: 'rebase -i' the patched branch
tag: add tags for the current version
cherry-pick: checkout-patched + git's cherry-pick
+ import-dsc: import a .dsc file
Low-level-stuff:
merge-patched-into-debian: usually called by update-patches for you
rebase-patched: rebase patches to new upstream
@@ -704,13 +705,14 @@
checkupstreambranchcurrent
if [ "x$PATCHEDREV" = "x$control_patched" ] ; then
- if ! isancestor "$DEBIANREV" "$PATCHEDREV" ; then
+ if ! isancestor "$PATCHEDREV" "$DEBIANREV" ; then
printerror "'$PATCHEDBRANCH' already recorded as merged in debian/.git-dpm, but not ancestor of '$DEBIANBRANCH'!"
return 1
fi
echo "'$PATCHEDBRANCH' already recorded as merged in debian/.git-dpm. Nothing to do..."
if [ "x$HEADBRANCH" != "x$PATCHEDBRANCH" ] && $delete_patched; then
- gitcmd -D "$PATCHEDBRANCH"
+ gitcmd branch -D "$PATCHEDBRANCH"
+ PATCHEDREV=""
fi
return 0
fi
@@ -1443,7 +1445,7 @@
newupstreambranch="$1"
shift
newupstreamrev="$(gitcmd rev-parse --verify -q "$newupstreambranch" || true)"
- if test -z "$newupsreamrev" ; then
+ if test -z "$newupstreamrev" ; then
printerror "git cannot parse '$newupstreambranch':"
gitcmd rev-parse --verify "$newupstreambranch" || return 1
# should not be reached:
@@ -1575,7 +1577,7 @@
printerror "'$UPSTREAMBRANCH' differs from recorded one!"
return 1
fi
- if test -n "$PATHCHEDREV" && [ x"$PATCHEDREV" != x"$control_patched" ] ; then
+ if test -n "$PATCHEDREV" && [ x"$PATCHEDREV" != x"$control_patched" ] ; then
printerror "'$PATCHEDREV' differs from recorded one!"
return 1
fi
@@ -1730,7 +1732,7 @@
if test -z "$patchname" ; then
return 0
fi
- echo "Applying '$patchname' ${level:+with option '$level' }..."
+ echo "Applying '$patchname'..."
cp "$gitdir"/dpm/import/"$patchname" "$gitdir"/dpm/patchfile || return 1
apply_dpatch_patch || return 1
debugout "patch $patchname applied..."
@@ -4030,13 +4033,13 @@
# the right tree, it is better than
# a "changes found in..."
commit="$candidate"
- debugout "Reuse $commit for non-debian/ patches found in $founddiffilename"
+ debugout "Reuse $commit for non-debian/ patches found in $founddifffilename"
fi
fi
if test -n "$commit" ; then
gitcmd checkout -q "$commit"
else
- printwarn "$founddiffilename contains changes outside debian/, importing as single patch"
+ printwarn "$founddifffilename contains changes outside debian/, importing as single patch"
# TODO: start editor to give better message?
gitcmd commit -m "changes found in $founddifffilename"
fi
@@ -4283,7 +4286,7 @@
*)
if $imported_patches ; then
echo "patches were imported and thus are now applied."
- if ! $preapplied_patched ; then
+ if ! $preapplied_patches ; then
echo "You will most likely have to change the build-system"
echo "to no longer apply them at build time."
fi
diff -u -r -N git-dpm-0.2.0-1/index.html git-dpm-0.2.1-1/index.html
--- git-dpm-0.2.0-1/index.html 2010-07-29 12:01:21.000000000 +0200
+++ git-dpm-0.2.1-1/index.html 2010-10-07 17:32:56.000000000 +0200
@@ -164,6 +164,7 @@
<P>
There is the <A href="manpage.html">manpage</A>(<A href="manpage.pdf">PDF</A>).
And there are some <A href="examples.html">examples</A>.
+Also take a look in the <A href="http://wiki.debian.org/PackagingWithGit/GitDpm";>Debian Wiki pages about git-dpm</A>.
</P>
<H2><A name="mailinglist">Mailing lists</A></H2>
<P>
-------------------Changes to the unpacked .deb----------------------
(shortened for stuff already found above)
diff -u -r -N git-dpm_0.2.0-1/DEBIAN/control git-dpm_0.2.1-1/DEBIAN/control
--- git-dpm_0.2.0-1/DEBIAN/control 2010-07-29 12:26:09.000000000 +0200
+++ git-dpm_0.2.1-1/DEBIAN/control 2010-10-07 17:49:58.000000000 +0200
@@ -1,5 +1,5 @@
Package: git-dpm
-Version: 0.2.0-1
+Version: 0.2.1-1
Architecture: all
Maintainer: Bernhard R. Link <brlink@debian.org>
Installed-Size: 432
diff -u -r -N git-dpm_0.2.0-1/DEBIAN/md5sums git-dpm_0.2.1-1/DEBIAN/md5sums
--- git-dpm_0.2.0-1/DEBIAN/md5sums 2010-10-07 16:38:11.000000000 +0200
+++ git-dpm_0.2.1-1/DEBIAN/md5sums 2010-10-07 17:50:31.000000000 +0200
@@ -1,9 +1,9 @@
-4d241d101d108c103b8d6cd7ee908d62 usr/bin/git-dpm
+09fb530be0607f4032f5ebe5daf84a59 usr/bin/git-dpm
df93120a306fe66dc259a0845f8639ad usr/share/doc-base/git-dpm
-f24b4f3c2aa611990278f1e09ce8717a usr/share/doc/git-dpm/NEWS.gz
+53f679a4e280406a655c109124015e64 usr/share/doc/git-dpm/NEWS.gz
d28294f9d67ca91d61793bf08a13dd09 usr/share/doc/git-dpm/README
-a0c6d3dfcd36734292d2164e19d2e247 usr/share/doc/git-dpm/changelog.Debian.gz
-0e81be202c157677b50b59d269e2a8c3 usr/share/doc/git-dpm/changelog.gz
+aa29504ad8d6815bf1b0840799acfd9a usr/share/doc/git-dpm/changelog.Debian.gz
+fefdbef5b2a538de3a649a0f4daebf37 usr/share/doc/git-dpm/changelog.gz
5e3298c4cbf1282932dac89d69125434 usr/share/doc/git-dpm/copyright
f8bb595ee9830c893407c7c25fabd5f5 usr/share/doc/git-dpm/examples.html
9c621de0bfe97f2d6b2164eeeca49ae4 usr/share/doc/git-dpm/image-1.png
@@ -25,7 +25,7 @@
cee5842f7a74f4098a50f667fb37634e usr/share/doc/git-dpm/image-tag.png
a1f96af870a40d2d66b0f5fb2939c5ab usr/share/doc/git-dpm/image-updated.png
1fd9a6efc8b48a3893133a09624bcc54 usr/share/doc/git-dpm/image-upstreamrecorded.png
-747709994c97034fe219e36667b70d1c usr/share/doc/git-dpm/index.html
-42e26922004fd7da7dd3dfc8cb07e79f usr/share/doc/git-dpm/manpage.html
-f6331ee3a835e5c60cfa48420e64ccb4 usr/share/doc/git-dpm/manpage.pdf
+54f98c0698d18c8de4fdd13458059176 usr/share/doc/git-dpm/index.html
+d2164284448a39351f3354cb7240ba6c usr/share/doc/git-dpm/manpage.html
+f8e68999796c88e1818c502dd54d7a01 usr/share/doc/git-dpm/manpage.pdf
8bdc3b31cb095667dd65bae116e78b77 usr/share/man/man1/git-dpm.1.gz
diff -u -r -N git-dpm_0.2.0-1/usr/share/doc/git-dpm/manpage.html git-dpm_0.2.1-1/usr/share/doc/git-dpm/manpage.html
--- git-dpm_0.2.0-1/usr/share/doc/git-dpm/manpage.html 2010-07-29 12:26:00.000000000 +0200
+++ git-dpm_0.2.1-1/usr/share/doc/git-dpm/manpage.html 2010-10-07 17:49:50.000000000 +0200
@@ -1,5 +1,5 @@
<!-- Creator : groff version 1.20.1 -->
-<!-- CreationDate: Thu Jul 29 12:25:47 2010 -->
+<!-- CreationDate: Thu Oct 7 17:49:37 2010 -->
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
"http://www.w3.org/TR/html4/loose.dtd";>
<html>
Binary files git-dpm_0.2.0-1/usr/share/doc/git-dpm/manpage.pdf and git-dpm_0.2.1-1/usr/share/doc/git-dpm/manpage.pdf differ
diff -u -r -N git-dpm_0.2.0-1/usr/bin/git-dpm git-dpm_0.2.1-1/usr/bin/git-dpm
--- git-dpm_0.2.0-1/usr/bin/git-dpm 2010-07-29 12:26:00.000000000 +0200
+++ git-dpm_0.2.1-1/usr/bin/git-dpm 2010-10-07 17:49:50.000000000 +0200
@@ -25,7 +25,7 @@
export GREP_OPTIONS=--color=never
lines_must_match=1
-VERSION="0.2.0"
+VERSION="0.2.1"
GIT="git"
UPSTREAMBRANCH=""
PATCHEDBRANCH=""
@@ -73,6 +73,7 @@
[[[[Rest of the diff as in source]]]]
diff -u -r -N git-dpm_0.2.0-1/usr/share/doc/git-dpm/NEWS git-dpm_0.2.1-1/usr/share/doc/git-dpm/NEWS
[[[[diff of the file as in the source]]]]
diff -u -r -N git-dpm_0.2.0-1/usr/share/doc/git-dpm/changelog git-dpm_0.2.1-1/usr/share/doc/git-dpm/changelog
[[[[diff of the file as the file ChangeLog in the source]]]]
diff -u -r -N git-dpm_0.2.0-1/usr/share/doc/git-dpm/changelog.Debian git-dpm_0.2.1-1/usr/share/doc/git-dpm/changelog.Debian
[[[[diff of the file as the file debian/changelog in the source]]]]
diff -u -r -N git-dpm_0.2.0-1/usr/share/doc/git-dpm/index.html git-dpm_0.2.1-1/usr/share/doc/git-dpm/index.html
[[[[diff of the file as the file index.html in the source]]]]
Bernhard R. Link
Reply to: