r43964 - in /packages/wordnet/trunk/debian: changelog compat control patches/60_gcc-4.6.patch patches/series

[tille at users.alioth.debian.org]

Author: tille
Date: Mon Oct 24 18:36:52 2011
New Revision: 43964

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=43964
Log:
Patches to build when using -Werror=format-security (Closes: #646500)

Added:
    packages/wordnet/trunk/debian/patches/60_gcc-4.6.patch
Modified:
    packages/wordnet/trunk/debian/changelog
    packages/wordnet/trunk/debian/compat
    packages/wordnet/trunk/debian/control
    packages/wordnet/trunk/debian/patches/series

Modified: packages/wordnet/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/wordnet/trunk/debian/changelog?rev=43964&op=diff
==============================================================================
--- packages/wordnet/trunk/debian/changelog (original)
+++ packages/wordnet/trunk/debian/changelog Mon Oct 24 18:36:52 2011
@@ -1,3 +1,13 @@
+wordnet (1:3.0-26) UNRELEASED; urgency=low
+
+  * debian/patches/60_gcc-4.6.patch: Fix errors occuring when using gcc-4.6
+    with -Werror=format-security
+    Closes: #646500
+  * Fixed Vcs fields
+  * Debhelper 8 (control+compat)
+
+ -- Andreas Tille <tille at debian.org>  Mon, 24 Oct 2011 20:03:59 +0200
+
 wordnet (1:3.0-25) unstable; urgency=low
 
   * debian/control: Standards-Version: 3.9.2 (no changes needed)

Modified: packages/wordnet/trunk/debian/compat
URL: http://svn.debian.org/wsvn/debian-science/packages/wordnet/trunk/debian/compat?rev=43964&op=diff
==============================================================================
--- packages/wordnet/trunk/debian/compat (original)
+++ packages/wordnet/trunk/debian/compat Mon Oct 24 18:36:52 2011
@@ -1,1 +1,1 @@
-7
+8

Modified: packages/wordnet/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/wordnet/trunk/debian/control?rev=43964&op=diff
==============================================================================
--- packages/wordnet/trunk/debian/control (original)
+++ packages/wordnet/trunk/debian/control Mon Oct 24 18:36:52 2011
@@ -1,6 +1,6 @@
 Source: wordnet
 Section: text
-Build-Depends: cdbs (>= 0.4.23-1.1), autotools-dev, debhelper (>= 7), quilt,
+Build-Depends: cdbs (>= 0.4.23-1.1), autotools-dev, debhelper (>= 8), quilt,
  tk8.5-dev, tcl8.5-dev, libxaw7-dev, flex, dictzip, python, groff, gs-common,
  autoconf, automake, libtool, bison, man-db, libxss-dev, libxft-dev, ruby,
  imagemagick
@@ -10,8 +10,8 @@
 Uploaders: Andreas Tille <tille at debian.org>,
  Dmitry E. Oboukhov <unera at debian.org>
 Standards-Version: 3.9.2
-Vcs-Browser: http://svn.debian.org/wsvn/debian-science/packages/wordnet/trunk/?rev=0&sc=0
-Vcs-Svn: svn://svn.debian.org/svn/debian-science/packages/wordnet/trunk/
+Vcs-Browser: http://svn.debian.org/wsvn/debian-science/packages/wordnet/trunk/
+Vcs-Svn: svn://svn.debian.org/debian-science/packages/wordnet/trunk/
 Homepage: http://wordnet.princeton.edu/
 
 Package: wordnet

Added: packages/wordnet/trunk/debian/patches/60_gcc-4.6.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/wordnet/trunk/debian/patches/60_gcc-4.6.patch?rev=43964&op=file
==============================================================================
--- packages/wordnet/trunk/debian/patches/60_gcc-4.6.patch (added)
+++ packages/wordnet/trunk/debian/patches/60_gcc-4.6.patch Mon Oct 24 18:36:52 2011
@@ -1,0 +1,40 @@
+--- wordnet-3.0.orig/lib/binsrch.c
++++ wordnet-3.0/lib/binsrch.c
+@@ -193,7 +193,7 @@
+     copyfile(fp, tfp);
+     if (fseek(fp, offset, 0) == -1)
+ 	return(NULL);		/* could not seek to offset */
+-    fprintf(fp, new_line);	/* write line */
++    fputs(new_line, fp);	/* write line */
+     rewind(tfp);
+     copyfile(tfp, fp);
+ 
+@@ -220,7 +220,7 @@
+     copyfile(fp, tfp);
+     if (fseek(fp, offset, 0) == -1)
+ 	return(NULL);		/* could not seek to offset */
+-    fprintf(fp, new_line);	/* write line */
++    fputs(new_line, fp);	/* write line */
+     rewind(tfp);
+     copyfile(tfp, fp);
+ 
+--- wordnet-3.0.orig/src/wn.c
++++ wordnet-3.0/src/wn.c
+@@ -286,7 +286,7 @@
+ 	    printf("\t");
+ 	    printf(searchstr[j].template,
+ 		   partchars[dbase], partchars[dbase]);
+-	    printf(searchstr[j].helpstr);
++	    puts(searchstr[j].helpstr);
+ 	    printf("\n");
+ 	}
+ }
+@@ -347,7 +347,7 @@
+ 
+ static int error_message(char *msg)
+ {
+-    fprintf(stderr, msg);
++    fputs(msg, stderr);
+     return(0);
+ }
+ 

Modified: packages/wordnet/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/wordnet/trunk/debian/patches/series?rev=43964&op=diff
==============================================================================
--- packages/wordnet/trunk/debian/patches/series (original)
+++ packages/wordnet/trunk/debian/patches/series Mon Oct 24 18:36:52 2011
@@ -14,3 +14,4 @@
 51_overflows.patch
 51_overflows_memcpy.patch
 90_prevent_parallel_build.patch
+60_gcc-4.6.patch