summaryrefslogtreecommitdiffhomepage
path: root/docs/chapters/import.sgml
diff options
context:
space:
mode:
Diffstat (limited to 'docs/chapters/import.sgml')
-rw-r--r--docs/chapters/import.sgml33
1 files changed, 28 insertions, 5 deletions
diff --git a/docs/chapters/import.sgml b/docs/chapters/import.sgml
index a9fd5e15..18c331cb 100644
--- a/docs/chapters/import.sgml
+++ b/docs/chapters/import.sgml
@@ -1,5 +1,6 @@
<chapter id="gbp.import">
<title>Importing Sources</title>
+
<sect1 id="gbp.import.existing">
<title>Importing already existing &debian; packages</title>
<para>Imporing an already exsting debian package into a git repository is as easy as:
@@ -14,6 +15,7 @@
<option>--upstream-branch</option> and <option>--debian-branch</option> options.
</para>
</sect1>
+
<sect1 id="gbp.import.new.upstream">
<title>Importing a new upstream version</title>
<para>Change into your git repository, make sure it has all local
@@ -23,11 +25,10 @@
&git-import-orig; /path/to/package_0.2.tar.bz2
&git-import-orig; /path/to/package-0.2/
</screen>
- This puts the upstream souces onto the <emphasis>upstream</emphasis> branch
- using &gitloaddirs; to handle file removals and renames. The result of
- this is then merged onto the <emphasis>master</emphasis> branch and a new
- changelog entry is created. You can again specify different branch names
- via the <option>--upstream-branch</option> and
+ This puts the upstream souces onto the <emphasis>upstream</emphasis> branch.
+ The result of this is then merged onto the <emphasis>master</emphasis>
+ branch and a new changelog entry is created. You can again specify
+ different branch names via the <option>--upstream-branch</option> and
<option>--debian-branch</option> options. You can also filter out content
you don't want imported:
<screen>
@@ -42,6 +43,7 @@
<para>
</para>
</sect1>
+
<sect1 id="gbp.import.convert">
<title>Converting an existing &git; repository</title>
<para>
@@ -95,4 +97,25 @@ upstream-branch=theupstream-branch
work as expected.</para>
</sect2>
</sect1>
+
+ <sect1 id="gbp.import.fromscratch">
+ <title>Starting a Debian package from scratch</title>
+ <para>
+ So far we assumed you already have a &debian; package to start with but
+ what if you want to start a new package? First create an empty repository:
+ </para>
+ <screen>
+mkdir package-0.1
+cd package-0.1
+git-init
+ </screen>
+ <para>Then you import the upstream sources, branch of the
+ <emphasis>upstream</emphasis> branch and add the debian files (e.g. via dh_make):
+ <screen>
+&git-import-orig -u 0.1 ../package-0.1.tar.gz
+git-branch upstream
+dh_make
+ </screen>
+ That's it, you're done.
+ </sect1>
</chapter>