Update debian packaging

6 files changed, 65 insertions, 25 deletions

diff --git a/debian/clean b/debian/clean
new file mode 100644
index 0000000..50b22e2
--- /dev/null
+++ b/debian/clean
@@ -0,0 +1,2 @@
+config.log
+lex.yy.c
diff --git a/debian/conntrack.examples b/debian/conntrack.examples
new file mode 100644
index 0000000..dc8cddb
--- /dev/null
+++ b/debian/conntrack.examples
@@ -0,0 +1 @@
+doc/cli
diff --git a/debian/conntrackd.examples b/debian/conntrackd.examples
new file mode 100644
index 0000000..8161d36
--- /dev/null
+++ b/debian/conntrackd.examples
@@ -0,0 +1,2 @@
+doc/stats
+doc/sync
diff --git a/debian/conntrackd.logrotate b/debian/conntrackd.logrotate
index f8b88fd..d1b0164 100644
--- a/debian/conntrackd.logrotate
+++ b/debian/conntrackd.logrotate
@@ -4,6 +4,6 @@
     missingok
 
     postrotate
-        /etc/init.d/conntrackd restart
-    endscript
+        invoke-rc.d conntrackd restart > /dev/null
+    endscript 
 }
diff --git a/debian/control b/debian/control
index 347e6c1..5f468e7 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,10 @@ Section: net
 Priority: optional
 Maintainer: VyOS Package Maintainers <maintainers@vyos.net>
 Homepage: http://conntrack-tools.netfilter.org/
-Build-Depends: debhelper (>= 5), libnfnetlink-dev (>= 1.0.0),
- libnetfilter-conntrack-dev (>= 0.0.101), bison, flex
+Build-Depends: debhelper (>= 5), libnfnetlink-dev (>= 1.0.1),
+ libnetfilter-conntrack-dev (>= 1.0.1), libmnl-dev (>= 1.0.1),
+ libnetfilter-cthelper0-dev, libnetfilter-cttimeout-dev (>= 1.0.0),
+ libnetfilter-queue-dev (>= 1.0.2), bison, flex, autotools-dev
 Standards-Version: 3.8.4
 
 Package: conntrack
@@ -26,12 +28,16 @@ Description: Connection tracking daemon
 Package: nfct
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Build-Depends: libnetfilter_cttimeout (>= 0.0.1), 
-Description: nfct library
- nfct library 
-
+Build-Depends: libnetfilter-cttimeout-dev (>= 1.0.0), 
+Description: Tool to interact with the connection tracking system
+ nfct is the command line tool that allows you to manipulate the Netfilter's
+ Connection Tracking System.
+ .
+ By now, the supported subsystem is timeout.
+ 
 Package: conntrack-helpers
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: conntrack-helpers
- conntrack-helpers 
+Description: Conntrack tracking helpers
+ Conntrack tracking helper modules to assist the firewall in tracking FTP,
+ RPC and TNS protocols.
diff --git a/debian/copyright b/debian/copyright
index 5ab105b..d737cdd 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,21 +1,50 @@
-This package was debianized by Max Kellermann <max@duempel.org> on
-Thu Sep 21 00:09:44 CEST 2006
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: conntrack-tools
+Upstream-Contact: Pablo Neira Ayuso <pablo@netfilter.org>
+Source: http://conntrack-tools.netfilter.org/downloads.html
 
-It was downloaded from http://conntrack-tools.netfilter.org/downloads.html
+Files: *
+Copyright: 2005-2012 Pablo Neira Ayuso <pablo@netfilter.org>
+	   Harald Welte <laforge@netfilter.org>
+License: GPL-2+
 
-Upstream Authors:
-Pablo Neira Ayuso <pablo@netfilter.org>
-Harald Welte <laforge@netfilter.org>
+Files: src/cache.c src/cache-ct.c src/cache-exp.c src/external_cache.c src/external_inject.c src/internal_bypass.c src/internal_cache.c src/main.c src/netlink.c src/network.c src/parse.c src/run.c src/stats-mode.c src/sync-alarm.c src/sync-ftfw.c src/sync-mode.c src/sync-notrack.c
+Copyright: 2006-2011 Pablo Neira Ayuso <pablo@netfilter.org>
+	   2011 Vyatta Inc. <http://www.vyatta.com>
+License: GPL-2+
 
-Copyright:
+Files: src/filter.c
+Copyright: 2006-2012 Pablo Neira Ayuso <pablo@netfilter.org>
+	   2011-2012 Vyatta Inc <http://www.vyatta.com>
+License: GPL-2+
 
-(C) 2005 by Pablo Neira Ayuso <pablo@netfilter.org>
-<laforge@netfilter.org>
+Files: src/rbtree.c
+Copyright: 1999 Andrea Arcangeli <andrea@suse.de>
+	   2002  David Woodhouse <dwmw2@infradead.org>
+License: GPL-2+
 
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or (at
- your option) any later version.
+Files: src/utils.c
+Copyright: Alan Cox, Andi Kleen, USAGI/WIDE Project, Alexey Kuznetsov <kuznet@ms2.inr.ac.ru> and others
+License: GPL-2+
+
+Files: src/conntrack.c
+Copyright: (C) 2005-2012 by Pablo Neira Ayuso <pablo@netfilter.org>
+	   (C) 2012 by Intra2net AG <http://www.intra2net.com>
+License: GPL-2+
 
-On Debian GNU/Linux systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL'.
+License: GPL-2+
+ This package is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+ .
+ This package 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 General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".