Merge branch 'master' of git://gitorious.org/dma-roam/pkg-debian

diff --cc debian/NEWS
index 0000000000000000000000000000000000000000,36ed11a44026697c8e9b460c3014e452f28c08ae..36ed11a44026697c8e9b460c3014e452f28c08ae
mode 000000,100644..100644
--- /dev/null
--- 2/NEWS
+++ b/debian/NEWS

diff --cc debian/README.Debian
index 0000000000000000000000000000000000000000,7031cdb2b9c41f177776258168f5b36dd688f8b9..7031cdb2b9c41f177776258168f5b36dd688f8b9
mode 000000,100644..100644
--- /dev/null
--- 2/README.Debian
+++ b/debian/README.Debian

diff --cc debian/changelog
index 0000000000000000000000000000000000000000,adbf56d3957742a3b7377958b1619009514cfe13..adbf56d3957742a3b7377958b1619009514cfe13
mode 000000,100644..100644
--- /dev/null
--- 2/changelog
+++ b/debian/changelog

diff --cc debian/compat
index 0000000000000000000000000000000000000000,7f8f011eb73d6043d2e6db9d2c101195ae2801f2..7f8f011eb73d6043d2e6db9d2c101195ae2801f2
mode 000000,100644..100644
--- /dev/null
--- 2/compat
+++ b/debian/compat

diff --cc debian/config
index 0000000000000000000000000000000000000000,e352fe4a05b44d7634b333932c3180e7370467d6..e352fe4a05b44d7634b333932c3180e7370467d6
mode 000000,100755..100755
--- /dev/null
--- 2/config
+++ b/debian/config

diff --cc debian/control
index 0000000000000000000000000000000000000000,73b0f3d9a197f639fdc1a7cf5cc752c4275fd536..73b0f3d9a197f639fdc1a7cf5cc752c4275fd536
mode 000000,100644..100644
--- /dev/null
--- 2/control
+++ b/debian/control

diff --cc debian/copyright
index 0000000000000000000000000000000000000000,4ad8fbb7a80f5a21b898f6705488ce1f7a73c489..4ad8fbb7a80f5a21b898f6705488ce1f7a73c489
mode 000000,100644..100644
--- /dev/null
--- 2/copyright
+++ b/debian/copyright

diff --cc debian/dbounce-simple-safecat
index 0000000000000000000000000000000000000000,6c072c138db507ffc608e7c7a4d3fd6adb3ee8ad..6c072c138db507ffc608e7c7a4d3fd6adb3ee8ad
mode 000000,100644..100644
--- /dev/null
--- 2/dbounce-simple-safecat
+++ b/debian/dbounce-simple-safecat

diff --cc debian/dbounce-simple-safecat.1
index 0000000000000000000000000000000000000000,6f8e5f75e9f190cad2ced84b7202af3e35b152ad..6f8e5f75e9f190cad2ced84b7202af3e35b152ad
mode 000000,100644..100644
--- /dev/null
--- 2/dbounce-simple-safecat.1
+++ b/debian/dbounce-simple-safecat.1

diff --cc debian/dma-migrate.dirs
index 0000000000000000000000000000000000000000,b174b445af42e65b87d69666c521963fba1c2c93..b174b445af42e65b87d69666c521963fba1c2c93
mode 000000,100644..100644
--- /dev/null
--- 2/dma-migrate.dirs
+++ b/debian/dma-migrate.dirs

diff --cc debian/dma-migrate.install
index 0000000000000000000000000000000000000000,1c35b0afb178f528defb516de7790b940f454996..1c35b0afb178f528defb516de7790b940f454996
mode 000000,100644..100644
--- /dev/null
--- 2/dma-migrate.install
+++ b/debian/dma-migrate.install

diff --cc debian/dma-migrate.manpages
index 0000000000000000000000000000000000000000,3629dbe3a288b75535ee8e156f3341ad0681c11d..3629dbe3a288b75535ee8e156f3341ad0681c11d
mode 000000,100644..100644
--- /dev/null
--- 2/dma-migrate.manpages
+++ b/debian/dma-migrate.manpages

diff --cc debian/dma.cron.d
index 0000000000000000000000000000000000000000,ad4f0594fb6b54da00a2cb0c9c9f3d846062587d..ad4f0594fb6b54da00a2cb0c9c9f3d846062587d
mode 000000,100644..100644
--- /dev/null
--- 2/dma.cron.d
+++ b/debian/dma.cron.d

diff --cc debian/dma.dirs
index 0000000000000000000000000000000000000000,f10c0054ee33fdabcf454a414486a92d920ab6c2..f10c0054ee33fdabcf454a414486a92d920ab6c2
mode 000000,100644..100644
--- /dev/null
--- 2/dma.dirs
+++ b/debian/dma.dirs

diff --cc debian/dma.install
index 0000000000000000000000000000000000000000,a1199a7a01f1c8fbfebea228db793081c01d076f..a1199a7a01f1c8fbfebea228db793081c01d076f
mode 000000,100644..100644
--- /dev/null
--- 2/dma.install
+++ b/debian/dma.install

diff --cc debian/dma.links
index 0000000000000000000000000000000000000000,d9ac22a2cdc2a4796f24a5279380c5c09f056043..d9ac22a2cdc2a4796f24a5279380c5c09f056043
mode 000000,100644..100644
--- /dev/null
--- 2/dma.links
+++ b/debian/dma.links

diff --cc debian/dma.lintian-overrides
index 0000000000000000000000000000000000000000,fbf2e1d9106b9182e04afa292034f96e0a0308e6..fbf2e1d9106b9182e04afa292034f96e0a0308e6
mode 000000,100644..100644
--- /dev/null
--- 2/dma.lintian-overrides
+++ b/debian/dma.lintian-overrides

diff --cc debian/migrate/Makefile
index 0000000000000000000000000000000000000000,cc7d3476c008bfd1aa376c71f86d58a398a0309d..cc7d3476c008bfd1aa376c71f86d58a398a0309d
mode 000000,100644..100644
--- /dev/null
--- 2/migrate/Makefile
+++ b/debian/migrate/Makefile

diff --cc debian/migrate/NEWS
index 0000000000000000000000000000000000000000,29dca0dd335b3ad8cf34c119d0ceaa7adf2ecb59..29dca0dd335b3ad8cf34c119d0ceaa7adf2ecb59
mode 000000,100644..100644
--- /dev/null
--- 2/migrate/NEWS
+++ b/debian/migrate/NEWS

diff --cc debian/migrate/dma-migrate.8
index 0000000000000000000000000000000000000000,e40acef5b13d3cc10dfffbf1e7c65ef53a806f0c..e40acef5b13d3cc10dfffbf1e7c65ef53a806f0c
mode 000000,100644..100644
--- /dev/null
--- 2/migrate/dma-migrate.8
+++ b/debian/migrate/dma-migrate.8

diff --cc debian/migrate/dma-migrate.c
index 0000000000000000000000000000000000000000,56bfa2adbf8761f9ee042d647d9b0f360de31c82..56bfa2adbf8761f9ee042d647d9b0f360de31c82
mode 000000,100644..100644
--- /dev/null
--- 2/migrate/dma-migrate.c
+++ b/debian/migrate/dma-migrate.c

diff --cc debian/patches/03-debian-locations.patch
index 0000000000000000000000000000000000000000,60f68d773a892bd83c3278d8f23b18772eda120b..60f68d773a892bd83c3278d8f23b18772eda120b
mode 000000,100644..100644
--- /dev/null
--- 2/patches/03-debian-locations.patch
+++ b/debian/patches/03-debian-locations.patch

diff --cc debian/patches/04-debian-setgid.patch
index 0000000000000000000000000000000000000000,5ffd6f34a5e71d653ad54b3ec1ee3f809f215c70..5ffd6f34a5e71d653ad54b3ec1ee3f809f215c70
mode 000000,100644..100644
--- /dev/null
--- 2/patches/04-debian-setgid.patch
+++ b/debian/patches/04-debian-setgid.patch

diff --cc debian/patches/09-typos.patch
index 0000000000000000000000000000000000000000,885b9956a4ff90e66d0469f37377f1a7bd0e4aea..885b9956a4ff90e66d0469f37377f1a7bd0e4aea
mode 000000,100644..100644
--- /dev/null
--- 2/patches/09-typos.patch
+++ b/debian/patches/09-typos.patch

diff --cc debian/patches/10-liblockfile.patch
index 0000000000000000000000000000000000000000,e9542a36ef44cfe48e1d34eb796c589d0a52ebc4..e9542a36ef44cfe48e1d34eb796c589d0a52ebc4
mode 000000,100644..100644
--- /dev/null
--- 2/patches/10-liblockfile.patch
+++ b/debian/patches/10-liblockfile.patch

diff --cc debian/patches/11-double-bounce.patch
index 0000000000000000000000000000000000000000,c95f9796550c4d708a202886c25c3f17e49d2fe6..c95f9796550c4d708a202886c25c3f17e49d2fe6
mode 000000,100644..100644
--- /dev/null
--- 2/patches/11-double-bounce.patch
+++ b/debian/patches/11-double-bounce.patch

diff --cc debian/patches/13-hardening.patch
index 0000000000000000000000000000000000000000,f7a7bbb14a018f1ca2be9f9f33d9888805cbd7c3..f7a7bbb14a018f1ca2be9f9f33d9888805cbd7c3
mode 000000,100644..100644
--- /dev/null
--- 2/patches/13-hardening.patch
+++ b/debian/patches/13-hardening.patch

diff --cc debian/patches/17-mailname.patch
index 0000000000000000000000000000000000000000,63261340c619b9cc08caf412cdf2dd5ffd361586..63261340c619b9cc08caf412cdf2dd5ffd361586
mode 000000,100644..100644
--- /dev/null
--- 2/patches/17-mailname.patch
+++ b/debian/patches/17-mailname.patch

diff --cc debian/patches/20-parse-recipient.patch
index 0000000000000000000000000000000000000000,b67872987d867f5955f4f3a3f3740ef2484003be..b67872987d867f5955f4f3a3f3740ef2484003be
mode 000000,100644..100644
--- /dev/null
--- 2/patches/20-parse-recipient.patch
+++ b/debian/patches/20-parse-recipient.patch

diff --cc debian/patches/23-dirent-d_type.patch
index 0000000000000000000000000000000000000000,379765af19add31e782057aadeddddcebb108b0f..379765af19add31e782057aadeddddcebb108b0f
mode 000000,100644..100644
--- /dev/null
--- 2/patches/23-dirent-d_type.patch
+++ b/debian/patches/23-dirent-d_type.patch

diff --cc debian/patches/24-random-message-id.patch
index 0000000000000000000000000000000000000000,1b89920f24b599cece2fad862a26a4489490f29b..1b89920f24b599cece2fad862a26a4489490f29b
mode 000000,100644..100644
--- /dev/null
--- 2/patches/24-random-message-id.patch
+++ b/debian/patches/24-random-message-id.patch

diff --cc debian/patches/25-unsupported-starttls.patch
index 0000000000000000000000000000000000000000,cb34484525b5d3b78f8302999b849a7f49df4f8f..cb34484525b5d3b78f8302999b849a7f49df4f8f
mode 000000,100644..100644
--- /dev/null
--- 2/patches/25-unsupported-starttls.patch
+++ b/debian/patches/25-unsupported-starttls.patch

diff --cc debian/patches/27-int-size.patch
index 0000000000000000000000000000000000000000,6ac3cd06a5a332b9f7a5bb4377076d87045ef3bd..6ac3cd06a5a332b9f7a5bb4377076d87045ef3bd
mode 000000,100644..100644
--- /dev/null
--- 2/patches/27-int-size.patch
+++ b/debian/patches/27-int-size.patch

diff --cc debian/patches/28-valid-recipient.patch
index 0000000000000000000000000000000000000000,5fc700b0d68bd41ed0f4643b37dcd9f6df813a9a..5fc700b0d68bd41ed0f4643b37dcd9f6df813a9a
mode 000000,100644..100644
--- /dev/null
--- 2/patches/28-valid-recipient.patch
+++ b/debian/patches/28-valid-recipient.patch

diff --cc debian/patches/29-double-free.patch
index 0000000000000000000000000000000000000000,cccd5022c5271de6ca51469634ed9a61a7644ae9..cccd5022c5271de6ca51469634ed9a61a7644ae9
mode 000000,100644..100644
--- /dev/null
--- 2/patches/29-double-free.patch
+++ b/debian/patches/29-double-free.patch

diff --cc debian/patches/30-ldflags.patch
index 0000000000000000000000000000000000000000,3fc20f28b6624eaeedc8905ce69a3ab02ccbf514..3fc20f28b6624eaeedc8905ce69a3ab02ccbf514
mode 000000,100644..100644
--- /dev/null
--- 2/patches/30-ldflags.patch
+++ b/debian/patches/30-ldflags.patch

diff --cc debian/patches/31-sigalrm-backoff.patch
index 0000000000000000000000000000000000000000,1e47e91f075cbab85702724078418b0aa8c80872..1e47e91f075cbab85702724078418b0aa8c80872
mode 000000,100644..100644
--- /dev/null
--- 2/patches/31-sigalrm-backoff.patch
+++ b/debian/patches/31-sigalrm-backoff.patch

diff --cc debian/patches/32-comment-uncomment.patch
index 0000000000000000000000000000000000000000,7835ae86b1633a740adb3ce487960917ed5eda1e..7835ae86b1633a740adb3ce487960917ed5eda1e
mode 000000,100644..100644
--- /dev/null
--- 2/patches/32-comment-uncomment.patch
+++ b/debian/patches/32-comment-uncomment.patch

diff --cc debian/patches/33-opportunistic-tls.patch
index 0000000000000000000000000000000000000000,23dccd9fedea258bd9c5c03404f56ee4ed839f7b..23dccd9fedea258bd9c5c03404f56ee4ed839f7b
mode 000000,100644..100644
--- /dev/null
--- 2/patches/33-opportunistic-tls.patch
+++ b/debian/patches/33-opportunistic-tls.patch

diff --cc debian/patches/34-manpage-defaults.patch
index 0000000000000000000000000000000000000000,10be6724fa47d983b3d8fc8efa4695f215d1877c..10be6724fa47d983b3d8fc8efa4695f215d1877c
mode 000000,100644..100644
--- /dev/null
--- 2/patches/34-manpage-defaults.patch
+++ b/debian/patches/34-manpage-defaults.patch

diff --cc debian/patches/35-delivery-retry.patch
index 0000000000000000000000000000000000000000,1fbb4593be68991888a4c89b72320fc9acebc841..1fbb4593be68991888a4c89b72320fc9acebc841
mode 000000,100644..100644
--- /dev/null
--- 2/patches/35-delivery-retry.patch
+++ b/debian/patches/35-delivery-retry.patch

diff --cc debian/patches/36-sa_nocldwait.patch
index 0000000000000000000000000000000000000000,4a40fe3e1bd1e8034281990f749f5c26101e49a8..4a40fe3e1bd1e8034281990f749f5c26101e49a8
mode 000000,100644..100644
--- /dev/null
--- 2/patches/36-sa_nocldwait.patch
+++ b/debian/patches/36-sa_nocldwait.patch

diff --cc debian/patches/37-gnu-hurd.patch
index 0000000000000000000000000000000000000000,2a9c0d9a39cc97e7d21774d94f03fb1f577e0cef..2a9c0d9a39cc97e7d21774d94f03fb1f577e0cef
mode 000000,100644..100644
--- /dev/null
--- 2/patches/37-gnu-hurd.patch
+++ b/debian/patches/37-gnu-hurd.patch

diff --cc debian/patches/series
index 0000000000000000000000000000000000000000,efed74217a930281cbe0041d2b9268dfbd93bb03..efed74217a930281cbe0041d2b9268dfbd93bb03
mode 000000,100644..100644
--- /dev/null
--- 2/patches/series
+++ b/debian/patches/series

diff --cc debian/po/POTFILES.in
index 0000000000000000000000000000000000000000,cef83a3407df50c2213b6febd8062ee54c13051b..cef83a3407df50c2213b6febd8062ee54c13051b
mode 000000,100644..100644
--- /dev/null
--- 2/po/POTFILES.in
+++ b/debian/po/POTFILES.in

diff --cc debian/po/bg.po
index 0000000000000000000000000000000000000000,10f3a0ac0dce3546708cc4a843e0f0ea2cdecf63..10f3a0ac0dce3546708cc4a843e0f0ea2cdecf63
mode 000000,100644..100644
--- /dev/null
--- 2/po/bg.po
+++ b/debian/po/bg.po

diff --cc debian/po/cs.po
index 0000000000000000000000000000000000000000,dd5acb086dc4377d0d42ad20a9d5cd95eae44f29..dd5acb086dc4377d0d42ad20a9d5cd95eae44f29
mode 000000,100644..100644
--- /dev/null
--- 2/po/cs.po
+++ b/debian/po/cs.po

diff --cc debian/po/de.po
index 0000000000000000000000000000000000000000,ce66aaf88578eb188930a073aa8cfabcdf61bd86..ce66aaf88578eb188930a073aa8cfabcdf61bd86
mode 000000,100644..100644
--- /dev/null
--- 2/po/de.po
+++ b/debian/po/de.po

diff --cc debian/po/es.po
index 0000000000000000000000000000000000000000,59dd28304c1367c6ddd2919503eb05dee01a059f..59dd28304c1367c6ddd2919503eb05dee01a059f
mode 000000,100644..100644
--- /dev/null
--- 2/po/es.po
+++ b/debian/po/es.po

diff --cc debian/po/eu.po
index 0000000000000000000000000000000000000000,9b6907bee30e1694b9e041f88aa1f46450935d45..9b6907bee30e1694b9e041f88aa1f46450935d45
mode 000000,100644..100644
--- /dev/null
--- 2/po/eu.po
+++ b/debian/po/eu.po

diff --cc debian/po/fi.po
index 0000000000000000000000000000000000000000,f80fab469590acc43040f61b67b6b2a3d9da74cd..f80fab469590acc43040f61b67b6b2a3d9da74cd
mode 000000,100644..100644
--- /dev/null
--- 2/po/fi.po
+++ b/debian/po/fi.po

diff --cc debian/po/fr.po
index 0000000000000000000000000000000000000000,d0870c443dea547f9d520484e69f88086687036b..d0870c443dea547f9d520484e69f88086687036b
mode 000000,100644..100644
--- /dev/null
--- 2/po/fr.po
+++ b/debian/po/fr.po

diff --cc debian/po/ja.po
index 0000000000000000000000000000000000000000,e47c34e988331c907fbf328b9395287c4a04bd8b..e47c34e988331c907fbf328b9395287c4a04bd8b
mode 000000,100644..100644
--- /dev/null
--- 2/po/ja.po
+++ b/debian/po/ja.po

diff --cc debian/po/pt.po
index 0000000000000000000000000000000000000000,ba798e0d17822947d79709f77028d4c36e1ea5e7..ba798e0d17822947d79709f77028d4c36e1ea5e7
mode 000000,100644..100644
--- /dev/null
--- 2/po/pt.po
+++ b/debian/po/pt.po

diff --cc debian/po/ru.po
index 0000000000000000000000000000000000000000,26ea16751b062fb292f03e91fd0b80564d877e91..26ea16751b062fb292f03e91fd0b80564d877e91
mode 000000,100644..100644
--- /dev/null
--- 2/po/ru.po
+++ b/debian/po/ru.po

diff --cc debian/po/sv.po
index 0000000000000000000000000000000000000000,f549c216a490cca38dc211a3aa8ea4b9dcb356b5..f549c216a490cca38dc211a3aa8ea4b9dcb356b5
mode 000000,100644..100644
--- /dev/null
--- 2/po/sv.po
+++ b/debian/po/sv.po

diff --cc debian/po/templates.pot
index 0000000000000000000000000000000000000000,565f37ce46c50b6cddbdf461925c3739a1fd7d4c..565f37ce46c50b6cddbdf461925c3739a1fd7d4c
mode 000000,100644..100644
--- /dev/null
--- 2/po/templates.pot
+++ b/debian/po/templates.pot

diff --cc debian/postinst
index 0000000000000000000000000000000000000000,6a651cab454b9534ddb68246583defd5576fa028..6a651cab454b9534ddb68246583defd5576fa028
mode 000000,100644..100644
--- /dev/null
--- 2/postinst
+++ b/debian/postinst

diff --cc debian/rules
index 0000000000000000000000000000000000000000,90a2ecb3d9728d47973d2c9321aed6f7f84ba17c..90a2ecb3d9728d47973d2c9321aed6f7f84ba17c
mode 000000,100755..100755
--- /dev/null
--- 2/rules
+++ b/debian/rules

diff --cc debian/source/format
index 0000000000000000000000000000000000000000,163aaf8d82b6c54f23c45f32895dbdfdcc27b047..163aaf8d82b6c54f23c45f32895dbdfdcc27b047
mode 000000,100644..100644
--- /dev/null
--- 2/source/format
+++ b/debian/source/format

diff --cc debian/source/options
index 0000000000000000000000000000000000000000,779dbfd0ca3a1ed5f47aa91d63f38ece3bb0632f..779dbfd0ca3a1ed5f47aa91d63f38ece3bb0632f
mode 000000,100644..100644
--- /dev/null
--- 2/source/options
+++ b/debian/source/options

diff --cc debian/templates
index 0000000000000000000000000000000000000000,24ee5ffcda661741475064a6619a46b6a40d10b3..24ee5ffcda661741475064a6619a46b6a40d10b3
mode 000000,100644..100644
--- /dev/null
--- 2/templates
+++ b/debian/templates

diff --cc debian/watch
index 0000000000000000000000000000000000000000,21cd961d605aef4f9fd24f5aa374def5a28f0366..21cd961d605aef4f9fd24f5aa374def5a28f0366
mode 000000,100644..100644
--- /dev/null
--- 2/watch
+++ b/debian/watch