diff options
Diffstat (limited to 'docs/chapters/import.sgml')
| -rw-r--r-- | docs/chapters/import.sgml | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/docs/chapters/import.sgml b/docs/chapters/import.sgml index 6d41421..ddb3871 100644 --- a/docs/chapters/import.sgml +++ b/docs/chapters/import.sgml @@ -5,7 +5,7 @@ <title>Importing already existing &debian; packages</title> <para>Importing an already exsting debian package into a git repository is as easy as: <screen> -&git-import-dsc; package_0.1-1.dsc +&gbp-import-dsc; package_0.1-1.dsc </screen> This will create a new git repository named after the imported package, put the upstream sources onto the <option>upstream-branch</option> and the @@ -26,15 +26,15 @@ &git; repository and just continue with the same command: <screen> cd package/ -&git-import-dsc; package_0.1-2.dsc -&git-import-dsc; package_0.1-3.dsc -&git-import-dsc; package_0.2-1.dsc +&gbp-import-dsc; package_0.1-2.dsc +&gbp-import-dsc; package_0.1-3.dsc +&gbp-import-dsc; package_0.2-1.dsc </screen> </para> <para> -Or you can import all versions at once using &git-import-dscs;: +Or you can import all versions at once using &gbp-import-dscs;: <screen> -&git-import-dscs; /path/to/history/package_*.dsc +&gbp-import-dscs; /path/to/history/package_*.dsc </screen> This will create a &git; repository if necessary and import all versions sorted by version number. @@ -46,9 +46,9 @@ by version number. <para>Change into your git repository (which can be empty), make sure it has all local modifications committed and run either of: <screen> -&git-import-orig; <filename>/path/to/package_0.2.orig.tar.gz</filename> -&git-import-orig; <filename>/path/to/package_0.2.tar.bz2</filename> -&git-import-orig; <filename>/path/to/package-0.2/</filename> +&gbp-import-orig; <filename>/path/to/package_0.2.orig.tar.gz</filename> +&gbp-import-orig; <filename>/path/to/package_0.2.tar.bz2</filename> +&gbp-import-orig; <filename>/path/to/package-0.2/</filename> </screen> This puts the upstream souces onto the <option>upstream-branch</option> and tags them accordingly (the default tag format is @@ -59,7 +59,7 @@ by version number. <option>--debian-branch</option> options. You can also filter out content you don't want imported: <screen> -&git-import-orig; <option>--filter</option>=<replaceable>'CVS/*'</replaceable> <filename>/path/to/package_0.2.orig.tar.gz</filename> +&gbp-import-orig; <option>--filter</option>=<replaceable>'CVS/*'</replaceable> <filename>/path/to/package_0.2.orig.tar.gz</filename> </screen> The <option>--filter</option> option can be used multiple times for more complex filtering. @@ -74,7 +74,7 @@ by version number. (orig.tar.gz) from &git; you should also specify the <option>--pristine-tar</option> option. This is recommended. </para> - <para>To customize the commit message used by &git-import-orig; use + <para>To customize the commit message used by &gbp-import-orig; use the <option>--import-msg</option> option. This string is a standard python format string, into which the <replaceable>version</replaceable> variable is interpolated. (i.e., @@ -86,8 +86,8 @@ by version number. <sect1 id="gbp.import.convert"> <title>Converting an existing &git; repository</title> <para> - If the &git; repository wasn't created with &git-import-dsc; you have to tell - &git-buildpackage; and friends where to find the upstream sources. + If the &git; repository wasn't created with &gbp-import-dsc; you have to tell + &gbp-buildpackage; and friends where to find the upstream sources. </para> <sect2> <title>Upstream sources on a branch</title> @@ -99,7 +99,7 @@ by version number. &gitcmd; branch upstream theupstream-branch &gitcmd; branch <option>-D</option> theupstream-branch </screen> - or you can tell &git-buildpackage; the name of the branch to use as + or you can tell &gbp-buildpackage; the name of the branch to use as <option>upstream-branch</option>: <screen> <command>cat</command> <<EOF > <filename>.git/gbp.conf</filename> @@ -108,7 +108,7 @@ by version number. upstream-branch=theupstream-branch EOF </screen> - If you then use &git-import-orig; to import new upstream sources, they will + If you then use &gbp-import-orig; to import new upstream sources, they will from now on end up on <emphasis>theupstream-branch</emphasis> and merged to the <option>debian-branch</option>. </para> @@ -131,12 +131,12 @@ EOF </para> <warning><para>There's currently no <emphasis>easy</emphasis> way to create the <option>upstream-branch</option> if you never had the upstream sources - as a single commit. Using &git-import-orig; on such repositories might lead + as a single commit. Using &gbp-import-orig; on such repositories might lead to unexpected merge results.</para></warning> <para>In order to fix this you can prepend the upstream sources as a single commit to your tree using &git;'s <ulink url="http://git.or.cz/gitwiki/GraftPoint">grafts</ulink>. Afterwards you - can simply create a branch as explained above and &git-import-orig; will + can simply create a branch as explained above and &gbp-import-orig; will work as expected.</para> <para>Alternatively, if you are only importing source from original tarballs (for instance when converting from a Subversion repository where the @@ -173,7 +173,7 @@ EOF <para>Then you import the upstream sources, branch off the <option>upstream-branch</option> branch and add the debian files (e.g. via dh_make): <screen> -&git-import-orig; <option>-u</option> <replaceable>0.1</replaceable> <filename>../package-0.1.tar.gz</filename> +&gbp-import-orig; <option>-u</option> <replaceable>0.1</replaceable> <filename>../package-0.1.tar.gz</filename> <command>dh_make</command> </screen> That's it, you're done. If you want to publish you're new repository you can use &gbp-create-remote-repo;. @@ -194,7 +194,7 @@ EOF </para> <para> - &git-buildpackage; will by default create an upstream tarball for you. By default it will + &gbp-buildpackage; will by default create an upstream tarball for you. By default it will be created from the tag name given by the <option>--git-upstream-tag</option> option. You can customize it's value via the <option>upstream-tag</option> configuration variable. </para> @@ -211,7 +211,7 @@ upstream-tag = v%(version)s <replaceable>version</replaceable> will be replaced with the upstream version number as read from <filename>debian/changelog</filename>. </para> - <para>If you're using &pristine-tar; you can make &git-buildpackage commit the tarball back to the + <para>If you're using &pristine-tar; you can make &gbp-buildpackage commit the tarball back to the pristine-tar branch by using the <option>--git-pristine-tar-commit</option> option. </para> </sect2> @@ -221,10 +221,10 @@ upstream-tag = v%(version)s <para>If you want to track upstream's git but continue to import the upstream tarballs, e.g. to make sure the tarball uploaded to &debian; has the same checksum as upstream's you can use the <option>--upstream-vcs-tag</option> option - when importing new tarballs with &git-import-orig;. Assuming you have the upstream source in your + when importing new tarballs with &gbp-import-orig;. Assuming you have the upstream source in your repository with a tag <replaceable>v0.0.1</replaceable> you can use: <screen> - &git-import-orig; --upstream-vcs-tag=v0.0.1 foo_0.0.1.orig.tar.gz + &gbp-import-orig; --upstream-vcs-tag=v0.0.1 foo_0.0.1.orig.tar.gz </screen> to add upstream's tag as additional parent to the merge commit. See <ulink url="http://bugs.debian.org/664771">#664771</ulink> for more details. |