Re: To [EMAIL PROTECTED] 2008-09-26 <[EMAIL PROTECTED]> > The diff for the Lenny t-p-u-NMU is quoted below, the NMU for the > version in unstable will follow shortly.
Here's the unstable diff.
diff -u gnuplot-4.2.3/debian/gnuplot-x11.install
gnuplot-4.2.3/debian/gnuplot-x11.install
--- gnuplot-4.2.3/debian/gnuplot-x11.install
+++ gnuplot-4.2.3/debian/gnuplot-x11.install
@@ -1 +1,2 @@
+usr/bin/gnuplot
usr/lib/gnuplot/gnuplot_x11
diff -u gnuplot-4.2.3/debian/rules gnuplot-4.2.3/debian/rules
--- gnuplot-4.2.3/debian/rules
+++ gnuplot-4.2.3/debian/rules
@@ -28,9 +28,11 @@
INSTALL_PROGRAM += -s
endif
-config.status: configure
+build-arch: build-arch-stamp
+build-arch-stamp:
dh_testdir
+ # Building nox variant
./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE)
CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs,-as-needed" \
--prefix=/usr \
--mandir=\$${prefix}/share/man \
@@ -41,11 +43,38 @@
--without-lasergnu \
--with-png --with-gd --without-lisp-files \
--without-linux-vga \
- --with-readline=builtin
+ --with-readline=builtin \
+ --without-x --disable-wxwidgets
-build-arch: config.status build-arch-stamp
-build-arch-stamp:
- dh_testdir
+# don't regenerate autotools-stuff
+ touch configure.in && \
+ touch config.status && \
+ touch aclocal.m4 && \
+ touch config.hin && \
+ touch configure && \
+ touch stamp-h.in
+
+ find -name Makefile.in -exec touch {} \; && \
+ find -name Makefile -exec touch {} \;
+
+ $(MAKE) -C src
+ test -d build-nox || mkdir -p build-nox
+ cp src/gnuplot build-nox
+
+ make distclean
+
+ # Building x11 variant
+ ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE)
CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs,-as-needed" \
+ --prefix=/usr \
+ --mandir=\$${prefix}/share/man \
+ --infodir=\$${prefix}/share/info \
+ --libexecdir=\$${prefix}/lib/gnuplot \
+ --datadir=\$${prefix}/share/gnuplot \
+ --with-gihdir=\$${prefix}/share/gnuplot \
+ --without-lasergnu \
+ --with-png --with-gd --without-lisp-files \
+ --without-linux-vga \
+ --with-readline=builtin
# don't regenerate autotools-stuff
touch configure.in && \
@@ -63,8 +92,8 @@
touch build-arch-stamp
-build-indep: config.status build-indep-stamp
-build-indep-stamp:
+build-indep: build-indep-stamp
+build-indep-stamp: build-arch-stamp
dh_testdir
# create documentation
@@ -80,6 +109,7 @@
touch build-indep-stamp
+# FIXME: 'patch' is not called when 'build-arch' is invoked directly
build: patch build-arch build-indep
clean: unpatch
@@ -106,7 +136,8 @@
docs/psdoc/ps_fontfile_doc.ps \
docs/psdoc/prologue.ps \
docs/psdoc/missfont.log \
- docs/htmldocs
+ docs/htmldocs \
+ build-nox
install: DH_OPTIONS=
install: build
diff -u gnuplot-4.2.3/debian/changelog gnuplot-4.2.3/debian/changelog
--- gnuplot-4.2.3/debian/changelog
+++ gnuplot-4.2.3/debian/changelog
@@ -1,3 +1,14 @@
+gnuplot (4.2.3-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Build the -nox variant without the WX terminal as it pulls in X11.
+ Requires building twice because WX does not support a pipe protocol to
+ talk to the main gnuplot binary as gnuplot_x11 does. We now have a second
+ /usr/bin/gnuplot binary in -x11, we dpkg-divert the -nox binary to
+ gnuplot-nox. (Closes: #435518)
+
+ -- Christoph Berg <[EMAIL PROTECTED]> Fri, 26 Sep 2008 19:39:57 +0200
+
gnuplot (4.2.3-1) unstable; urgency=low
* New upstream release (Closes: #471685, #487859)
diff -u gnuplot-4.2.3/debian/gnuplot-nox.install
gnuplot-4.2.3/debian/gnuplot-nox.install
--- gnuplot-4.2.3/debian/gnuplot-nox.install
+++ gnuplot-4.2.3/debian/gnuplot-nox.install
@@ -1,4 +1,4 @@
-usr/bin/gnuplot
+../../build-nox/gnuplot usr/bin
usr/share/gnuplot/gnuplot.gih
usr/share/man/man1/gnuplot.1
usr/share/gnuplot/gnuplot/
--- gnuplot-4.2.3.orig/debian/gnuplot-x11.postrm
+++ gnuplot-4.2.3/debian/gnuplot-x11.postrm
@@ -0,0 +1,10 @@
+#!/bin/sh -e
+
+if [ "$1" = remove ] ; then
+ dpkg-divert --remove --package gnuplot-x11 --rename \
+ --divert /usr/bin/gnuplot-nox /usr/bin/gnuplot
+fi
+
+#DEBHELPER#
+
+exit 0
--- gnuplot-4.2.3.orig/debian/gnuplot-x11.preinst
+++ gnuplot-4.2.3/debian/gnuplot-x11.preinst
@@ -0,0 +1,10 @@
+#!/bin/sh -e
+
+if [ "$1" = install ] || [ "$1" = upgrade ] ; then
+ dpkg-divert --add --package gnuplot-x11 --rename \
+ --divert /usr/bin/gnuplot-nox /usr/bin/gnuplot
+fi
+
+#DEBHELPER#
+
+exit 0
Christoph
--
[EMAIL PROTECTED] | http://www.df7cb.de/
signature.asc
Description: Digital signature
