diff -Nru fwknop-2.6.0/debian/changelog fwknop-2.6.0/debian/changelog --- fwknop-2.6.0/debian/changelog 2014-01-13 21:10:47.000000000 +0000 +++ fwknop-2.6.0/debian/changelog 2014-01-18 20:43:08.000000000 +0000 @@ -1,3 +1,12 @@ +fwknop (2.6.0-2) unstable; urgency=low + + * Moved installation of usr.sbin/fwknopd from d.rules to + fwknop-apparmor-profile.install file. (Closes: #735766) + * Added copyright stanza for android files in d.copyright + (Closes: #735668). + + -- Franck Joncourt Sat, 18 Jan 2014 21:42:00 +0100 + fwknop (2.6.0-1) unstable; urgency=low * Imported Upstream version 2.6.0 diff -Nru fwknop-2.6.0/debian/copyright fwknop-2.6.0/debian/copyright --- fwknop-2.6.0/debian/copyright 2014-01-13 21:10:47.000000000 +0000 +++ fwknop-2.6.0/debian/copyright 2014-01-18 20:43:08.000000000 +0000 @@ -5,7 +5,8 @@ Source: http://trac.cipherdyne.org/trac/fwknop/ Files: * -Copyright: 2008-2010, Damien Stuart (dstuart@dstuart.org) +Copyright: 2008-2014, Damien Stuart (dstuart@dstuart.org), + 2008-2014 Michael Rash License: GPL-2+ Files: lib/base64.c @@ -43,8 +44,12 @@ Copyright: 1987-2002, Free Software Foundation, Inc. License: LGPL-2.1 +Files: android/* +Copyright: Max Kastanas +License: GPL-3 + Files: debian/* -Copyright: 2008-2012, by Franck Joncourt +Copyright: 2008-2014, by Franck Joncourt License: GPL-2+ Debian packaging is licensed under the same terms as the software itself (see above). @@ -99,3 +104,20 @@ . On Debian systems, the complete text of the Artistic License can be found in `/usr/share/common-licenses/Artistic'. + +Licence: GPL-3 + This library 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 3 of the License, or (at your + option) any later version. + . + This library 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 library; if not, write to the + Free Software Foundation, Inc.. + . + See /usr/share/common-licenses/GPL-3 on your debian system. diff -Nru fwknop-2.6.0/debian/fwknop-apparmor-profile.install fwknop-2.6.0/debian/fwknop-apparmor-profile.install --- fwknop-2.6.0/debian/fwknop-apparmor-profile.install 1970-01-01 00:00:00.000000000 +0000 +++ fwknop-2.6.0/debian/fwknop-apparmor-profile.install 2014-01-18 20:43:08.000000000 +0000 @@ -0,0 +1 @@ +extras/apparmor/usr.sbin.fwknopd /etc/apparmor.d diff -Nru fwknop-2.6.0/debian/rules fwknop-2.6.0/debian/rules --- fwknop-2.6.0/debian/rules 2014-01-13 21:10:47.000000000 +0000 +++ fwknop-2.6.0/debian/rules 2014-01-18 20:43:08.000000000 +0000 @@ -18,7 +18,6 @@ TMP_LIBFKOPERL = $(CURDIR)/debian/libfko-perl TMP_LIBFKOPYTHON = $(CURDIR)/debian/libfko-python -TMP_APPARMOR = $(CURDIR)/debian/fwknop-apparmor-profile LIB_LIBFKODEV = usr/lib/$(DEB_HOST_MULTIARCH) @@ -44,7 +43,6 @@ override_dh_auto_install: dh_auto_install - cp extras/apparmor/usr.sbin.fwknopd $(TMP_APPARMOR)//etc/apparmor.d/usr.sbin.fwknopd cd perl/FKO && $(MAKE) install DESTDIR=$(TMP_LIBFKOPERL) PREFIX=/usr chrpath -d $(TMP_LIBFKOPERL)/usr/lib/perl5/auto/FKO/FKO.so cd python && python setup.py install --root=$(TMP_LIBFKOPYTHON) --install-layout=deb