Changeset 209 for trunk


Ignore:
Timestamp:
Jan 26, 2009, 10:09:45 PM (16 years ago)
Author:
katerina
Message:

Fix problem building deb package (ticket #135).

Location:
trunk
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/COPYING

    r171 r209  
    33------------------------------------------
    44
    5 Copyright (C) 1999-2004 Rainer Wichmann                                   
     5Copyright (C) 1999-2009 Rainer Wichmann                                   
    66                                                                     
    77This program is free software; you can redistribute it and/or modify
    … …  
    1717You should have received a copy of the GNU General Public License     
    1818along with this program; if not, write to the Free Software           
    19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.             
     19Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
    2020
    2121
    … …  
    101101       * along with the LZO library; see the file COPYING.
    102102       * If not, write to the Free Software Foundation, Inc.,
    103        * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
     103       * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
    104104       *
    105105       * Markus F.X.J. Oberhumer
    … …  
    125125      You should have received a copy of the GNU General Public License
    126126      along with this program; if not, write to the Free Software
    127       Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
     127      Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA  */
    128128
    129129   /* Written by David MacKenzie <djm@gnu.ai.mit.edu>. */
    … …  
    152152    * You should have received a copy of the GNU General Public License
    153153    * along with this program; if not, write to the Free Software Foundation,
    154     * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
     154    * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
    155155    */
    156156
    … …  
    169169        * country of residence.
    170170        *
    171         * Adapted to pike and some cleanup by Niels Möller.
     171        * Adapted to pike and some cleanup by Niels Möller.
    172172        */
    173173
    … …  
    203203     * You should have received a copy of the GNU Library General Public
    204204     * License along with this library; if not, write to the Free
    205      * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
     205     * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
    206206     *
    207207     * The author of this library can be reached at the following address:

  • trunk/Makefile.in

    r197 r209  
    864864        echo " and how it can be used to check the file integrity of your" >> debian/@install_name@.doc-base; \
    865865        echo " server." >> debian/@install_name@.doc-base; \
    866         echo "Section: admin" >> debian/@install_name@.doc-base; \
     866        echo "Section: System/Security" >> debian/@install_name@.doc-base; \
    867867        echo  >> debian/@install_name@.doc-base; \
    868868        echo  >> debian/@install_name@.doc-base; \
    869869        echo "Format: Postscript" >> debian/@install_name@.doc-base; \
    870         echo "Files: /usr/share/doc/@install_name@/manual.ps.gz" >> debian/@install_name@.doc-base; \
     870        echo "Files: /usr/share/doc/@install_name@/manual.pdf.gz" >> debian/@install_name@.doc-base; \
    871871        echo  >> debian/@install_name@.doc-base; \
    872872        echo "Format: HTML" >> debian/@install_name@.doc-base; \
    873873        echo "Index: /usr/share/doc/@install_name@/manual.html/index.html" >> debian/@install_name@.doc-base; \
    874874        echo "Files: /usr/share/doc/@install_name@/manual.html/*.html" >> debian/@install_name@.doc-base; \
    875         echo @myrpmconffile@ > debian/conffiles; \
    876         echo /etc/init.d/@install_name@ >> debian/conffiles; \
    877875        if test -f /usr/lib/lsb/install_initd; then \
    878876          cp init/samhain.startLSB debian/@install_name@.init; \
    … …  
    888886        echo "Package: @install_name@" >> debian/control; \
    889887        echo "Architecture: any" >> debian/control; \
    890         echo "Depends: \$${shlibs:Depends}" >> debian/control; \
     888        echo "Depends: libc6" >> debian/control; \
    891889        echo "Description: File integrity checker"  >> debian/control; \
    892890        echo " A file integrity checker"  >> debian/control; \
    893891        echo "running debuild -us -uc"; \
    894         debuild -us -uc; \
     892        debuild -us -uc -b; \
    895893        DEBFILE=`find ../ -follow -maxdepth 1 -cnewer ./debian/control 2>/dev/null | grep '@install_name@_$(VERSION)' | grep '\.deb'`; \
    896894        if test x"$$DEBFILE" = x; then \

  • trunk/configure.ac

    r208 r209  
    1212dnl start
    1313dnl
    14 AM_INIT_AUTOMAKE(samhain, 2.5.2)
     14AM_INIT_AUTOMAKE(samhain, 2.5.2a)
    1515AC_DEFINE([SAMHAIN], 1, [Application is samhain])
    1616AC_CANONICAL_HOST

  • trunk/docs/Changelog

    r208 r209  
     12.5.2a (26-01-2009):
     2        * fix problem building deb package (bit rot; reported by joerg)
     3
    142.5.2 (22-01-2009):
    25        * samhain.c: report module failure with positive offset

  • trunk/rules.deb-light.in

    r79 r209  
    1212
    1313# This is the debhelper compatability version to use.
    14 export DH_COMPAT=1
     14export DH_COMPAT=4
    1515
    1616package=@install_name@
    … …  
    4242        dh_installdirs
    4343
    44         $(MAKE) install-light install-boot DESTDIR=`pwd`/debian/tmp
     44        $(MAKE) install-light install-boot DESTDIR=`pwd`/debian/@install_name@
     45        # $(MAKE) install-light install-boot DESTDIR=`pwd`/debian/tmp
    4546
    4647        # However, remove the rc.d links
    … …  
    6465        dh_installmenu
    6566        dh_installinit -- defaults 19
    66         [ -f debian/postinst.debhelper ] && \
     67        [ -f debian/@install_name@.postinst.debhelper ] && \
    6768                cd debian && \
    68                 cat postinst.debhelper | \
     69                cat @install_name@.postinst.debhelper | \
    6970                    sed 's%/etc/init.d/@install_name@ start%:%' > postinst.tmp && \
    70                     mv postinst.tmp postinst.debhelper
    71         [ -f debian/postinst.debhelper ] && \
     71                    mv postinst.tmp @install_name@.postinst.debhelper
     72        [ -f debian/@install_name@.postinst.debhelper ] && \
    7273                cd debian && \
    73                 cat postinst.debhelper | \
     74                cat @install_name@.postinst.debhelper | \
    7475                    sed 's%invoke-rc.d @install_name@ start%:%' > postinst.tmp && \
    75                     mv postinst.tmp postinst.debhelper
    76         [ -f debian/prerm.debhelper ] && \
     76                    mv postinst.tmp @install_name@.postinst.debhelper
     77        [ -f debian/@install_name@.prerm.debhelper ] && \
    7778                cd debian && \
    78                 cat prerm.debhelper | \
     79                cat @install_name@.prerm.debhelper | \
    7980                    sed 's%/etc/init.d/@install_name@ stop%/etc/init.d/@install_name@ stop || echo service @install_name@ already stopped%' > prerm.tmp && \
    80                     mv prerm.tmp prerm.debhelper
    81         [ -f debian/prerm.debhelper ] && \
     81                    mv prerm.tmp @install_name@.prerm.debhelper
     82        [ -f debian/@install_name@.prerm.debhelper ] && \
    8283                cd debian && \
    83                 cat prerm.debhelper | \
     84                cat @install_name@.prerm.debhelper | \
    8485                    sed 's%invoke-rc.d @install_name@ stop%invoke-rc.d @install_name@ stop || echo service @install_name@ already stopped%' > prerm.tmp && \
    85                     mv prerm.tmp prerm.debhelper
     86                    mv prerm.tmp @install_name@.prerm.debhelper
    8687        # dh_installmanpages
    8788        # dh_installchangelogs @top_srcdir@/docs/Changelog

  • trunk/rules.deb.in

    r79 r209  
    1212
    1313# This is the debhelper compatability version to use.
    14 export DH_COMPAT=1
     14export DH_COMPAT=4
    1515
    1616package=@install_name@
    … …  
    4848        #       `pwd`/debian/tmp/etc/samhain
    4949
    50         $(MAKE) install install-boot DESTDIR=`pwd`/debian/tmp
     50        # $(MAKE) install install-boot DESTDIR=`pwd`/debian/tmp
     51        $(MAKE) install install-boot DESTDIR=`pwd`/debian/@install_name@
    5152
    5253        # However, remove the rc.d links
    … …  
    7071        dh_installdebconf       
    7172        dh_installdocs
    72         [ -f debian/tmp/usr/share/doc/@install_name@/MANUAL-2_3.html.tar ] && \
    73                 cd debian/tmp/usr/share/doc/@install_name@ && \
     73        [ -f debian/@install_name@/usr/share/doc/@install_name@/MANUAL-2_3.html.tar ] && \
     74                cd debian/@install_name@/usr/share/doc/@install_name@ && \
    7475                tar xf MANUAL-2_3.html.tar && mv MANUAL-2_3 manual.html && \
    75                 rm -f MANUAL-2_3.html.tar
     76                rm -f MANUAL-2_3.html.tar && \
     77                mv MANUAL-2_3.pdf manual.pdf
    7678        dh_installexamples @top_srcdir@/scripts/example_pager.pl \
    7779                @top_srcdir@/scripts/example_sms.pl \
    … …  
    8486        dh_installmenu
    8587        dh_installinit -- defaults 19
    86         [ -f debian/postinst.debhelper ] && \
     88        [ -f debian/@install_name@.postinst.debhelper ] && \
    8789                cd debian && \
    88                 cat postinst.debhelper | \
     90                cat @install_name@.postinst.debhelper | \
    8991                    sed 's%/etc/init.d/@install_name@ start%:%' > postinst.tmp && \
    90                     mv postinst.tmp postinst.debhelper
    91         [ -f debian/postinst.debhelper ] && \
     92                    mv postinst.tmp @install_name@.postinst.debhelper
     93        [ -f debian/@install_name@.postinst.debhelper ] && \
    9294                cd debian && \
    93                 cat postinst.debhelper | \
     95                cat @install_name@.postinst.debhelper | \
    9496                    sed 's%invoke-rc.d @install_name@ start%:%' > postinst.tmp && \
    95                     mv postinst.tmp postinst.debhelper
    96         [ -f debian/prerm.debhelper ] && \
     97                    mv postinst.tmp @install_name@.postinst.debhelper
     98        [ -f debian/@install_name@.prerm.debhelper ] && \
    9799                cd debian && \
    98                 cat prerm.debhelper | \
     100                cat @install_name@.prerm.debhelper | \
    99101                    sed 's%/etc/init.d/@install_name@ stop%/etc/init.d/@install_name@ stop || echo service @install_name@ already stopped%' > prerm.tmp && \
    100                     mv prerm.tmp prerm.debhelper
    101         [ -f debian/prerm.debhelper ] && \
     102                    mv prerm.tmp @install_name@.prerm.debhelper
     103        [ -f debian/@install_name@.prerm.debhelper ] && \
    102104                cd debian && \
    103                 cat prerm.debhelper | \
     105                cat @install_name@.prerm.debhelper | \
    104106                    sed 's%invoke-rc.d @install_name@ stop%invoke-rc.d @install_name@ stop || echo service @install_name@ already stopped%' > prerm.tmp && \
    105                     mv prerm.tmp prerm.debhelper
     107                    mv prerm.tmp @install_name@.prerm.debhelper
    106108        # dh_installmanpages
    107109        dh_installchangelogs @top_srcdir@/docs/Changelog
Note: See TracChangeset for help on using the changeset viewer.