Index: /trunk/COPYING =================================================================== --- /trunk/COPYING (revision 208) +++ /trunk/COPYING (revision 209) @@ -3,5 +3,5 @@ ------------------------------------------ -Copyright (C) 1999-2004 Rainer Wichmann +Copyright (C) 1999-2009 Rainer Wichmann This program is free software; you can redistribute it and/or modify @@ -17,5 +17,5 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA @@ -101,5 +101,5 @@ * along with the LZO library; see the file COPYING. * If not, write to the Free Software Foundation, Inc., - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * * Markus F.X.J. Oberhumer @@ -125,5 +125,5 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ /* Written by David MacKenzie . */ @@ -152,5 +152,5 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software Foundation, - * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ @@ -169,5 +169,5 @@ * country of residence. * - * Adapted to pike and some cleanup by Niels Möller. + * Adapted to pike and some cleanup by Niels Möller. */ @@ -203,5 +203,5 @@ * You should have received a copy of the GNU Library General Public * License along with this library; if not, write to the Free - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * * The author of this library can be reached at the following address: Index: /trunk/Makefile.in =================================================================== --- /trunk/Makefile.in (revision 208) +++ /trunk/Makefile.in (revision 209) @@ -864,15 +864,13 @@ echo " and how it can be used to check the file integrity of your" >> debian/@install_name@.doc-base; \ echo " server." >> debian/@install_name@.doc-base; \ - echo "Section: admin" >> debian/@install_name@.doc-base; \ + echo "Section: System/Security" >> debian/@install_name@.doc-base; \ echo >> debian/@install_name@.doc-base; \ echo >> debian/@install_name@.doc-base; \ echo "Format: Postscript" >> debian/@install_name@.doc-base; \ - echo "Files: /usr/share/doc/@install_name@/manual.ps.gz" >> debian/@install_name@.doc-base; \ + echo "Files: /usr/share/doc/@install_name@/manual.pdf.gz" >> debian/@install_name@.doc-base; \ echo >> debian/@install_name@.doc-base; \ echo "Format: HTML" >> debian/@install_name@.doc-base; \ echo "Index: /usr/share/doc/@install_name@/manual.html/index.html" >> debian/@install_name@.doc-base; \ echo "Files: /usr/share/doc/@install_name@/manual.html/*.html" >> debian/@install_name@.doc-base; \ - echo @myrpmconffile@ > debian/conffiles; \ - echo /etc/init.d/@install_name@ >> debian/conffiles; \ if test -f /usr/lib/lsb/install_initd; then \ cp init/samhain.startLSB debian/@install_name@.init; \ @@ -888,9 +886,9 @@ echo "Package: @install_name@" >> debian/control; \ echo "Architecture: any" >> debian/control; \ - echo "Depends: \$${shlibs:Depends}" >> debian/control; \ + echo "Depends: libc6" >> debian/control; \ echo "Description: File integrity checker" >> debian/control; \ echo " A file integrity checker" >> debian/control; \ echo "running debuild -us -uc"; \ - debuild -us -uc; \ + debuild -us -uc -b; \ DEBFILE=`find ../ -follow -maxdepth 1 -cnewer ./debian/control 2>/dev/null | grep '@install_name@_$(VERSION)' | grep '\.deb'`; \ if test x"$$DEBFILE" = x; then \ Index: /trunk/configure.ac =================================================================== --- /trunk/configure.ac (revision 208) +++ /trunk/configure.ac (revision 209) @@ -12,5 +12,5 @@ dnl start dnl -AM_INIT_AUTOMAKE(samhain, 2.5.2) +AM_INIT_AUTOMAKE(samhain, 2.5.2a) AC_DEFINE([SAMHAIN], 1, [Application is samhain]) AC_CANONICAL_HOST Index: /trunk/docs/Changelog =================================================================== --- /trunk/docs/Changelog (revision 208) +++ /trunk/docs/Changelog (revision 209) @@ -1,2 +1,5 @@ +2.5.2a (26-01-2009): + * fix problem building deb package (bit rot; reported by joerg) + 2.5.2 (22-01-2009): * samhain.c: report module failure with positive offset Index: /trunk/rules.deb-light.in =================================================================== --- /trunk/rules.deb-light.in (revision 208) +++ /trunk/rules.deb-light.in (revision 209) @@ -12,5 +12,5 @@ # This is the debhelper compatability version to use. -export DH_COMPAT=1 +export DH_COMPAT=4 package=@install_name@ @@ -42,5 +42,6 @@ dh_installdirs - $(MAKE) install-light install-boot DESTDIR=`pwd`/debian/tmp + $(MAKE) install-light install-boot DESTDIR=`pwd`/debian/@install_name@ + # $(MAKE) install-light install-boot DESTDIR=`pwd`/debian/tmp # However, remove the rc.d links @@ -64,24 +65,24 @@ dh_installmenu dh_installinit -- defaults 19 - [ -f debian/postinst.debhelper ] && \ + [ -f debian/@install_name@.postinst.debhelper ] && \ cd debian && \ - cat postinst.debhelper | \ + cat @install_name@.postinst.debhelper | \ sed 's%/etc/init.d/@install_name@ start%:%' > postinst.tmp && \ - mv postinst.tmp postinst.debhelper - [ -f debian/postinst.debhelper ] && \ + mv postinst.tmp @install_name@.postinst.debhelper + [ -f debian/@install_name@.postinst.debhelper ] && \ cd debian && \ - cat postinst.debhelper | \ + cat @install_name@.postinst.debhelper | \ sed 's%invoke-rc.d @install_name@ start%:%' > postinst.tmp && \ - mv postinst.tmp postinst.debhelper - [ -f debian/prerm.debhelper ] && \ + mv postinst.tmp @install_name@.postinst.debhelper + [ -f debian/@install_name@.prerm.debhelper ] && \ cd debian && \ - cat prerm.debhelper | \ + cat @install_name@.prerm.debhelper | \ sed 's%/etc/init.d/@install_name@ stop%/etc/init.d/@install_name@ stop || echo service @install_name@ already stopped%' > prerm.tmp && \ - mv prerm.tmp prerm.debhelper - [ -f debian/prerm.debhelper ] && \ + mv prerm.tmp @install_name@.prerm.debhelper + [ -f debian/@install_name@.prerm.debhelper ] && \ cd debian && \ - cat prerm.debhelper | \ + cat @install_name@.prerm.debhelper | \ sed 's%invoke-rc.d @install_name@ stop%invoke-rc.d @install_name@ stop || echo service @install_name@ already stopped%' > prerm.tmp && \ - mv prerm.tmp prerm.debhelper + mv prerm.tmp @install_name@.prerm.debhelper # dh_installmanpages # dh_installchangelogs @top_srcdir@/docs/Changelog Index: /trunk/rules.deb.in =================================================================== --- /trunk/rules.deb.in (revision 208) +++ /trunk/rules.deb.in (revision 209) @@ -12,5 +12,5 @@ # This is the debhelper compatability version to use. -export DH_COMPAT=1 +export DH_COMPAT=4 package=@install_name@ @@ -48,5 +48,6 @@ # `pwd`/debian/tmp/etc/samhain - $(MAKE) install install-boot DESTDIR=`pwd`/debian/tmp + # $(MAKE) install install-boot DESTDIR=`pwd`/debian/tmp + $(MAKE) install install-boot DESTDIR=`pwd`/debian/@install_name@ # However, remove the rc.d links @@ -70,8 +71,9 @@ dh_installdebconf dh_installdocs - [ -f debian/tmp/usr/share/doc/@install_name@/MANUAL-2_3.html.tar ] && \ - cd debian/tmp/usr/share/doc/@install_name@ && \ + [ -f debian/@install_name@/usr/share/doc/@install_name@/MANUAL-2_3.html.tar ] && \ + cd debian/@install_name@/usr/share/doc/@install_name@ && \ tar xf MANUAL-2_3.html.tar && mv MANUAL-2_3 manual.html && \ - rm -f MANUAL-2_3.html.tar + rm -f MANUAL-2_3.html.tar && \ + mv MANUAL-2_3.pdf manual.pdf dh_installexamples @top_srcdir@/scripts/example_pager.pl \ @top_srcdir@/scripts/example_sms.pl \ @@ -84,24 +86,24 @@ dh_installmenu dh_installinit -- defaults 19 - [ -f debian/postinst.debhelper ] && \ + [ -f debian/@install_name@.postinst.debhelper ] && \ cd debian && \ - cat postinst.debhelper | \ + cat @install_name@.postinst.debhelper | \ sed 's%/etc/init.d/@install_name@ start%:%' > postinst.tmp && \ - mv postinst.tmp postinst.debhelper - [ -f debian/postinst.debhelper ] && \ + mv postinst.tmp @install_name@.postinst.debhelper + [ -f debian/@install_name@.postinst.debhelper ] && \ cd debian && \ - cat postinst.debhelper | \ + cat @install_name@.postinst.debhelper | \ sed 's%invoke-rc.d @install_name@ start%:%' > postinst.tmp && \ - mv postinst.tmp postinst.debhelper - [ -f debian/prerm.debhelper ] && \ + mv postinst.tmp @install_name@.postinst.debhelper + [ -f debian/@install_name@.prerm.debhelper ] && \ cd debian && \ - cat prerm.debhelper | \ + cat @install_name@.prerm.debhelper | \ sed 's%/etc/init.d/@install_name@ stop%/etc/init.d/@install_name@ stop || echo service @install_name@ already stopped%' > prerm.tmp && \ - mv prerm.tmp prerm.debhelper - [ -f debian/prerm.debhelper ] && \ + mv prerm.tmp @install_name@.prerm.debhelper + [ -f debian/@install_name@.prerm.debhelper ] && \ cd debian && \ - cat prerm.debhelper | \ + cat @install_name@.prerm.debhelper | \ sed 's%invoke-rc.d @install_name@ stop%invoke-rc.d @install_name@ stop || echo service @install_name@ already stopped%' > prerm.tmp && \ - mv prerm.tmp prerm.debhelper + mv prerm.tmp @install_name@.prerm.debhelper # dh_installmanpages dh_installchangelogs @top_srcdir@/docs/Changelog