Merge remote-tracking branch 'dottedmag/debian' into rspamd-0.6

Conflicts:
	debian/copyright
	debian/watch

Conflicts:

	debian/changelog

7 files changed, 123 insertions, 292 deletions

diff --git a/debian/changelog b/debian/changelog
index 68db3fa44..d2d65ea96 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,126 +1,5 @@
-rspamd (0.6.8-1) unstable; urgency=low
+rspamd (0.6.8) UNRELEASED; urgency=low
 
-  * Upgrade to 0.6.8
+  * Initial release (Closes: #683746)
 
- -- Vsevolod Stakhov <vsevolod@highsecure.ru>  Mon, 17 Feb 2013 14:50:00 +0000
-
-rspamd (0.6.7-1) unstable; urgency=low
-
-  * Upgrade to 0.6.7
-
- -- Vsevolod Stakhov <vsevolod@highsecure.ru>  Fri, 10 Jan 2013 17:07:00 +0000
-
-rspamd (0.6.6-1) unstable; urgency=low
-
-  * Upgrade to 0.6.6
-
- -- Vsevolod Stakhov <vsevolod@highsecure.ru>  Fri, 27 Dec 2013 14:55:00 +0000
-
-rspamd (0.6.5-1) unstable; urgency=low
-
-  * Upgrade to 0.6.5
-
- -- Vsevolod Stakhov <vsevolod@highsecure.ru>  Wed, 20 Dec 2013 15:50:00 +0000
-
-rspamd (0.6.4-1) unstable; urgency=low
-
-  * Upgrade to 0.6.4
-
- -- Vsevolod Stakhov <vsevolod@highsecure.ru>  Wed, 18 Dec 2013 15:24:00 +0000
-
-rspamd (0.6.3-1) unstable; urgency=low
-
-  * Upgrade to 0.6.3
-
- -- Vsevolod Stakhov <vsevolod@highsecure.ru>  Tue, 10 Dec 2013 19:17:00 +0000
-
-rspamd (0.6.2-1) unstable; urgency=low
-
-  * Upgrade to 0.6.2
-
- -- Vsevolod Stakhov <vsevolod@highsecure.ru>  Wed, 4 Dec 2013 16:43:00 +0000
-
-rspamd (0.6.1-1) unstable; urgency=low
-
-  * Upgrade to 0.6.1
-
- -- Vsevolod Stakhov <vsevolod@highsecure.ru>  Mon, 2 Dec 2013 14:43:00 +0000
-
-rspamd (0.6.0-1) unstable; urgency=low
-
-  * Upgrade to 0.6.0
-
- -- Vsevolod Stakhov <vsevolod@highsecure.ru>  Tue, 19 Nov 2013 16:35:00 +0000
-
-rspamd (0.5.6-1) unstable; urgency=low
-
-  * Upgrade to 0.5.6
-
- -- Vsevolod Stakhov <vsevolod@highsecure.ru>  Mon, 10 Jun 2013 13:27:00 +0000
-
-rspamd (0.5.5-1) unstable; urgency=low
-
-  * Upgrade to 0.5.5
-
- -- Vsevolod Stakhov <vsevolod@highsecure.ru>  Fri, 23 May 2013 20:31:00 +0000
-
-rspamd (0.5.4-1) unstable; urgency=low
-
-  * Upgrade to 0.5.4
-  * Use specific user instead of nobody
- 
- -- Vsevolod Stakhov <vsevolod@highsecure.ru>  Sat, 02 Feb 2013 15:50:00 +0000
-
-rspamd (0.5.3-1) unstable; urgency=low
-
-  * Upgrade to 0.5.3
- 
- -- Vsevolod Stakhov <vsevolod@highsecure.ru>  Thu, 21 Nov 2012 16:57:00 +0400
-
-rspamd (0.5.2-1) unstable; urgency=low
-
-  * Upgrade to 0.5.2
- 
- -- Vsevolod Stakhov <vsevolod@highsecure.ru>  Thu, 23 Aug 2012 18:07:00 +0400
-
-rspamd (0.5.1-1) unstable; urgency=low
-
-  * Upgrade to 0.5.1
- 
- -- Vsevolod Stakhov <vsevolod@highsecure.ru>  Mon, 6 Aug 2012 21:28:00 +0400
-
-rspamd (0.5.0-1) unstable; urgency=low
-
-  * Upgrade to 0.5.0
- 
- -- Vsevolod Stakhov <vsevolod@highsecure.ru>  Sat, 9 Jun 2012 15:59:00 +0400
-
-rspamd (0.4.7-1) unstable; urgency=low
-
-  * Upgrade to 0.4.7
-
- -- Vsevolod Stakhov <vsevolod@highsecure.ru>  Fri, 17 Feb 2012 21:06:01 +0400
-
-rspamd (0.4.6-1) unstable; urgency=low
-
-  * Upgrade to 0.4.6
-
- -- Vsevolod Stakhov <vsevolod@highsecure.ru>  Tue, 20 Dec 2011 17:21:33 +0400
-
-rspamd (0.4.5-1) unstable; urgency=low
-
-  * Upgrade to 0.4.5
-
- -- Vsevolod Stakhov <vsevolod@highsecure.ru>  Mon, 21 Nov 2011 17:04:33 +0400
-
-rspamd (0.4.4-1) unstable; urgency=low
-
-  * Upgrade to 0.4.4
-
- -- Vsevolod Stakhov <vsevolod@highsecure.ru>  Tue, 15 Nov 2011 17:54:33 +0400
-
-rspamd (0.4.3-1) unstable; urgency=low
-
-  * Initial release. (Closes: Bug#683746)
-
- -- Vsevolod Stakhov <vsevolod@highsecure.ru>  Tue, 16 Aug 2011 17:54:33 +0400
+ -- Mikhail Gusarov <dottedmag@debian.org>  Mon, 17 Feb 2014 23:24:39 +0100
diff --git a/debian/control b/debian/control
index 83fc351d8..fb19f55ff 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,7 @@
 Source: rspamd
 Section: mail
 Priority: optional
-Maintainer: Vsevolod Stakhov <vsevolod@highsecure.ru>
+Maintainer: Mikhail Gusarov <dottedmag@debian.org>
 Build-Depends: debhelper (>= 7.0.50~), dpkg-dev (>= 1.16.1~), cmake, libevent-dev (>= 1.3), libglib2.0-dev (>= 2.16.0), libgmime-2.6-dev, liblua5.2-dev | liblua5.1-dev | liblua5.1-0-dev, libpcre3-dev, cdbs, libssl-dev (>= 1.0), libcurl4-openssl-dev
 Standards-Version: 3.9.5
 Homepage: https://rspamd.com
diff --git a/debian/copyright b/debian/copyright
index 8bfdf7826..2444ed3f1 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -7,89 +7,60 @@ Copyright: 1999, 2000  Scott Wimer,
            2004        Matthias Clasen <mclasen@redhat.com>,
            2005 - 2007 Marco Barisione <marco@barisione.org>
 License: LGPL-2+
- This program is free software; you can redistribute it
- and/or modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later
- version.
- .
- This program is distributed in the hope that it will be
- useful, but WITHOUT ANY WARRANTY; without even the implied
- warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE.  See the GNU Library General Public License for more
- details.
- .
- You should have received a copy of the GNU Library General Public
- License along with this package; if not, write to the Free
- Software Foundation, Inc., 51 Franklin St, Fifth Floor,
- Boston, MA  02110-1301 USA
- .
- On Debian systems, the full text of the GNU Library General Public
- License version 2 can be found in the file
- `/usr/share/common-licenses/LGPL-2'.
 
 Files: contrib/hiredis/*
 Copyright: 2009 - 2011 Salvatore Sanfilippo <antirez at gmail dot com>
            2010 - 2011 Pieter Noordhuis <pcnoordhuis at gmail dot com>
-License: BSD-3-CLAUSE
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are met:
- .
- Redistributions of source code must retain the above copyright notice,
- this list of conditions and the following disclaimer.
- .
- Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
- .
- Neither the name of Redis nor the names of its contributors may be used
- to endorse or promote products derived from this software without specific
- prior written permission.
- .
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+License: BSD-3-clause-Redis
 
 Files: compat/queue.h
 Copyright: 1991, 1993 The Regents of the University of California.
-License: BSD-3-CLAUSE
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
- .
- Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
- .
- Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
- . 
- Neither the name of the University nor the names of its contributors
- may be used to endorse or promote products derived from this software
- without specific prior written permission.
- .
- THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- SUCH DAMAGE.
+License: BSD-3-clause-RotUoC
 
 Files: contrib/uthash/*
 Copyright: 2003-2013 Troy D. Hanson http://troydhanson.github.com/uthash/
-License: BSD-2-CLAUSE
+License: BSD-1-clause
+
+Files: src/json/*
+Copyright: 2009 Petri Lehtinen <petri@digip.org>
+License: Expat
+
+Files: conf/lua/regexp/*
+Copyright: 2000-2012 The Apache Software Foundation
+License: Apache 2.0
+
+Files: src/json/*
+Copyright: 2009 Petri Lehtinen <petri@digip.org>
+License: Expat
+
+Files: contrib/http-parser/*
+Copyright: 2002-2014 Igor Sysoev 
+           Joyent, Inc. and other Node contributors
+License: MIT
+
+Files: contrib/libottery/*
+Copyright: Nick Mathewson
+License: CC0
+
+Files: src/ucl/src/xxhash.*
+Copyright: 2012-2013, Yann Collet.
+License: BSD-2-Clause
+
+Files: src/diff.c
+Copyright: 2004 Michael B. Allen <mba2000 ioplex.com>
+           2010-2014 Vsevolod Stakhov <vsevolod@highsecure.ru>
+License: MIT
+
+Files: *
+Copyright: 2008-2013 Vsevolod Stakhov <vsevolod@highsecure.ru>
+License: BSD-2-clause
+
+Files: debian/*
+Copyright: 2011-2012 Vsevolod Stakhov <vsevolod@highsecure.ru>
+ 2014 Mikhail Gusarov <dottedmag@dottedmag.net>
+License: BSD-2-clause
+
+License: BSD-1-clause
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions
  are met:
@@ -109,36 +80,7 @@ License: BSD-2-CLAUSE
  OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  SUCH DAMAGE.
 
-Files: src/json/*
-Copyright: 2009 Petri Lehtinen <petri@digip.org>
-License: Expat
- Permission is hereby granted, free of charge, to any person obtaining a copy
- of this software and associated documentation files (the "Software"), to deal
- in the Software without restriction, including without limitation the rights to
- use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
- of the Software, and to permit persons to whom the Software is furnished to do
- so, subject to the following conditions:
- . 
- The above copyright notice and this permission notice shall be included in
- all copies or substantial portions of the Software.
- . 
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- SOFTWARE.
-
-Files: conf/lua/regexp/*
-Copyright: 2000-2012 The Apache Software Foundation
-License: Apache 2.0
- On Debian GNU/Linux system you can find the complete text of the
- Apache-2.0 license in `/usr/share/common-licenses/Apache-2.0'
-
-Files: *
-Copyright: 2008-2014 Vsevolod Stakhov <vsevolod@highsecure.ru>
-License: BSD-2-Clause
+License: BSD-2-clause
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions are met:
  .
@@ -161,23 +103,26 @@ License: BSD-2-Clause
  OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  SUCH DAMAGE.
 
-Files: debian/*
-Copyright: 2011-2014 Vsevolod Stakhov <vsevolod@highsecure.ru>
-License: BSD-2-Clause
+License: BSD-3-clause-RotUoC
  Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are met:
+ modification, are permitted provided that the following conditions
+ are met:
  .
- Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
+ Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
  .
- Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
+ Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+ .
+ Neither the name of the University nor the names of its contributors
+ may be used to endorse or promote products derived from this software
+ without specific prior written permission.
  .
  THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
@@ -186,22 +131,39 @@ License: BSD-2-Clause
  OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  SUCH DAMAGE.
 
-Files: contrib/http-parser/*
-Copyright: 2002-2014 Igor Sysoev 
-           Joyent, Inc. and other Node contributors
-License: MIT
- http_parser.c is based on src/http/ngx_http_parse.c from NGINX copyright
- Igor Sysoev.
+License: BSD-3-clause-Redis
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
  .
- Additional changes are licensed under the same terms as NGINX and
- copyright Joyent, Inc. and other Node contributors. All rights reserved.
+ Redistributions of source code must retain the above copyright notice,
+ this list of conditions and the following disclaimer.
+ .
+ Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following disclaimer in the documentation
+ and/or other materials provided with the distribution.
+ .
+ Neither the name of Redis nor the names of its contributors may be used
+ to endorse or promote products derived from this software without specific
+ prior written permission.
  .
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+License: Expat
  Permission is hereby granted, free of charge, to any person obtaining a copy
- of this software and associated documentation files (the "Software"), to
- deal in the Software without restriction, including without limitation the
- rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
- sell copies of the Software, and to permit persons to whom the Software is
- furnished to do so, subject to the following conditions:
+ of this software and associated documentation files (the "Software"), to deal
+ in the Software without restriction, including without limitation the rights to
+ use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+ of the Software, and to permit persons to whom the Software is furnished to do
+ so, subject to the following conditions:
  .
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
@@ -210,12 +172,36 @@ License: MIT
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
- IN THE SOFTWARE.
- 
-Files: contrib/libottery/*
-Copyright: Nick Mathewson
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ SOFTWARE.
+
+License: LGPL-2+
+ This program is free software; you can redistribute it
+ and/or modify it under the terms of the GNU Library General Public
+ License as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later
+ version.
+ .
+ This program is distributed in the hope that it will be
+ useful, but WITHOUT ANY WARRANTY; without even the implied
+ warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ PURPOSE.  See the GNU Library General Public License for more
+ details.
+ .
+ You should have received a copy of the GNU Library General Public
+ License along with this package; if not, write to the Free
+ Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ Boston, MA  02110-1301 USA
+ .
+ On Debian systems, the full text of the GNU Library General Public
+ License version 2 can be found in the file
+ `/usr/share/common-licenses/LGPL-2'.
+
+License: Apache 2.0
+ On Debian GNU/Linux system you can find the complete text of the
+ Apache-2.0 license in `/usr/share/common-licenses/Apache-2.0'
+
 License: CC0
  This software has been dedicated to the public domain under the CC0
  public domain dedication.
@@ -228,36 +214,6 @@ License: CC0
  work in doc/cc0.txt.  If not, see
  <http://creativecommons.org/publicdomain/zero/1.0/>.
 
-Files: src/ucl/src/xxhash.*
-Copyright: 2012-2013, Yann Collet.
-License: BSD-2-Clause
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are
- met:
- .
- Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
- .
- Redistributions in binary form must reproduce the above
- copyright notice, this list of conditions and the following disclaimer
- in the documentation and/or other materials provided with the
- distribution.
- .
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- 
-Files: src/diff.c
-Copyright: 2004 Michael B. Allen <mba2000 ioplex.com>
-           2010-2014 Vsevolod Stakhov <vsevolod@highsecure.ru>
 License: MIT
  Permission is hereby granted, free of charge, to any person obtaining a
  copy of this software and associated documentation files (the "Software"),
diff --git a/debian/rspamd-doc.docs b/debian/rspamd-doc.docs
deleted file mode 100644
index d4f454258..000000000
--- a/debian/rspamd-doc.docs
+++ /dev/null
@@ -1 +0,0 @@
-#DOCS#
diff --git a/debian/rspamd-doc.install b/debian/rspamd-doc.install
deleted file mode 100644
index d4f454258..000000000
--- a/debian/rspamd-doc.install
+++ /dev/null
@@ -1 +0,0 @@
-#DOCS#
diff --git a/debian/source/format b/debian/source/format
index 163aaf8d8..89ae9db8f 100644
--- a/debian/source/format
+++ b/debian/source/format
@@ -1 +1 @@
-3.0 (quilt)
+3.0 (native)
diff --git a/debian/watch b/debian/watch
deleted file mode 100644
index e65154095..000000000
--- a/debian/watch
+++ /dev/null
@@ -1,2 +0,0 @@
-version=3
-https://rspamd.com/downloads  .+rspamd-(\d+[\d\.]*).tar.gz