summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorGuido Günther <agx@sigxcpu.org>2011-02-27 15:05:02 +0100
committerGuido Günther <agx@sigxcpu.org>2011-02-27 15:15:50 +0100
commit3b0f2965073c07a10b32922405c3a67e00677902 (patch)
tree8b5ebdee3a4ba676a2c8f96382814ce957736446 /docs
parenta618bdcf4149443d5b68132e96b5a15b52fc3f05 (diff)
downloadgit-buildpackage-3b0f2965073c07a10b32922405c3a67e00677902.tar.gz
git-buildpackage-3b0f2965073c07a10b32922405c3a67e00677902.tar.bz2
git-buildpackage-3b0f2965073c07a10b32922405c3a67e00677902.zip
Add script to ignore .pc and tell dpkg-source unpatch the source
See #591858.
Diffstat (limited to 'docs')
-rw-r--r--docs/chapters/building.sgml15
-rw-r--r--docs/common.ent1
2 files changed, 16 insertions, 0 deletions
diff --git a/docs/chapters/building.sgml b/docs/chapters/building.sgml
index f68e3780..97a9932b 100644
--- a/docs/chapters/building.sgml
+++ b/docs/chapters/building.sgml
@@ -152,4 +152,19 @@ echo "done."
</para>
</sect2>
</sect1>
+ <sect1 id="gbp.building.patch">
+ <title>Working with patches</title>
+ <para>
+ You can use &gbp-pq; to handle patches. See
+ <ulink url="https://honk.sigxcpu.org/piki/development/debian_packages_in_git/"></ulink>
+ for an example workflow.
+ </para>
+ <para>
+ In order to avoid a patched (unclean) source tree after the build you
+ can use &dpkg-source;'s <option>unapply-patches</option> option and
+ tell &git; to ignore the <filename>.pc</filename> directory.
+ <filename>/usr/share/doc/examples/git-buildpackage/examples/gbp-config-unpatched-source</filename>
+ sets up these two files for you.
+ </para>
+ </sect1>
</chapter>
diff --git a/docs/common.ent b/docs/common.ent
index 8a7e3e24..735511ae 100644
--- a/docs/common.ent
+++ b/docs/common.ent
@@ -27,6 +27,7 @@
<!ENTITY svn-buildpackage "<productname>svn-buildpackage</productname>">
<!ENTITY gpg "<productname>GPG</productname>">
<!ENTITY dpkg-buildpackage "<productname>Dpkg-buildpackage</productname>">
+ <!ENTITY dpkg-source "<productname>Dpkg-source</productname>">
<!ENTITY pristine-tar "<productname>pristine-tar</productname>">
<!ENTITY apt-get "<productname>apt-get</productname>">
<!ENTITY dget "<productname>dget</productname>">