Changeset 531 for trunk

Timestamp:

Dec 15, 2017, 9:54:09 PM (7 years ago)

Author:

katerina

Message:

Fix for ticket #424 (make deb broken).

Location:

trunk

Files:

• COPYING (modified) (1 diff)
• Makefile.in (modified) (4 diffs)
• configure.ac (modified) (1 diff)
• docs/Changelog (modified) (1 diff)
• init/samhain.startLSB.in (modified) (1 diff)
• init/samhain.startLinux.in (modified) (1 diff)
• rules.deb-light.in (modified) (1 diff)
• rules.deb.in (modified) (1 diff)

trunk/COPYING

@@ -19 +19 @@
 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 
+On Debian-based systems, see /usr/share/common-licenses
 
 Incorporated code

trunk/Makefile.in

@@ -846 +846 @@
                 maintainer="$(DEFAULT_MAINTAINER)"; \
         fi; \
-        echo "$(PACKAGE) ($(VERSION)-$(BUILD_NUM)) stable; urgency=low" > debian/changelog; \
+        codename=`lsb_release -a 2>/dev/null | grep Codename | cut -f 2`; \
+        if test "x$$codename" = x; then \
+                codename="stable"; \
+        fi; \
+        echo "$(PACKAGE) ($(VERSION)-$(BUILD_NUM)) $$codename; urgency=low" > debian/changelog; \
         echo >> debian/changelog; \
         echo "  * Initial release." >> debian/changelog; \
@@ -856 +860 @@
         echo "End:" >> debian/changelog; \
         cp   $(top_srcdir)/COPYING  debian/copyright; \
-        touch debian/README.debian; \
+        echo "9" > debian/compat; \
+        echo "Nothing to see here." > debian/README.debian; \
         echo "Document: @install_name@-manual" > debian/@install_name@.doc-base; \
         echo "Title: @install_name@ Manual" >> debian/@install_name@.doc-base; \
@@ -885 +890 @@
         echo "Package: @install_name@" >> debian/control; \
         echo "Architecture: any" >> debian/control; \
-        echo "Depends: libc6" >> debian/control; \
+        echo "Depends: \$${shlibs:Depends}, \$${misc:Depends}" >> debian/control; \
         echo "Description: File integrity checker"  >> debian/control; \
         echo " A file integrity checker"  >> debian/control; \
@@ -897 +902 @@
           echo "Package $$DEBFILE built."; \
           cp $$DEBFILE ./$(PACKAGE)-$(VERSION)-$(BUILD_NUM).deb; \
-          ln -s ./$(PACKAGE)-$(VERSION)-$(BUILD_NUM).deb ./$(PACKAGE)-$(VERSION).deb; \
+          ln --backup=numbered -fs ./$(PACKAGE)-$(VERSION)-$(BUILD_NUM).deb ./$(PACKAGE)-$(VERSION).deb; \
         fi; \
         echo

trunk/configure.ac

@@ -72 +72 @@
            ;;
         esac
-        ;;
+        LDFLAGS="${LDFLAGS} -Wl,--as-needed"
+        ;;
         
         *osf*)

trunk/docs/Changelog

@@ -2 +2 @@
         * fix 'clobbered by..' compiler warning is src/sh_portcheck.c
         * fix compiler warning because of deprecated _BSD_SOURCE macro
+        * fix 'make deb' for Debian stretch (reported by Alasdair)
 
 4.2.3:

trunk/init/samhain.startLSB.in

@@ -3 +3 @@
 ### BEGIN INIT INFO
 # Provides: @install_name@
-# Required-Start: $syslog $network
-# Required-Stop: $syslog $network
+# Required-Start: $syslog $network $remote_fs
+# Required-Stop: $syslog $network $remote_fs
 # Default-Start: 2 3 4 5
 # Default-Stop: 0 1 6

trunk/init/samhain.startLinux.in

@@ -12 +12 @@
 ### BEGIN INIT INFO
 # Provides: @install_name@
-# Required-Start: $syslog $network
-# Required-Stop: $syslog $network
+# Required-Start: $syslog $network $remote_fs
+# Required-Stop: $syslog $network $remote_fs
 # Default-Start: 2 3 4 5
 # Default-Stop: 0 1 6

trunk/rules.deb-light.in

@@ -12 +12 @@
 
 # This is the debhelper compatability version to use.
-export DH_COMPAT=4
+export DH_COMPAT=9
 
 package=@install_name@

trunk/rules.deb.in

@@ -12 +12 @@
 
 # This is the debhelper compatability version to use.
-export DH_COMPAT=4
+export DH_COMPAT=9
 
 package=@install_name@