[SCM] Gnuplot. Interactive plotting program branch, master, updated. debian/4.6.0-8-14-g493ba16

Wed May 1 18:42:47 UTC 2013

The following commit has been merged in the master branch:
commit 7ab0f296b24ab41884cb3b74e58be45225481d9d
Author: Anton Gladky <gladky.anton at gmail.com>
Date:   Wed May 1 11:12:17 2013 +0200

    Merge experimental branch.

diff --git a/debian/changelog b/debian/changelog
index 8db4c4c..750367d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+gnuplot (4.6.1-1~exp1) experimental; urgency=low
+
+  * [b6d2e38] Remove Bradley Smith <bradsmith at debian.org> from uploaders. 
+              (Closes: #674889)
+  * [2d56f4c] Imported Upstream version 4.6.1. (Closes: #689453)
+  * [6d9c716] Remove patches, applied by upstream. Refresh patches.
+  * [ca7a82b] Use compat-level 9.
+  * [2ad2237] Enable hardening=+all option.
+
+ -- Anton Gladky <gladky.anton at gmail.com>  Mon, 22 Oct 2012 18:30:54 +0200
+
 gnuplot (4.6.0-8) unstable; urgency=low
 
   * [cfaa0f9] Fix stop in batch mode. (Closes: #598547)
diff --git a/debian/compat b/debian/compat
index 45a4fb7..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-8
+9
diff --git a/debian/control b/debian/control
index 5203fc5..ae4e300 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian Science Team <debian-science-maintainers at lists.alioth.debian.
 Uploaders: Anton Gladky <gladky.anton at gmail.com>
 Standards-Version: 3.9.3
 DM-Upload-Allowed: yes
-Build-Depends: debhelper (>= 8.9.10), libpng-dev, libx11-dev, libxt-dev, 
+Build-Depends: debhelper (>= 9), libpng-dev, libx11-dev, libxt-dev, 
  pkg-config, texinfo, texlive-latex-base, texlive-latex-recommended, 
  texlive-latex-extra, liblua5.1-dev,
  zlib1g-dev, libgd2-noxpm-dev, libwxgtk2.8-dev, libcairo2-dev, 
diff --git a/debian/copyright b/debian/copyright
index 80737f4..686eed2 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,7 +1,5 @@
-Author:
- Thomas Williams
- Colin Kelley
-Download: http://gnuplot.sourceforge.net/
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Source: http://gnuplot.sourceforge.net/
 
 Files: *
 Copyright: Copyright 1986-1993, 1998, 2004 Thomas Williams, Colin Kelley
@@ -85,27 +83,3 @@ License: GPL-2+.
  WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
  or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  for more details.
-
-Files: debian/*
-Copyright: (C) 2008 Bradley Smith <brad at brad-smith.co.uk>
-License: MIT
- Permission is hereby granted, free of charge, to any person obtaining a
- copy of this software and associated documentation files (the "Software"),
- to deal in the Software without restriction, including without limitation
- the rights to use, copy, modify, merge, publish, distribute, sublicense,
- and/or sell copies of the Software, and to permit persons to whom the
- Software is furnished to do so, subject to the following conditions:
- .
- The above copyright notice and this permission notice shall be included in
- all copies or substantial portions of the Software.
- .
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- DEALINGS IN THE SOFTWARE.
-
-On Debian systems, the complete text of the GNU General Public License
-can be found in `/usr/share/common-licenses/GPL-2'.
diff --git a/debian/patches/06_fix_format_not_a_string.diff b/debian/patches/06_fix_format_not_a_string.diff
deleted file mode 100644
index 9948607..0000000
--- a/debian/patches/06_fix_format_not_a_string.diff
+++ /dev/null
@@ -1,33 +0,0 @@
-Description: Fix FTBFS "format not a string literal and no format arg"
-Author: Anton Gladky <gladky.anton at gmail.com>
-Last-Update: 2012-03-20
-
---- a/src/gplt_x11.c
-+++ b/src/gplt_x11.c
-@@ -2897,22 +2897,22 @@
- 
- 		    case PseudoColor:
- 			fprintf(stderr, ERROR_NOTICE("PseudoColor"));
--			fprintf(stderr, display_error_text_after);
-+			fprintf(stderr,"%s", display_error_text_after);
- 			break;
- 
- 		    case GrayScale:
- 			fprintf(stderr, ERROR_NOTICE("GrayScale"));
--			fprintf(stderr, display_error_text_after);
-+			fprintf(stderr,"%s", display_error_text_after);
- 			break;
- 
- 		    case StaticColor:
- 			fprintf(stderr, ERROR_NOTICE("StaticColor"));
--			fprintf(stderr, display_error_text_after);
-+			fprintf(stderr,"%s", display_error_text_after);
- 			break;
- 
- 		    case StaticGray:
- 			fprintf(stderr, ERROR_NOTICE("StaticGray"));
--			fprintf(stderr, display_error_text_after);
-+			fprintf(stderr,"%s", display_error_text_after);
- 			break;
- 
- 		    case DirectColor:
diff --git a/debian/rules b/debian/rules
index 498cb4a..3901132 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,6 +3,7 @@
 %:
 	dh $@ --parallel
 
+export DEB_BUILD_MAINT_OPTIONS := hardening=+all
 export DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 

-- 
Gnuplot. Interactive plotting program

