diff options
Diffstat (limited to 'debian/patches/0002-dpkg-mergechangelogs.patch')
| -rw-r--r-- | debian/patches/0002-dpkg-mergechangelogs.patch | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/debian/patches/0002-dpkg-mergechangelogs.patch b/debian/patches/0002-dpkg-mergechangelogs.patch new file mode 100644 index 00000000..da88f733 --- /dev/null +++ b/debian/patches/0002-dpkg-mergechangelogs.patch @@ -0,0 +1,11 @@ +Description: Set up dpkg-mergechangelogs + To deal with the merged upstream and Debian changelog. +Author: Sean Whitton <spwhitton@spwhitton.name> +Forwarded: not-needed + +--- + +--- /dev/null ++++ propellor-3.1.0/.gitattributes +@@ -0,0 +1 @@ ++debian/changelog merge=dpkg-mergechangelogs |