6 files changed, 14 insertions, 61 deletions
diff --git a/debian/changelog b/debian/changelog
index 33b6d09..ee38f1d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+zutils (1.0~rc6-1) experimental; urgency=low
+
+  * Merging upstream version 1.0~rc6.
+  * Updating years in copyright file.
+  * Dropping dpkg-source compression levels.
+  * Dropping filename.patch, not needed anymore.
+
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Tue, 26 Mar 2013 10:25:22 +0100
+
 zutils (0.9-7) unstable; urgency=low
 
   * Removing all references to my old email address.
diff --git a/debian/copyright b/debian/copyright
index 8dad0f4..1837552 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,11 +4,11 @@ Upstream-Contact: zutils-bug@nongnu.org
 Source: http://download.savannah.gnu.org/releases/zutils/
 
 Files: *
-Copyright: 2010-2012 Antonio Diaz Diaz <ant_diaz@teleline.es>
+Copyright: 2010-2013 Antonio Diaz Diaz <ant_diaz@teleline.es>
 License: GPL-3+
 
 Files: debian/*
-Copyright: 2009-2012 Daniel Baumann <mail@daniel-baumann.ch>
+Copyright: 2009-2013 Daniel Baumann <mail@daniel-baumann.ch>
 License: GPL-3+
 
 License: GPL-3+
diff --git a/debian/patches/01-filename.patch b/debian/patches/01-filename.patch
deleted file mode 100644
index e78113e..0000000
--- a/debian/patches/01-filename.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-Author: Antonio Diaz Diaz  <ant_diaz@teleline.es>
-Description:
- Make 'grep_show_name' tri-state so that file name is no prefixed to output by
- default when searching one file.
-
-diff -Naurp zutils.orig/doc/zutils.info zutils/doc/zutils.info
---- zutils.orig/doc/zutils.info	2012-12-10 11:18:56.507741935 +0100
-+++ zutils/doc/zutils.info	2012-12-10 11:21:49.519773976 +0100
-@@ -389,7 +389,8 @@ matches were found, and 2 means trouble.
- 
- `-h'
- `--no-filename'
--     Suppress the prefixing filename on output.
-+     Suppress the prefixing of filenames on output when multiple files
-+     are searched.
- 
- `-H'
- `--with-filename'
-diff -Naurp zutils.orig/doc/zutils.texinfo zutils/doc/zutils.texinfo
---- zutils.orig/doc/zutils.texinfo	2012-12-10 11:18:56.507741935 +0100
-+++ zutils/doc/zutils.texinfo	2012-12-10 11:21:49.519773976 +0100
-@@ -432,7 +432,8 @@ Treat @var{pattern} as a set of newline-
- 
- @item -h
- @itemx --no-filename
--Suppress the prefixing filename on output.
-+Suppress the prefixing of filenames on output when multiple files are
-+searched.
- 
- @item -H
- @itemx --with-filename
-diff -Naurp zutils.orig/main.cc zutils/main.cc
---- zutils.orig/main.cc	2012-12-10 11:18:56.507741935 +0100
-+++ zutils/main.cc	2012-12-10 11:21:49.519773976 +0100
-@@ -243,8 +243,8 @@ int main( const int argc, const char * c
-       return ( program_mode == m_zcat ) ? 1 : 2; }
- 
-   int argind = 0;
-+  int grep_show_name = -1;
-   bool grep_list = false;
--  bool grep_show_name = true;
-   bool grep_pattern_found = false;
-   for( ; argind < parser.arguments(); ++argind )
-     {
-@@ -350,6 +350,9 @@ int main( const int argc, const char * c
- 
-   if( filenames.empty() ) filenames.push_back("-");
- 
-+  if( grep_show_name < 0 && filenames.size() == 1 )
-+    grep_show_name = false;
-+
-   int retval = ( ( program_mode == m_zgrep ) ? 1 : 0 );
-   while( !filenames.empty() )
-     {
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 46f3936..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-01-filename.patch
diff --git a/debian/rules b/debian/rules
index 980300e..50c82da 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,8 +12,8 @@ override_dh_auto_install:
 	# removing unused files
 	rm -f debian/zutils/usr/share/info/dir*
 
+override_dh_builddeb:
+	dh_builddeb -- -Zxz
+
 override_dh_strip:
 	dh_strip --dbg-package=zutils-dbg
-
-override_dh_builddeb:
-	dh_builddeb -- -Zxz -z9
diff --git a/debian/source/options b/debian/source/options
index 22a4de9..5bd47b7 100644
--- a/debian/source/options
+++ b/debian/source/options
@@ -1,2 +1 @@
 compression = xz
-compression-level = 9