Bug#413933: zorp: policy.boot cannot be found

2007-03-19 Thread Steve Langasek
Hi Attila,

I've prepared an NMU for this bug.  The NMU patch, with the autogenerated
parts stripped out, is attached.  Unfortunately the autogenerated parts are
quite large because the package lacked a proper clean target, so this NMU
includes a patch to strip those out in the interest of future cleanliness.

The NMU will be uploaded to incoming shortly.

Thanks,
-- 
Steve Langasek   Give me a lever long enough and a Free OS
Debian Developer   to set it on, and I can move the world.
[EMAIL PROTECTED]   http://www.debian.org/
diff -Nru /tmp/yZwCv4FkG9/zorp-3.0.8/configure.in /tmp/GwgxXBxXSp/zorp-3.0.8/configure.in
--- /tmp/yZwCv4FkG9/zorp-3.0.8/configure.in	2005-11-03 01:14:15.0 -0800
+++ /tmp/GwgxXBxXSp/zorp-3.0.8/configure.in	2007-03-18 22:39:38.0 -0700
@@ -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 -Nru /tmp/yZwCv4FkG9/zorp-3.0.8/debian/changelog /tmp/GwgxXBxXSp/zorp-3.0.8/debian/changelog
--- /tmp/yZwCv4FkG9/zorp-3.0.8/debian/changelog	2006-10-10 07:10:15.0 -0700
+++ /tmp/GwgxXBxXSp/zorp-3.0.8/debian/changelog	2007-03-18 23:27:49.0 -0700
@@ -1,3 +1,21 @@
+zorp (3.0.8-0.3) unstable; urgency=high
+
+  * Non-maintainer upload.
+  * High-urgency upload for RC bugfix.
+  * 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
+  * Thanks to Nicolas Francois for the patch.
+  * Also fix the clean target to use make distclean, not just make
+clean.
+  * The previous change requires setting ZORP_PACKAGE_LICENSE=gpl when
+calling configure to avoid another FTBFS.
+
+ -- Steve Langasek [EMAIL PROTECTED]  Sun, 18 Mar 2007 20:54:44 -0700
+
 zorp (3.0.8-0.2) unstable; urgency=high
 
   * Non-maintainer upload to fix release critical bug.
diff -Nru /tmp/yZwCv4FkG9/zorp-3.0.8/debian/rules /tmp/GwgxXBxXSp/zorp-3.0.8/debian/rules
--- /tmp/yZwCv4FkG9/zorp-3.0.8/debian/rules	2006-09-03 14:45:04.0 -0700
+++ /tmp/GwgxXBxXSp/zorp-3.0.8/debian/rules	2007-03-18 23:27:18.0 -0700
@@ -34,9 +34,8 @@
 build-stamp:
 	dh_testdir
 
-	aclocal
-	AUTOMAKE=automake-1.7 autoreconf -i -f
-	CFLAGS=$(DTEST) ./configure $(confflags) \
+	ACLOCAL=aclocal-1.7 AUTOMAKE=automake-1.7 autoreconf -i -f
+	ZORP_PACKAGE_LICENSE=gpl CFLAGS=$(DTEST) ./configure $(confflags) \
 		--prefix=/usr \
 		--mandir=\$${prefix}/share/man \
 		--infodir=\$${prefix}/share/info \
@@ -73,7 +72,7 @@
 	rm -f debfiles-stamp
 
 	# Add here commands to clean up after the build process.
-	-$(MAKE) clean
+	-$(MAKE) distclean
 
 	-rm config.log config.status
 


Bug#413933: zorp: policy.boot cannot be found

2007-03-12 Thread Nicolas François
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.0 +0100
+++ ./configure.in	2007-03-13 02:13:02.0 +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.0 +0200
+++ ./debian/changelog	2007-03-13 02:52:01.0 +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.0 +0200
+++ ./debian/rules	2007-03-13 02:14:39.0 +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 \


Processed: Re: Bug#413933: zorp: policy.boot cannot be found

2007-03-12 Thread Debian Bug Tracking System
Processing commands for [EMAIL PROTECTED]:

 tags 413933 patch
Bug#413933: zorp: policy.boot cannot be found
There were no tags set.
Tags added: patch

 thanks
Stopping processing here.

Please contact me if you need assistance.

Debian bug tracking system administrator
(administrator, Debian Bugs database)


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]