Source: gnuplot
Version: 4.2.2-1.2
Severity: wishlist
The `x11' and `wxt' drivers are quite distinct, and one may opt
to install one of them but not other, which is clearly
impossible when they belong to the same package.
Please consider splitting `gnuplot-x11' into:
* `gnuplot-x11' -- with just the `x11' driver, like in Debian
Etch;
* `gnuplot-wxt' -- with the newer `wxt' driver.)
To do the change, some debian/ files are to be renamed, like:
$ mv -i -- debian/gnuplot-x11.preinst debian/gnuplot-wxt.preinst
$ mv -i -- debian/gnuplot-x11.postrm debian/gnuplot-wxt.postrm
$
And also a patch like the one below is to be applied. (Please
note that I've also tweaked the Description:s a bit; replace
these changes with whatever deemed appropriate.)
$ interdiff <(zcat gnuplot_4.2.5-2{,~is+2}.diff.gz)
diff -u gnuplot-4.2.5/debian/changelog gnuplot-4.2.5/debian/changelog
--- gnuplot-4.2.5/debian/changelog
+++ gnuplot-4.2.5/debian/changelog
@@ -1,3 +1,15 @@
+gnuplot (4.2.5-2~is+2) 1gray-misc; urgency=low
+
+ * Build the -nox variant with X11 again.
+
+ -- Ivan Shmakov <[email protected]> Sat, 08 Aug 2009 01:05:15 +0700
+
+gnuplot (4.2.5-2~is+1) 1gray-misc; urgency=low
+
+ * debian/control: Split gnuplot-wxt off gnuplot-x11.
+
+ -- Ivan Shmakov <[email protected]> Fri, 07 Aug 2009 22:08:40 +0700
+
gnuplot (4.2.5-2) unstable; urgency=low
* debian/patches:
diff -u gnuplot-4.2.5/debian/control gnuplot-4.2.5/debian/control
--- gnuplot-4.2.5/debian/control
+++ gnuplot-4.2.5/debian/control
@@ -10,9 +10,9 @@
Package: gnuplot
Architecture: all
-Depends: gnuplot-nox (>= ${source:Version}), gnuplot-x11 (>= ${source:Version})
+Depends: gnuplot-nox (>= ${source:Version}), gnuplot-wxt (>= ${source:Version})
Suggests: gnuplot-doc (>= ${source:Version})
-Description: A command-line driven interactive plotting program
+Description: A command-line driven interactive plotting program --
transitional package
Gnuplot is a portable command-line driven interactive data and function
plotting utility that supports lots of output formats, including drivers
for many printers, (La)TeX, (x)fig, Postscript, and so on. The X11-output
@@ -23,7 +23,7 @@
and can work with complex numbers.
.
This package is for transition and to install a full-featured gnuplot
- supporting the X11-output.
+ supporting the X11-output via the `wxt' terminal driver.
Package: gnuplot-nox
Architecture: any
@@ -47,7 +47,26 @@
Architecture: any
Depends: gnuplot-nox (>= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
Replaces: gnuplot (<< 4.0.0)
-Description: A command-line driven interactive plotting program
+Description: A command-line driven interactive plotting program -- `x11'
terminal
+ Gnuplot is a portable command-line driven interactive data and function
+ plotting utility that supports lots of output formats, including drivers
+ for many printers, (La)TeX, (x)fig, Postscript, and so on. The X11-output
+ is packaged in gnuplot-x11.
+ .
+ Data files and self-defined functions can be manipulated by the internal
+ C-like language. Can perform smoothing, spline-fitting, or nonlinear fits,
+ and can work with complex numbers.
+ .
+ This package contains the `x11' terminal driver that enables gnuplot to
+ plot images interactively under X11. Most users will want this, it is
+ however packaged separately so that low-end systems don't need X
+ installed to use gnuplot.
+
+Package: gnuplot-wxt
+Architecture: any
+Depends: gnuplot-nox (>= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Replaces: gnuplot (<< 4.0.0)
+Description: A command-line driven interactive plotting program -- `wxt'
terminal
Gnuplot is a portable command-line driven interactive data and function
plotting utility that supports lots of output formats, including drivers
for many printers, (La)TeX, (x)fig, Postscript, and so on. The X11-output
@@ -57,10 +76,10 @@
C-like language. Can perform smoothing, spline-fitting, or nonlinear fits,
and can work with complex numbers.
.
- This package contains the terminal driver that enables gnuplot to plot
- images interactively under X11. Most users will want this, it is however
- packaged separately so that low-end systems don't need X installed to use
- gnuplot.
+ This package contains the `wxt' terminal driver that enables gnuplot to
+ plot images interactively under X11. Most users will want this, it is
+ however packaged separately so that low-end systems don't need X
+ installed to use gnuplot.
Package: gnuplot-doc
Architecture: all
diff -u gnuplot-4.2.5/debian/rules gnuplot-4.2.5/debian/rules
--- gnuplot-4.2.5/debian/rules
+++ gnuplot-4.2.5/debian/rules
@@ -40,7 +40,7 @@
--datadir=\$${prefix}/share/gnuplot \
--with-gihdir=\$${prefix}/share/gnuplot \
--without-lasergnu --with-png --with-gd --without-lisp-files \
- --without-linux-vga --with-readline=bsd --without-x \
+ --without-linux-vga --with-readline=bsd \
--disable-wxwidgets
touch $@
@@ -101,6 +101,7 @@
debian/gnuplot \
debian/gnuplot-doc \
debian/gnuplot-nox \
+ debian/gnuplot-wxt \
debian/gnuplot-x11 \
docs/psdoc/ps_symbols.ps \
docs/psdoc/ps_fontfile_doc.aux \
diff -u gnuplot-4.2.5/debian/gnuplot-x11.install
gnuplot-4.2.5/debian/gnuplot-x11.install
--- gnuplot-4.2.5/debian/gnuplot-x11.install
+++ gnuplot-4.2.5/debian/gnuplot-x11.install
@@ -2,2 +1,0 @@
-debian/tmp/usr/share/man/man1/gnuplot.1
-debian/tmp/usr/bin/gnuplot
only in patch2:
unchanged:
--- gnuplot-4.2.5.orig/debian/gnuplot-wxt.install
+++ gnuplot-4.2.5/debian/gnuplot-wxt.install
@@ -0,0 +1,2 @@
+debian/tmp/usr/share/man/man1/gnuplot.1
+debian/tmp/usr/bin/gnuplot
--
FSF associate member #7257
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
