From: Simon Schubert <2@0x2c.org> Date: Thu, 28 Oct 2010 14:23:48 +0000 (+0200) Subject: Merge branch 'master' of git://gitorious.org/dma-roam/pkg-debian X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=69aa3b24b7413078a6120b3dc26c7a952a0d2b4c;p=people%2Fms%2Fdma.git Merge branch 'master' of git://gitorious.org/dma-roam/pkg-debian --- 69aa3b24b7413078a6120b3dc26c7a952a0d2b4c diff --cc debian/NEWS index 0000000,36ed11a..36ed11a mode 000000,100644..100644 --- a/debian/NEWS +++ b/debian/NEWS diff --cc debian/README.Debian index 0000000,7031cdb..7031cdb mode 000000,100644..100644 --- a/debian/README.Debian +++ b/debian/README.Debian diff --cc debian/changelog index 0000000,adbf56d..adbf56d mode 000000,100644..100644 --- a/debian/changelog +++ b/debian/changelog diff --cc debian/compat index 0000000,7f8f011..7f8f011 mode 000000,100644..100644 --- a/debian/compat +++ b/debian/compat diff --cc debian/config index 0000000,e352fe4..e352fe4 mode 000000,100755..100755 --- a/debian/config +++ b/debian/config diff --cc debian/control index 0000000,73b0f3d..73b0f3d mode 000000,100644..100644 --- a/debian/control +++ b/debian/control diff --cc debian/copyright index 0000000,4ad8fbb..4ad8fbb mode 000000,100644..100644 --- a/debian/copyright +++ b/debian/copyright diff --cc debian/dbounce-simple-safecat index 0000000,6c072c1..6c072c1 mode 000000,100644..100644 --- a/debian/dbounce-simple-safecat +++ b/debian/dbounce-simple-safecat diff --cc debian/dbounce-simple-safecat.1 index 0000000,6f8e5f7..6f8e5f7 mode 000000,100644..100644 --- a/debian/dbounce-simple-safecat.1 +++ b/debian/dbounce-simple-safecat.1 diff --cc debian/dma-migrate.dirs index 0000000,b174b44..b174b44 mode 000000,100644..100644 --- a/debian/dma-migrate.dirs +++ b/debian/dma-migrate.dirs diff --cc debian/dma-migrate.install index 0000000,1c35b0a..1c35b0a mode 000000,100644..100644 --- a/debian/dma-migrate.install +++ b/debian/dma-migrate.install diff --cc debian/dma-migrate.manpages index 0000000,3629dbe..3629dbe mode 000000,100644..100644 --- a/debian/dma-migrate.manpages +++ b/debian/dma-migrate.manpages diff --cc debian/dma.cron.d index 0000000,ad4f059..ad4f059 mode 000000,100644..100644 --- a/debian/dma.cron.d +++ b/debian/dma.cron.d diff --cc debian/dma.dirs index 0000000,f10c005..f10c005 mode 000000,100644..100644 --- a/debian/dma.dirs +++ b/debian/dma.dirs diff --cc debian/dma.install index 0000000,a1199a7..a1199a7 mode 000000,100644..100644 --- a/debian/dma.install +++ b/debian/dma.install diff --cc debian/dma.links index 0000000,d9ac22a..d9ac22a mode 000000,100644..100644 --- a/debian/dma.links +++ b/debian/dma.links diff --cc debian/dma.lintian-overrides index 0000000,fbf2e1d..fbf2e1d mode 000000,100644..100644 --- a/debian/dma.lintian-overrides +++ b/debian/dma.lintian-overrides diff --cc debian/migrate/Makefile index 0000000,cc7d347..cc7d347 mode 000000,100644..100644 --- a/debian/migrate/Makefile +++ b/debian/migrate/Makefile diff --cc debian/migrate/NEWS index 0000000,29dca0d..29dca0d mode 000000,100644..100644 --- a/debian/migrate/NEWS +++ b/debian/migrate/NEWS diff --cc debian/migrate/dma-migrate.8 index 0000000,e40acef..e40acef mode 000000,100644..100644 --- a/debian/migrate/dma-migrate.8 +++ b/debian/migrate/dma-migrate.8 diff --cc debian/migrate/dma-migrate.c index 0000000,56bfa2a..56bfa2a mode 000000,100644..100644 --- a/debian/migrate/dma-migrate.c +++ b/debian/migrate/dma-migrate.c diff --cc debian/patches/03-debian-locations.patch index 0000000,60f68d7..60f68d7 mode 000000,100644..100644 --- a/debian/patches/03-debian-locations.patch +++ b/debian/patches/03-debian-locations.patch diff --cc debian/patches/04-debian-setgid.patch index 0000000,5ffd6f3..5ffd6f3 mode 000000,100644..100644 --- a/debian/patches/04-debian-setgid.patch +++ b/debian/patches/04-debian-setgid.patch diff --cc debian/patches/09-typos.patch index 0000000,885b995..885b995 mode 000000,100644..100644 --- a/debian/patches/09-typos.patch +++ b/debian/patches/09-typos.patch diff --cc debian/patches/10-liblockfile.patch index 0000000,e9542a3..e9542a3 mode 000000,100644..100644 --- a/debian/patches/10-liblockfile.patch +++ b/debian/patches/10-liblockfile.patch diff --cc debian/patches/11-double-bounce.patch index 0000000,c95f979..c95f979 mode 000000,100644..100644 --- a/debian/patches/11-double-bounce.patch +++ b/debian/patches/11-double-bounce.patch diff --cc debian/patches/13-hardening.patch index 0000000,f7a7bbb..f7a7bbb mode 000000,100644..100644 --- a/debian/patches/13-hardening.patch +++ b/debian/patches/13-hardening.patch diff --cc debian/patches/17-mailname.patch index 0000000,6326134..6326134 mode 000000,100644..100644 --- a/debian/patches/17-mailname.patch +++ b/debian/patches/17-mailname.patch diff --cc debian/patches/20-parse-recipient.patch index 0000000,b678729..b678729 mode 000000,100644..100644 --- a/debian/patches/20-parse-recipient.patch +++ b/debian/patches/20-parse-recipient.patch diff --cc debian/patches/23-dirent-d_type.patch index 0000000,379765a..379765a mode 000000,100644..100644 --- a/debian/patches/23-dirent-d_type.patch +++ b/debian/patches/23-dirent-d_type.patch diff --cc debian/patches/24-random-message-id.patch index 0000000,1b89920..1b89920 mode 000000,100644..100644 --- a/debian/patches/24-random-message-id.patch +++ b/debian/patches/24-random-message-id.patch diff --cc debian/patches/25-unsupported-starttls.patch index 0000000,cb34484..cb34484 mode 000000,100644..100644 --- a/debian/patches/25-unsupported-starttls.patch +++ b/debian/patches/25-unsupported-starttls.patch diff --cc debian/patches/27-int-size.patch index 0000000,6ac3cd0..6ac3cd0 mode 000000,100644..100644 --- a/debian/patches/27-int-size.patch +++ b/debian/patches/27-int-size.patch diff --cc debian/patches/28-valid-recipient.patch index 0000000,5fc700b..5fc700b mode 000000,100644..100644 --- a/debian/patches/28-valid-recipient.patch +++ b/debian/patches/28-valid-recipient.patch diff --cc debian/patches/29-double-free.patch index 0000000,cccd502..cccd502 mode 000000,100644..100644 --- a/debian/patches/29-double-free.patch +++ b/debian/patches/29-double-free.patch diff --cc debian/patches/30-ldflags.patch index 0000000,3fc20f2..3fc20f2 mode 000000,100644..100644 --- a/debian/patches/30-ldflags.patch +++ b/debian/patches/30-ldflags.patch diff --cc debian/patches/31-sigalrm-backoff.patch index 0000000,1e47e91..1e47e91 mode 000000,100644..100644 --- a/debian/patches/31-sigalrm-backoff.patch +++ b/debian/patches/31-sigalrm-backoff.patch diff --cc debian/patches/32-comment-uncomment.patch index 0000000,7835ae8..7835ae8 mode 000000,100644..100644 --- a/debian/patches/32-comment-uncomment.patch +++ b/debian/patches/32-comment-uncomment.patch diff --cc debian/patches/33-opportunistic-tls.patch index 0000000,23dccd9..23dccd9 mode 000000,100644..100644 --- a/debian/patches/33-opportunistic-tls.patch +++ b/debian/patches/33-opportunistic-tls.patch diff --cc debian/patches/34-manpage-defaults.patch index 0000000,10be672..10be672 mode 000000,100644..100644 --- a/debian/patches/34-manpage-defaults.patch +++ b/debian/patches/34-manpage-defaults.patch diff --cc debian/patches/35-delivery-retry.patch index 0000000,1fbb459..1fbb459 mode 000000,100644..100644 --- a/debian/patches/35-delivery-retry.patch +++ b/debian/patches/35-delivery-retry.patch diff --cc debian/patches/36-sa_nocldwait.patch index 0000000,4a40fe3..4a40fe3 mode 000000,100644..100644 --- a/debian/patches/36-sa_nocldwait.patch +++ b/debian/patches/36-sa_nocldwait.patch diff --cc debian/patches/37-gnu-hurd.patch index 0000000,2a9c0d9..2a9c0d9 mode 000000,100644..100644 --- a/debian/patches/37-gnu-hurd.patch +++ b/debian/patches/37-gnu-hurd.patch diff --cc debian/patches/series index 0000000,efed742..efed742 mode 000000,100644..100644 --- a/debian/patches/series +++ b/debian/patches/series diff --cc debian/po/POTFILES.in index 0000000,cef83a3..cef83a3 mode 000000,100644..100644 --- a/debian/po/POTFILES.in +++ b/debian/po/POTFILES.in diff --cc debian/po/bg.po index 0000000,10f3a0a..10f3a0a mode 000000,100644..100644 --- a/debian/po/bg.po +++ b/debian/po/bg.po diff --cc debian/po/cs.po index 0000000,dd5acb0..dd5acb0 mode 000000,100644..100644 --- a/debian/po/cs.po +++ b/debian/po/cs.po diff --cc debian/po/de.po index 0000000,ce66aaf..ce66aaf mode 000000,100644..100644 --- a/debian/po/de.po +++ b/debian/po/de.po diff --cc debian/po/es.po index 0000000,59dd283..59dd283 mode 000000,100644..100644 --- a/debian/po/es.po +++ b/debian/po/es.po diff --cc debian/po/eu.po index 0000000,9b6907b..9b6907b mode 000000,100644..100644 --- a/debian/po/eu.po +++ b/debian/po/eu.po diff --cc debian/po/fi.po index 0000000,f80fab4..f80fab4 mode 000000,100644..100644 --- a/debian/po/fi.po +++ b/debian/po/fi.po diff --cc debian/po/fr.po index 0000000,d0870c4..d0870c4 mode 000000,100644..100644 --- a/debian/po/fr.po +++ b/debian/po/fr.po diff --cc debian/po/ja.po index 0000000,e47c34e..e47c34e mode 000000,100644..100644 --- a/debian/po/ja.po +++ b/debian/po/ja.po diff --cc debian/po/pt.po index 0000000,ba798e0..ba798e0 mode 000000,100644..100644 --- a/debian/po/pt.po +++ b/debian/po/pt.po diff --cc debian/po/ru.po index 0000000,26ea167..26ea167 mode 000000,100644..100644 --- a/debian/po/ru.po +++ b/debian/po/ru.po diff --cc debian/po/sv.po index 0000000,f549c21..f549c21 mode 000000,100644..100644 --- a/debian/po/sv.po +++ b/debian/po/sv.po diff --cc debian/po/templates.pot index 0000000,565f37c..565f37c mode 000000,100644..100644 --- a/debian/po/templates.pot +++ b/debian/po/templates.pot diff --cc debian/postinst index 0000000,6a651ca..6a651ca mode 000000,100644..100644 --- a/debian/postinst +++ b/debian/postinst diff --cc debian/rules index 0000000,90a2ecb..90a2ecb mode 000000,100755..100755 --- a/debian/rules +++ b/debian/rules diff --cc debian/source/format index 0000000,163aaf8..163aaf8 mode 000000,100644..100644 --- a/debian/source/format +++ b/debian/source/format diff --cc debian/source/options index 0000000,779dbfd..779dbfd mode 000000,100644..100644 --- a/debian/source/options +++ b/debian/source/options diff --cc debian/templates index 0000000,24ee5ff..24ee5ff mode 000000,100644..100644 --- a/debian/templates +++ b/debian/templates diff --cc debian/watch index 0000000,21cd961..21cd961 mode 000000,100644..100644 --- a/debian/watch +++ b/debian/watch