diff options
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | dgit-user.7.pod | 6 |
2 files changed, 7 insertions, 5 deletions
diff --git a/debian/changelog b/debian/changelog index 4230480..bf71eba 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,8 +8,10 @@ dgit (3.2~) unstable; urgency=medium it becomes public (ie, make the repo available much more promptly when the package passes NEW). Closes:#849789. - Documentation [Sean Whitton]: - * dgit-maint-merge(7): Use git-deborig(1). Closes:#850953. + Documentation: + * dgit-maint-merge(7): Use git-deborig(1). + [Sean Whitton] Closes:#850953. + * dgit-user(7): Fix some typos. Test suite: * infra: mirroring and policy hooks: Improve some debugging output. diff --git a/dgit-user.7.pod b/dgit-user.7.pod index ad0cca1..08647c6 100644 --- a/dgit-user.7.pod +++ b/dgit-user.7.pod @@ -234,7 +234,7 @@ Debian package builds are often quite messy: they may modify files which are also committed to git, or leave outputs and teporary files not covered by C<.gitignore>. -Kf you always commit, +If you always commit, you can use =over 4 @@ -362,9 +362,9 @@ If neither of those are an option, your desperate last resort is to try using the same version number as the official package for your own package. -(The verseion is controlled by C<debian/changelog> - see above,) +(The verseion is controlled by C<debian/changelog> - see above). This is not ideal because it makes it hard to tell what is installed, -because it will mislead and confuse apt. +and because it will mislead and confuse apt. With the "same number" approach you may still get errors like |