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
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
|
<refentry id="gbp.man.git.import.orig">
<refentryinfo>
<address>
&dhemail;
</address>
<author>
&dhfirstname;
&dhsurname;
</author>
</refentryinfo>
<refmeta>
<refentrytitle>git-import-orig</refentrytitle>
&dhsection;
</refmeta>
<refnamediv>
<refname>&git-import-orig;</refname>
<refpurpose>Import an upstream source into a git repository</refpurpose>
</refnamediv>
<refsynopsisdiv>
<cmdsynopsis>
&git-import-orig;
<arg><option>--verbose</option></arg>
<arg><option>--upstream-version=</option><replaceable>version</replaceable></arg>
<arg><option>--[no-]merge</option></arg>
<arg><option>--upstream-branch=</option><replaceable>branch_name</replaceable></arg>
<arg><option>--debian-branch=</option><replaceable>branch_name</replaceable></arg>
<arg><option>--upstream-vcs-tag=</option><replaceable>tag_name</replaceable></arg>
<arg><option>--[no-]sign-tags</option></arg>
<arg><option>--keyid=</option><replaceable>gpg-keyid</replaceable></arg>
<arg><option>--upstream-tag=</option><replaceable>tag-format</replaceable></arg>
<arg><option>--filter=</option><replaceable>pattern</replaceable></arg>
<arg><option>--[no-]pristine-tar</option></arg>
<arg><option>--[no-]filter-pristine-tar</option></arg>
<arg><option>--postimport=cmd</option></arg>
<arg><option>--uscan</option></arg>
<arg choice="plain"><replaceable>upstream-source</replaceable></arg>
</cmdsynopsis>
</refsynopsisdiv>
<refsect1>
<title>DESCRIPTION</title>
<para>
&git-import-orig; imports <replaceable>upstream-source</replaceable> into
the &git; repository. <replaceable>upstream-source</replaceable> can either
be a gzip or bzip2 compressed tar archive or an already unpacked source
tree. If it is already of the form
<replaceable>package-name_version.orig.tar.gz</replaceable>, the version
information is read from the tarball's filename otherwise it can be
given on the command line via <option>--upstream-version</option>.
</para>
<para>The sources are placed on the upstream branch (default:
<replaceable>upstream</replaceable>), tagged and merged onto the debian
branch (default: <replaceable>master</replaceable>).
</para>
</refsect1>
<refsect1>
<title>OPTIONS</title>
<variablelist>
<varlistentry>
<term><option>--upstream-version</option>=<replaceable>version</replaceable></term>
<term><option>-u</option><replaceable>version</replaceable></term>
<listitem>
<para>The upstream version number</para>
</listitem>
</varlistentry>
<varlistentry>
<term><option>--merge</option></term>
<listitem>
<para>Merge the upstream branch to the debian branch after import</para>
</listitem>
</varlistentry>
<varlistentry>
<term><option>--upstream-branch</option>=<replaceable>branch_name</replaceable>
</term>
<listitem>
<para>The branch in the Git repository the upstream sources are put
onto. Default is <replaceable>upstream</replaceable>.</para>
</listitem>
</varlistentry>
<varlistentry>
<term><option>--debian-branch</option>=<replaceable>branch_name</replaceable>
</term>
<listitem>
<para>The branch in the Git repository the Debian package is being
developed on, default is <replaceable>master</replaceable>. After
importing the new sources on the upstream branch, &git-import-orig;
will try to merge the new version onto this branch.</para>
</listitem>
</varlistentry>
<varlistentry>
<term><option>--upstream-vcs-tag</option>=<replaceable>tag_name</replaceable>
</term>
<listitem>
<para>
Add <replaceable>tag_name</replaceable> as additional parent to the commit
of the upstream tarball. Useful when upstream uses git and you want to
link to it's revision history.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term><option>--verbose</option></term>
<term><option>-v</option></term>
<listitem>
<para>verbose execution</para>
</listitem>
</varlistentry>
<varlistentry>
<term><option>--[no-]sign-tags</option>
</term>
<listitem>
<para>GPG sign all created tags</para>
</listitem>
</varlistentry>
<varlistentry>
<term><option>--keyid=</option><replaceable>gpg-keyid</replaceable>
</term>
<listitem>
<para>use this keyid for gpg signing tags</para>
</listitem>
</varlistentry>
<varlistentry>
<term><option>--upstream-tag=</option><replaceable>tag-format</replaceable>
</term>
<listitem>
<para>use this tag format when tagging upstream versions,
default is <replaceable>upstream/%(versions)s</replaceable></para>
</listitem>
</varlistentry>
<varlistentry>
<term><option>--import-msg=</option><replaceable>msg-format</replaceable>
</term>
<listitem>
<para>use this format string for the commit message when
importing upstream versions, default is <replaceable>Imported
Upstream version %(version)s</replaceable></para>
</listitem>
</varlistentry>
<varlistentry>
<term><option>--filter=</option><replaceable>pattern</replaceable>
</term>
<listitem>
<para>filter out files glob-matching pattern. Can be given multiple times.</para>
</listitem>
</varlistentry>
<varlistentry>
<term><option>--pristine-tar</option>
</term>
<listitem>
<para>generate pristine-tar delta file</para>
</listitem>
</varlistentry>
<varlistentry>
<term><option>--filter-pristine-tar</option>
</term>
<listitem>
<para>if using a filter also filter the files out of the tarball
passed to pristine tar</para>
</listitem>
</varlistentry>
<varlistentry>
<term><option>--postimport=<replaceable>cmd</replaceable></option></term>
<listitem>
<para>run <replaceable>cmd</replaceable> after the import.</para>
</listitem>
</varlistentry>
<varlistentry>
<term><option>--uscan</option></term>
<listitem>
<para>Use uscan to fetch new upstream version.</para>
</listitem>
</varlistentry>
</variablelist>
</refsect1>
<refsect1>
&man.git.config-files;
</refsect1>
<refsect1>
<title>SEE ALSO</title>
<para>
<citerefentry>
<refentrytitle>git-buildpackage</refentrytitle>
<manvolnum>1</manvolnum>
</citerefentry>,
<citerefentry>
<refentrytitle>git-import-dsc</refentrytitle>
<manvolnum>1</manvolnum>
</citerefentry>,
<citerefentry>
<refentrytitle>git-import-dscs</refentrytitle>
<manvolnum>1</manvolnum>
</citerefentry>,
<citerefentry>
<refentrytitle>git-dch</refentrytitle>
<manvolnum>1</manvolnum>
</citerefentry>,
<citerefentry>
<refentrytitle>gbp.conf</refentrytitle>
&dhconfsection;
</citerefentry>,
&man.seealso.common;
</para>
</refsect1>
<refsect1>
<title>AUTHOR</title>
<para>&dhusername; &dhemail;</para>
</refsect1>
</refentry>
|
