On Sat, 02 Jun 2012 18:01:05 +0200, Javier Fernandez-Sanguino wrote: > > I've prepared an NMU for snort (versioned as 2.9.2.2-1.1) and > > uploaded it to DELAYED/2. Please feel free to tell me if I > > should delay it longer. > Thank you, I have applied this patch to the GIT repo, I will test it > out and, if it works as expected I will upload a new package version > myself.
Thanks! Now we just have to figure out why it fails to build on all buildds, although it built for me on amd64 and for you on i386 :/ Ah, here we are: it's "build vs. build-arch". Hm, seems liks build-basic get called again from build-arch because configure-stamp gets removed in between. The minimal fix seems to be to remove the "rm -f configure-stamp" from debian/clean_sources.sh (then I can build a binary-only package and the "normal" package -- except that it doesn't build the PDF now. *sigh*) Anyway, I'm attaching a more invasive patch that allows me to build a complete and an arch-only package. Cheers, gregor -- .''`. Homepage: http://info.comodo.priv.at/ - OpenPGP key 0xBB3A68018649AA06 : :' : Debian GNU/Linux user, admin, and developer - http://www.debian.org/ `. `' Member of VIBE!AT & SPI, fellow of the Free Software Foundation Europe `- NP: Don McLean: La la love you
diff -Nru snort-2.9.2.2/debian/changelog snort-2.9.2.2/debian/changelog
--- snort-2.9.2.2/debian/changelog 2012-06-02 17:56:19.000000000 +0200
+++ snort-2.9.2.2/debian/changelog 2012-06-03 18:12:23.000000000 +0200
@@ -1,3 +1,14 @@
+snort (2.9.2.2-2.1) UNRELEASED; urgency=low
+
+ * Non-maintainer upload.
+ * Drop quilt framework, the package uses source format "3.0 (quilt)".
+ * Fix FBTFS when called with build-arch:
+ - don't remove conigure-stamp in debian/clean_sources.sh; otherwise
+ build-basic gets called again
+ - update target dependencies in debian/rules
+
+ -- gregor herrmann <gre...@debian.org> Sun, 03 Jun 2012 16:51:34 +0200
+
snort (2.9.2.2-2) unstable; urgency=low
* Fix "FTBFS with multiarch libmysqlclient-dev" using the
diff -Nru snort-2.9.2.2/debian/clean_sources.sh snort-2.9.2.2/debian/clean_sources.sh
--- snort-2.9.2.2/debian/clean_sources.sh 2012-03-27 00:14:49.000000000 +0200
+++ snort-2.9.2.2/debian/clean_sources.sh 2012-06-03 17:57:29.000000000 +0200
@@ -8,7 +8,4 @@
# main Makefile but did not distclean)
(cd src && test -e Makefile && make distclean)
-# Remove the flag that indicated that the sources were configured
-rm -f configure-stamp
-
exit 0
diff -Nru snort-2.9.2.2/debian/control snort-2.9.2.2/debian/control
--- snort-2.9.2.2/debian/control 2012-06-02 17:54:19.000000000 +0200
+++ snort-2.9.2.2/debian/control 2012-06-03 17:57:01.000000000 +0200
@@ -16,8 +16,7 @@
libdumbnet-dev,
libdaq-dev,
flex,
- bison,
- quilt
+ bison
Build-Depends-Indep:
texlive,
texlive-latex-base,
diff -Nru snort-2.9.2.2/debian/rules snort-2.9.2.2/debian/rules
--- snort-2.9.2.2/debian/rules 2012-06-02 17:54:19.000000000 +0200
+++ snort-2.9.2.2/debian/rules 2012-06-03 18:02:43.000000000 +0200
@@ -4,8 +4,6 @@
# Sample debian/rules that uses debhelper. GNU copyright 1997 by Joey Hess.
# Some lines taken from debmake, by Christoph Lameter.
-include /usr/share/quilt/quilt.make
-
export DH_VERBOSE=1
TMP=`pwd`/debian
@@ -38,7 +36,7 @@
# Remove the flag that indicated that the sources were configured
-rm -f configure-stamp
-clean: clean-sources unpatch
+clean: clean-sources
dh_testdir
dh_testroot
# Clean all the stamps
@@ -58,7 +56,7 @@
dh_clean
configure: configure-stamp
-configure-stamp: $(QUILT_STAMPFN)
+configure-stamp:
dh_testdir
# Standard package support
./configure $(CONFFLAGS) \
@@ -69,7 +67,7 @@
touch $@
build-basic: build-basic-stamp
-build-basic-stamp: $(QUILT_STAMPFN) configure
+build-basic-stamp: configure-stamp
# NOTE: We don't clean the sources on the first compilation
dh_testdir
# Basic package (no BBDD support):
@@ -78,7 +76,7 @@
touch $@
build-pgsql: build-pgsql-stamp
-build-pgsql-stamp: $(QUILT_STAMPFN)
+build-pgsql-stamp:
dh_testdir
sh debian/clean_sources.sh
# PostgreSQL package:
@@ -92,7 +90,7 @@
touch $@
build-mysql: build-mysql-stamp
-build-mysql-stamp: $(QUILT_STAMPFN)
+build-mysql-stamp:
dh_testdir
sh debian/clean_sources.sh
# MySQL package:
@@ -106,7 +104,7 @@
touch $@
build-inline: build-inline-stamp
-build-inline-stamp: $(QUILT_STAMPFN)
+build-inline-stamp:
dh_testdir
sh debian/clean_sources.sh
# Inline support
@@ -120,13 +118,13 @@
cp src/snort src/snort-inline
touch $@
-build-arch: build-basic build-pgsql build-mysql build-arch-stamp
-build-arch-stamp:
+build-arch: build-arch-stamp
+build-arch-stamp: build-basic-stamp build-pgsql-stamp build-mysql-stamp
dh_testdir
touch $@
-build-indep: configure build-indep-stamp
-build-indep-stamp:
+build-indep: build-indep-stamp
+build-indep-stamp: configure-stamp
dh_testdir
# Build the documentation
# Only do this if we have the required binaries and files
@@ -142,7 +140,7 @@
fi
touch $@
-build:
+build: build-arch build-indep
install: install-indep install-arch
signature.asc
Description: Digital signature
