diff options
| author | Simon McVittie <smcv@debian.org> | 2011-02-17 18:27:42 +0000 |
|---|---|---|
| committer | Simon McVittie <smcv@debian.org> | 2011-02-17 18:27:42 +0000 |
| commit | e402b888e7aa09f262f9bd46e48ba8f4f21a179d (patch) | |
| tree | 5c0bf3165d4af95ca7bf43ebf07599a53c6ea6db | |
| parent | f0277b7b84a10e68e03dd7f436f1759420826e0f (diff) | |
| download | dbus-e402b888e7aa09f262f9bd46e48ba8f4f21a179d.tar.gz | |
Ignore changes to generated Doxygen HTML instead of deleting it in clean
This makes git-buildpackage stop complaining that we deleted files from
the tarball.
| -rw-r--r-- | debian/changelog | 4 | ||||
| -rwxr-xr-x | debian/rules | 1 | ||||
| -rw-r--r-- | debian/source/options | 1 |
3 files changed, 5 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index a4956d06..b9154c26 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,10 @@ dbus (1.4.1-3) UNRELEASED; urgency=low * Remove doxygen call from debian/rules and cleaning up doc/api manually. The upstream build system takes care of that already. + [ Simon McVittie ] + * Ignore changes to generated Doxygen HTML instead of deleting it in clean, + for easier use of git-buildpackage + -- Michael Biebl <biebl@debian.org> Sat, 12 Feb 2011 13:31:06 +0100 dbus (1.4.1-2) unstable; urgency=low diff --git a/debian/rules b/debian/rules index 24762bc0..f9817117 100755 --- a/debian/rules +++ b/debian/rules @@ -49,7 +49,6 @@ override_dh_auto_clean: dh_auto_clean rm -f test/data/valid-config-files/session.conf rm -f test/data/valid-config-files/system.conf - rm -f doc/*.html rm -f dbus.devhelp diff --git a/debian/source/options b/debian/source/options new file mode 100644 index 00000000..dded4463 --- /dev/null +++ b/debian/source/options @@ -0,0 +1 @@ +extend-diff-ignore = "(^|/)doc/[^.]*\.html" |