1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
|
#!/bin/sh
# Copyright & License below
set -e
set -u
. "${DPT__SCRIPTS:-/usr/share/pkg-perl-tools}/lib/dpt-lib.sh"
INTERACTIVE=
GITIGNORE=
while getopts i OPTS; do
case "$OPTS" in
i) INTERACTIVE=1;;
*) ;;
esac
done
shift $(expr $OPTIND - 1)
if [ -f .gitignore ]; then
INTERACTIVE=1
GITIGNORE=1
fi
BASETAG=${1:-}
[ -n "$BASETAG" ] || die "Base tag needed."
NEWVERSION=${2:-}
[ -n "$NEWVERSION" ] || die "New version needed"
TEMPBRANCH="dpt-$(basename $0)-$$"
trap "git branch --delete --force $TEMPBRANCH" QUIT TERM EXIT
git branch $TEMPBRANCH $BASETAG
gbp import-dsc --debian-branch $TEMPBRANCH apt:$PKG=$NEWVERSION
ENCODEDVERSION=$(echo $NEWVERSION | sed -e 's/:/%/g' -e 's/~/_/g')
if [ -z "$INTERACTIVE" ]; then
git merge --no-edit debian/$ENCODEDVERSION
else
git merge --no-commit debian/$ENCODEDVERSION
if [ -n "$GITIGNORE" ]; then
info "Trying to recover .gitignore ..."
git reset -- .gitignore; git co -- .gitignore
fi
info "Do any manual fixup before running"
info "git merge --continue"
fi
exit 0
POD=<<'EOF'
=head1 NAME
dpt-missing-upload - incorporate package uploads not done from Git
=head1 SYNOPSIS
B<dpt missing-upload> [B<-i>] I<BASETAG> I<NEWVERSION>
=head1 DESCRIPTION
B<dpt missing-upload> incorporates uploads of a package which are not yet in
the Git repo, e.g. NMUs.
To be run in the root directory of the source package's Git repo, and with
the target branch checked out.
=head1 OPTIONS
Options must come before parameters.
=over
=item B<-i>
Run interactively, e.g. call C<git merge> with I<--no-commit>, so the commit
can be amended. Useful if the imported upload adds/removes files.
Interactive mode is also enabled if a F<.gitignore> file is found.
=back
=head1 PARAMETERS
=over
=item BASETAG
The Git tag representing the package version before the one to be imported. Required.
=item NEWVERSION
The package version to be downloaded and imported. Required.
=back
=head1 NOTES
=over
=item
To make merging Debian tags as painless as possible, L<dpkg-mergechangelogs(1)> is helpful.
=item
For downloading the source package, C<deb-src> entries are required in the F<sources.list>.
=back
=head1 COPYRIGHT & LICENSE
Copyright: 2020-2024, gregor herrmann E<lt>gregoa@debian.orgE<gt>
License: Artistic | GPL-1+
=cut
EOF
|
