tags 413933 patch
thanks

Hello,

With the attached patch, I could successfully start zorp (zorp_plug).
But I did not check if zorp works nicely afterwards.

Matt, can you build a zorp package with the attached patch applied, and
try the built packages (zorp, zorp-modules, libzorp2)?

The patch also fixes an FTBFS.

Thanks in advance,
-- 
Nekral
diff -rauN ../../orig/zorp-3.0.8/configure.in ./configure.in
--- ../../orig/zorp-3.0.8/configure.in	2005-11-03 10:14:15.000000000 +0100
+++ ./configure.in	2007-03-13 02:13:02.000000000 +0100
@@ -143,8 +143,8 @@
  	      PYTHON="$with_python")
 
 sysconfdir="${sysconfdir}/zorp"
-#datadir='${prefix}/share/zorp'
-libdir='${prefix}/lib'
+datadir="${prefix}/share"
+libdir="${prefix}/lib"
 
 dnl ***************************************************************************
 dnl Argument processing which might affect detection
diff -rauN ../../orig/zorp-3.0.8/debian/changelog ./debian/changelog
--- ../../orig/zorp-3.0.8/debian/changelog	2006-10-10 16:10:15.000000000 +0200
+++ ./debian/changelog	2007-03-13 02:52:01.000000000 +0100
@@ -1,3 +1,15 @@
+zorp (3.0.8-0.3) unstable; urgency=low
+
+  * Non-maintainer upload to fix release critical bugs.
+  * debian/rules: Explicitly run aclocal-1.7 instead of aclocal (FTBFS with
+    aclocal-1.9).
+  * configure.in: Set datadir and libdir to ${prefix}/share and ${prefix}/lib.
+    This is fixed upstream in version 3.0.14b with more intrusive changes in
+    the build system. Note that ./configure --datadir and --libdir won't work.
+    Closes: #413933
+
+ -- Nicolas FRANCOIS (Nekral) <[EMAIL PROTECTED]>  Tue, 13 Mar 2007 02:33:37 +0100
+
 zorp (3.0.8-0.2) unstable; urgency=high
 
   * Non-maintainer upload to fix release critical bug.
diff -rauN ../../orig/zorp-3.0.8/debian/rules ./debian/rules
--- ../../orig/zorp-3.0.8/debian/rules	2006-09-03 23:45:04.000000000 +0200
+++ ./debian/rules	2007-03-13 02:14:39.000000000 +0100
@@ -34,7 +34,7 @@
 build-stamp:
 	dh_testdir
 
-	aclocal
+	aclocal-1.7
 	AUTOMAKE="automake-1.7" autoreconf -i -f
 	CFLAGS=$(DTEST) ./configure $(confflags) \
 		--prefix=/usr \

Reply via email to