[SCM] Gnuplot. Interactive plotting program branch, master, updated. debian/4.6.0-5-11-gf1a4f5a

Anton Gladky gladky.anton at gmail.com
Sun Apr 29 12:25:27 UTC 2012


The following commit has been merged in the master branch:
commit f1a4f5a50e13dd62a68092b2387a973a3e94496c
Author: Agustin Martin Domingo <agmartin at debian.org>
Date:   Sun Apr 29 02:56:23 2012 +0200

    gnuplot-qt, gnuplot-x11, gnuplot-nox: Make them standalone packages.
    
    gnuplot.gih should be different for them (they contain different
    terminals) and the other stuff probably does not deserve to be split
    out to a common package.

diff --git a/debian/gnuplot.README.Debian b/debian/README.Debian
similarity index 100%
rename from debian/gnuplot.README.Debian
rename to debian/README.Debian
diff --git a/debian/control b/debian/control
index cb92699..c076baa 100644
--- a/debian/control
+++ b/debian/control
@@ -17,8 +17,7 @@ Vcs-Browser: http://git.debian.org/?p=debian-science/packages/gnuplot.git
 
 Package: gnuplot
 Architecture: all
-Depends: ${misc:Depends}
-Recommends: gnuplot-nox | gnuplot-x11 | gnuplot-qt
+Depends: gnuplot-nox | gnuplot-x11 | gnuplot-qt, ${misc:Depends}
 Suggests: gnuplot-doc
 Description: Command-line driven interactive plotting program
  Gnuplot is a portable command-line driven interactive data and function
@@ -35,7 +34,7 @@ Description: Command-line driven interactive plotting program
 
 Package: gnuplot-nox
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, gnuplot (>= 4.6.0-6)
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Recommends: groff, fonts-liberation
 Suggests: gnuplot-qt, gnuplot-doc
 Description: Command-line driven interactive plotting program. No-X package
@@ -52,7 +51,7 @@ Description: Command-line driven interactive plotting program. No-X package
 
 Package: gnuplot-x11
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, gnuplot (>= 4.6.0-6)
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Conflicts: gnuplot-qt, gnuplot-nox
 Suggests: gnuplot-qt, gnuplot-doc
 Description: Command-line driven interactive plotting program. X-package
@@ -72,7 +71,7 @@ Description: Command-line driven interactive plotting program. X-package
 
 Package: gnuplot-qt
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, gnuplot (>= 4.6.0-6)
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Conflicts: gnuplot-x11, gnuplot-nox
 Suggests: gnuplot-doc
 Description: Command-line driven interactive plotting program. QT-package
diff --git a/debian/gnuplot.docs b/debian/docs
similarity index 100%
rename from debian/gnuplot.docs
rename to debian/docs
diff --git a/debian/gnuplot-nox.info b/debian/gnuplot-nox.info
new file mode 100644
index 0000000..7550e91
--- /dev/null
+++ b/debian/gnuplot-nox.info
@@ -0,0 +1 @@
+debian/tmp/NOX/usr/share/info/*
diff --git a/debian/gnuplot-nox.install b/debian/gnuplot-nox.install
index e84c689..9ff86db 100644
--- a/debian/gnuplot-nox.install
+++ b/debian/gnuplot-nox.install
@@ -1 +1,3 @@
+debian/tmp/NOX/usr/share/gnuplot/gnuplot.gih usr/share/gnuplot
+debian/tmp/NOX/usr/share/gnuplot/gnuplot/ usr/share/gnuplot
 debian/tmp/NOX/usr/bin/ usr
diff --git a/debian/gnuplot-nox.manpages b/debian/gnuplot-nox.manpages
new file mode 100644
index 0000000..0786f8d
--- /dev/null
+++ b/debian/gnuplot-nox.manpages
@@ -0,0 +1 @@
+debian/tmp/NOX/usr/share/man/man1/gnuplot.1
diff --git a/debian/gnuplot-qt.info b/debian/gnuplot-qt.info
new file mode 100644
index 0000000..d9a82fe
--- /dev/null
+++ b/debian/gnuplot-qt.info
@@ -0,0 +1 @@
+debian/tmp/QT/usr/share/info/*
diff --git a/debian/gnuplot-qt.install b/debian/gnuplot-qt.install
index 5e8191b..7767090 100644
--- a/debian/gnuplot-qt.install
+++ b/debian/gnuplot-qt.install
@@ -1,2 +1,5 @@
+debian/tmp/QT/usr/share/gnuplot/gnuplot.gih usr/share/gnuplot
+debian/tmp/QT/usr/share/gnuplot/gnuplot/ usr/share/gnuplot
 debian/tmp/QT/usr/lib usr
 debian/tmp/QT/usr/bin usr
+pm3d/contrib/* usr/share/gnuplot/pm3d
diff --git a/debian/gnuplot.manpages b/debian/gnuplot-qt.manpages
similarity index 100%
rename from debian/gnuplot.manpages
rename to debian/gnuplot-qt.manpages
diff --git a/debian/gnuplot-x11.info b/debian/gnuplot-x11.info
new file mode 100644
index 0000000..2062cae
--- /dev/null
+++ b/debian/gnuplot-x11.info
@@ -0,0 +1 @@
+debian/tmp/X11/usr/share/info/*
diff --git a/debian/gnuplot-x11.install b/debian/gnuplot-x11.install
index 901a0a6..814d191 100644
--- a/debian/gnuplot-x11.install
+++ b/debian/gnuplot-x11.install
@@ -1,2 +1,5 @@
+debian/tmp/X11/usr/share/gnuplot/gnuplot.gih usr/share/gnuplot
+debian/tmp/X11/usr/share/gnuplot/gnuplot/ usr/share/gnuplot
 debian/tmp/X11/usr/lib usr
 debian/tmp/X11/usr/bin usr
+pm3d/contrib/* usr/share/gnuplot/pm3d
diff --git a/debian/gnuplot-x11.manpages b/debian/gnuplot-x11.manpages
new file mode 100644
index 0000000..1a0bd44
--- /dev/null
+++ b/debian/gnuplot-x11.manpages
@@ -0,0 +1 @@
+debian/tmp/X11/usr/share/man/man1/gnuplot.1
diff --git a/debian/gnuplot.info b/debian/gnuplot.info
deleted file mode 100644
index f611454..0000000
--- a/debian/gnuplot.info
+++ /dev/null
@@ -1 +0,0 @@
-debian/tmp/NOX/usr/share/info/
diff --git a/debian/gnuplot.install b/debian/gnuplot.install
deleted file mode 100644
index 40a61c0..0000000
--- a/debian/gnuplot.install
+++ /dev/null
@@ -1,3 +0,0 @@
-debian/tmp/NOX/usr/share/gnuplot/gnuplot.gih usr/share/gnuplot
-debian/tmp/NOX/usr/share/gnuplot/gnuplot/ usr/share/gnuplot
-pm3d/contrib/* usr/share/gnuplot/pm3d

-- 
Gnuplot. Interactive plotting program



More information about the debian-science-commits mailing list