tags 485529 + patch
tags 515411 + patch
tags 529147 + patch
thanks

Dear maintainer,

I've prepared an NMU for x2vnc (versioned as 1.7.2-1.1). The diff
is attached to this message.

Regards.
diff -u x2vnc-1.7.2/debian/copyright x2vnc-1.7.2/debian/copyright
--- x2vnc-1.7.2/debian/copyright
+++ x2vnc-1.7.2/debian/copyright
@@ -1,4 +1,4 @@
-x2vnc was Written by Fredrik Hübinette <hu...@hubbe.net>
+x2vnc was Written by Fredrik Hübinette <hu...@hubbe.net>
 Based on ideas from x2x and code from vncviewer.
 
 It was packaged for use with Debian GNU/Linux by 
@@ -21,6 +21,9 @@
 and changing x2vnc so it links dynamically rather than statically
 with libvncauth.
 
+The code is:
+Copyright (C) 1997, 1998 Olivetti & Oracle Research Laboratory
+
 This is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2 of the License, or
diff -u x2vnc-1.7.2/debian/watch x2vnc-1.7.2/debian/watch
--- x2vnc-1.7.2/debian/watch
+++ x2vnc-1.7.2/debian/watch
@@ -1 +1,2 @@
-http://www.hubbe.net /~hubbe/ x2vnc-\(.*\)\.tar\.gz debian uupdate
+version=3
+http://fredrik.hubbe.net/x2vnc/x2vnc-\(.*\)\.tar\.gz debian uupdate
diff -u x2vnc-1.7.2/debian/control x2vnc-1.7.2/debian/control
--- x2vnc-1.7.2/debian/control
+++ x2vnc-1.7.2/debian/control
@@ -3,11 +3,12 @@
 Priority: optional
 Maintainer: Ola Lundqvist <o...@debian.org>
 Standards-Version: 3.6.2
-Build-Depends: debhelper (>= 4.0.0), libxaw7-dev, xutils, libx11-dev, 
libxinerama-dev, libxss-dev, x-dev
+Build-Depends: debhelper (>= 6), libxaw7-dev, xutils-dev, libx11-dev, 
libxinerama-dev, libxss-dev
+Homepage: http://fredrik.hubbe.net/x2vnc.html
 
 Package: x2vnc
 Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Suggests: vnc4server, xvnc4viewer, tightvncserver, xtightvncviewer
 Description: A dual-screen hack - link an MS-Windows and X display
  This program merges the capabilities of x2x and vncviewer.  It will allow a
diff -u x2vnc-1.7.2/debian/rules x2vnc-1.7.2/debian/rules
--- x2vnc-1.7.2/debian/rules
+++ x2vnc-1.7.2/debian/rules
@@ -8,9 +8,6 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-# This is the debhelper compatability version to use.
-export DH_COMPAT=4
-
 # This has to be exported to make some magic below work.
 export DH_OPTIONS
 
@@ -29,7 +26,7 @@
        dh_testroot
        rm -f build-stamp
 
-       -$(MAKE) clean
+       [ ! -f Makefile ] || $(MAKE) clean
 
        dh_clean Makefile
 
diff -u x2vnc-1.7.2/debian/changelog x2vnc-1.7.2/debian/changelog
--- x2vnc-1.7.2/debian/changelog
+++ x2vnc-1.7.2/debian/changelog
@@ -1,3 +1,15 @@
+x2vnc (1.7.2-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Correct build dependencies (Closes: #485529, #515411)
+  * Fix and upgrade watch file (Closes: #529147)
+  * Don't set  DH_COMPAT in rules
+  * Don't ignore errors by make clean
+  * Bump compat level to six
+  * Convert the copyright file to UTF-8
+
+ -- Raphael Geissert <geiss...@debian.org>  Wed, 08 Jul 2009 15:31:37 -0500
+
 x2vnc (1.7.2-1) unstable; urgency=low
 
   * New upstream release.
only in patch2:
unchanged:
--- x2vnc-1.7.2.orig/debian/compat
+++ x2vnc-1.7.2/debian/compat
@@ -0,0 +1 @@
+6



-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

Reply via email to