tags 625330 + pending
thanks

Dear maintainer,

I've prepared an NMU for fileschanged (versioned as 0.6.5-1.2) and
uploaded it to DELAYED/2. Please feel free to tell me if I
should delay it longer.

Regards.

-- 
 .''`.   Homepage: http://info.comodo.priv.at/ - OpenPGP key ID: 0x8649AA06
 : :' :  Debian GNU/Linux user, admin, & developer - http://www.debian.org/
 `. `'   Member of VIBE!AT & SPI, fellow of Free Software Foundation Europe
   `-    NP: Ludwig Hirsch: I lieg am Ruckn
diff -u fileschanged-0.6.5/debian/rules fileschanged-0.6.5/debian/rules
--- fileschanged-0.6.5/debian/rules
+++ fileschanged-0.6.5/debian/rules
@@ -60,6 +60,7 @@
 	dh_installdirs
 
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/fileschanged
+	$(RM) -v $(CURDIR)/debian/fileschanged/usr/share/info/dir
 
 
 # Build architecture-independent files here.
diff -u fileschanged-0.6.5/debian/changelog fileschanged-0.6.5/debian/changelog
--- fileschanged-0.6.5/debian/changelog
+++ fileschanged-0.6.5/debian/changelog
@@ -1,3 +1,14 @@
+fileschanged (0.6.5-1.2) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Fix "ftbfs with gcc-4.6 -Werror": add patch 07_unused_variables.dpatch
+    from Ubuntu / Colin Watson:
+    - Avoid unused variable warnings so they don't cause build failures with
+      -Werror (closes: #625330, LP: #831209).
+  * Stop installing /usr/share/info/dir.gz (ftp-master autoreject reason).
+
+ -- gregor herrmann <[email protected]>  Sat, 15 Oct 2011 17:27:14 +0200
+
 fileschanged (0.6.5-1.1) unstable; urgency=low
 
   * Non-maintainer upload.
diff -u fileschanged-0.6.5/debian/patches/00list fileschanged-0.6.5/debian/patches/00list
--- fileschanged-0.6.5/debian/patches/00list
+++ fileschanged-0.6.5/debian/patches/00list
@@ -5,0 +6 @@
+07_unused_variables.dpatch
only in patch2:
unchanged:
--- fileschanged-0.6.5.orig/debian/patches/07_unused_variables.dpatch
+++ fileschanged-0.6.5/debian/patches/07_unused_variables.dpatch
@@ -0,0 +1,59 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 07_unused_variables.dpatch by Colin Watson <[email protected]>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: GCC 4.6 warns about unused variables, and fileschanged builds with
+## DP: -Werror, so deal with unused variable warnings.
+
+@DPATCH@
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' fileschanged-0.6.5~/src/filelist.c fileschanged-0.6.5/src/filelist.c
+--- fileschanged-0.6.5~/src/filelist.c	2006-04-19 20:42:28.000000000 +0100
++++ fileschanged-0.6.5/src/filelist.c	2011-09-14 01:17:40.000000000 +0100
+@@ -40,10 +40,9 @@
+ on_the_command_line (int (*process_file)(void *list, char *filename), void *list)
+ {
+   unsigned int i;
+-  int retval;
+   for(i = 0; i < arguments.arraylen; i++)
+     {
+-      retval = process_file (list, arguments.args[i]);
++      process_file (list, arguments.args[i]);
+     }
+   return 0;
+ }
+@@ -66,7 +65,6 @@
+   char *filename;
+   char *line = NULL;
+   size_t n = 0;
+-  int retval;
+   filename = arguments.fileschanged.filelist_filename;
+   if (strcmp (filename, "-") == 0)
+     fileptr = stdin;
+@@ -80,7 +78,7 @@
+     {
+       chop (line);
+       if (line[0] != '#')
+-	retval = process_file (list, line);
++	process_file (list, line);
+       free (line); line = NULL;
+       n = 0;
+     }
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' fileschanged-0.6.5~/src/monitor.c fileschanged-0.6.5/src/monitor.c
+--- fileschanged-0.6.5~/src/monitor.c	2006-04-19 20:42:29.000000000 +0100
++++ fileschanged-0.6.5/src/monitor.c	2011-09-14 01:17:23.000000000 +0100
+@@ -84,6 +84,7 @@
+ 	  retval = FAMMonitorDirectory (c, node->filename, &node->request,
+ 					(void *) node);
+ 	  //printf ("FAMMonitorDirectory returns %d (reqnum %d)\n", retval, node->request.reqnum);
++	  (void) retval;
+ 	}
+       else if (S_ISREG (node->statbuf.st_mode))
+ 	{
+@@ -91,6 +92,7 @@
+ 	  retval = FAMMonitorFile (c, node->filename, &node->request,
+ 				   (void *) node);
+ 	  //printf ("FAMMonitorFile returns %d (reqnum %d)\n", retval, node->request.reqnum);
++	  (void) retval;
+ 	}
+       monitor_handle_events (c, list, 0, 30);
+     }

Attachment: signature.asc
Description: Digital signature

Reply via email to