Import Debian changes 1:1.0-2

cflow (1:1.0-2) unstable; urgency=low

  * debian/control, debian/cflow.1, debian/copyright, debian/README.Debian:
    Changed my e-mail address.
  * debian/compat, debian/control, debian/rules: Newer debhelper version.
  * debian/copyright: Updated.
  * debian/watch: Added.
  * debian/control: Standards version.

8 files changed, 33 insertions, 11 deletions

diff --git a/debian/README.Debian b/debian/README.Debian
index 032fba5..9d96bc8 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -11,4 +11,4 @@ Packaged in Debian package cflow 1:1.0-1 and newer :
 http://www.gnu.org/software/cflow/
 http://savannah.gnu.org/projects/cflow
 
- -- Bart Martens <bart.martens@advalvas.be>, Fri, 17 Feb 2006 19:32:02 +0100
+ -- Bart Martens <bartm@knars.be>, Fri, 17 Feb 2006 19:32:02 +0100
diff --git a/debian/cflow.1 b/debian/cflow.1
index bc89d6b..43e1580 100644
--- a/debian/cflow.1
+++ b/debian/cflow.1
@@ -47,5 +47,5 @@ The Info system.
 .SH AUTHOR
 cflow was written by Sergey Poznyakoff <gray@mirddin.farlep.net>.
 .PP
-This manual page was written by Bart Martens <bart.martens@advalvas.be>,
+This manual page was written by Bart Martens <bartm@knars.be>,
 for the Debian project (but may be used by others).
diff --git a/debian/changelog b/debian/changelog
index 901bbd2..bf1d613 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+cflow (1:1.0-2) unstable; urgency=low
+
+  * debian/control, debian/cflow.1, debian/copyright, debian/README.Debian:
+    Changed my e-mail address.
+  * debian/compat, debian/control, debian/rules: Newer debhelper version.
+  * debian/copyright: Updated.
+  * debian/watch: Added.
+  * debian/control: Standards version.
+
+ -- Bart Martens <bartm@knars.be>  Tue, 13 Jun 2006 18:52:39 +0200
+
 cflow (1:1.0-1) unstable; urgency=low
 
   * New maintainer.  Closes: #353124.
diff --git a/debian/compat b/debian/compat
index b8626c4..7ed6ff8 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-4
+5
diff --git a/debian/control b/debian/control
index ffd09d4..b041681 100644
--- a/debian/control
+++ b/debian/control
@@ -1,9 +1,9 @@
 Source: cflow
 Section: devel
 Priority: optional
-Maintainer: Bart Martens <bart.martens@advalvas.be>
-Build-Depends: debhelper (>= 4.0.0), autotools-dev
-Standards-Version: 3.6.2
+Maintainer: Bart Martens <bartm@knars.be>
+Build-Depends: debhelper (>= 5), autotools-dev
+Standards-Version: 3.7.2
 
 Package: cflow
 Architecture: any
diff --git a/debian/copyright b/debian/copyright
index e6c7698..38ca237 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,11 +2,11 @@ This is the Debian GNU/Linux prepackaged version of cflow.
 
 This package was made by Dominik Kubla <Dominik.Kubla@Uni-Mainz.DE>.
 
-On 17 Feb 2006 Bart Martens <bart.martens@advalvas.be> replaced the packaged
+On 17 Feb 2006 Bart Martens <bartm@knars.be> replaced the packaged
 software by GNU cflow, downloaded here:
    http://www.gnu.org/software/cflow/
 
-Copyright Holder: Sergey Poznyakoff <gray@mirddin.farlep.net>.
+Copyright (C) 1994-2005, Sergey Poznyakoff <gray@mirddin.farlep.net>
 
 License:
 
@@ -27,3 +27,12 @@ License:
 On Debian systems, the complete text of the GNU General
 Public License can be found in `/usr/share/common-licenses/GPL'.
 
+The Debian packaging is
+   Copyright (C) 1996-1997, Dominik Kubla <dominik@debian.org>
+   Copyright (C) 1997, Ioannis Tambouras <ioannis@debian.org>
+   Copyright (C) 1998, Anthony Towns <ajt@debian.org>
+   Copyright (C) 2001-2003, Richard Braakman <dark@xs4all.nl>
+   Copyright (C) 2004, Sebastian Muszynski <do2ksm@linkt.de>
+   Copyright (C) 2006, Bart Martens <bartm@knars.be>
+and is licensed under the GPL, see above.
+
diff --git a/debian/rules b/debian/rules
index 1d437ae..e36705f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -27,7 +27,7 @@ endif
 config.status: configure
 	dh_testdir
 	# Add here commands to configure the package.
-	CFLAGS="$(CFLAGS) -Wl,-z,defs" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info
+	./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs"
 
 
 build: build-stamp
@@ -39,7 +39,7 @@ build-stamp:  config.status
 	$(MAKE)
 	#docbook-to-man debian/cflow.sgml > cflow.1
 
-	touch build-stamp
+	touch $@
 
 clean:
 	dh_testdir
@@ -86,6 +86,7 @@ binary-arch: build install
 #	dh_installemacsen
 #	dh_installpam
 #	dh_installmime
+#	dh_python
 #	dh_installinit
 #	dh_installcron
 #	dh_installinfo
@@ -95,7 +96,6 @@ binary-arch: build install
 	dh_compress
 	dh_fixperms
 #	dh_perl
-#	dh_python
 #	dh_makeshlibs
 	dh_installdeb
 	dh_shlibdeps
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 0000000..5d10d31
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,2 @@
+version=3
+ftp://download.gnu.org.ua/pub/release/cflow/cflow-(.*)\.tar\.gz debian uupdate