Hi, while preparing an NMU for xosd #495246 I tried to pick some of the low hanging fruits and the diff got slightly big now. So I'm asking if you'd like to get the whole patch with the following changelog (debdiff attached) or only the bugfixes?
xosd (2.2.14-1.6) unstable; urgency=low . * Non-maintainer upload. * Replace pseudo dynamic Build-Conflict on libxosd-dev with an explicit one on libxosd-dev << 2.2.14 which is the current source:Version. Closes: #495246 * Replace Source-Version with source:Version for libxosd-dev Depends. * Replace the pseudo Homepage field with the real one. * Change the Homepage from http://www.ignavus.net/software.html to http://libxosd.sourceforge.net which offers a link for the current source download and the old website. * Remove Suggests: xfonts-base-transcoded from libxosd2. Closes: #370034 * Updated the copyright file to reflect the website where you can obtain the source code and the license used. Sven -- If God passed a mic to me to speak I'd say stay in bed, world Sleep in peace [The Cardigans - 03:45: No sleep]
diff -u xosd-2.2.14/debian/changelog xosd-2.2.14/debian/changelog --- xosd-2.2.14/debian/changelog +++ xosd-2.2.14/debian/changelog @@ -1,3 +1,20 @@ +xosd (2.2.14-1.6) unstable; urgency=low + + * Non-maintainer upload. + * Replace pseudo dynamic Build-Conflict on libxosd-dev with an explicit + one on libxosd-dev << 2.2.14 which is the current source:Version. + Closes: #495246 + * Replace Source-Version with source:Version for libxosd-dev Depends. + * Replace the pseudo Homepage field with the real one. + * Change the Homepage from http://www.ignavus.net/software.html to + http://libxosd.sourceforge.net which offers a link for the current + source download and the old website. + * Remove Suggests: xfonts-base-transcoded from libxosd2. Closes: #370034 + * Updated the copyright file to reflect the website where you can obtain + the source code and the license used. + + -- Sven Hoexter <[EMAIL PROTECTED]> Mon, 25 Aug 2008 09:34:31 +0200 + xosd (2.2.14-1.5) unstable; urgency=low * Non-maintainer upload. diff -u xosd-2.2.14/debian/copyright xosd-2.2.14/debian/copyright --- xosd-2.2.14/debian/copyright +++ xosd-2.2.14/debian/copyright @@ -5,8 +5,11 @@ -It was downloaded from http://www.ignavus.net/software.html +It was downloaded from http://libxosd.sourceforge.net Upstream author: Andre Renaud <[EMAIL PROTECTED]> Maintainer: Tim Wright <[EMAIL PROTECTED]> Copyright: - -See /usr/share/common-licenses/GPL +Copyright 2000, 2001 Andre Renaud ([EMAIL PROTECTED]) +This package is licensed under the GPL version 2 or any +later version. +On a Debian system you can find the licence text in +/usr/share/common-licenses/GPL-2. diff -u xosd-2.2.14/debian/control xosd-2.2.14/debian/control --- xosd-2.2.14/debian/control +++ xosd-2.2.14/debian/control @@ -3,8 +3,10 @@ Priority: optional Maintainer: Philipp Matthias Hahn <[EMAIL PROTECTED]> Build-Depends: libgtk1.2-dev, libtool, debhelper (>= 4.1.0), libgdk-pixbuf-dev, libx11-dev, libxext-dev, x11proto-core-dev, x11proto-xinerama-dev, x11proto-xext-dev, libxinerama-dev, cdbs -Build-Conflicts: libxosd-dev (<< ${Source-Version}) +Build-Conflicts: libxosd-dev (<< 2.2.14) Standards-Version: 3.6.1.1 +Homepage: http://libxosd.sourceforge.net + Package: libxosd2 Section: libs @@ -12,16 +14,13 @@ Depends: ${shlibs:Depends} Conflicts: libxosd Replaces: libxosd, libxosd0 -Suggests: xfonts-base-transcoded Description: X On-Screen Display library - runtime A library for displaying a TV-like on-screen display in X. - . - Homepage: http://www.ignavus.net/software.html Package: libxosd-dev Section: libdevel Architecture: any -Depends: libxosd2 (= ${Source-Version}), libx11-dev, libxext-dev, ${shlibs:Depends}, libxinerama-dev +Depends: libxosd2 (= ${source:Version}), libx11-dev, libxext-dev, ${shlibs:Depends}, libxinerama-dev Conflicts: libxosd Description: X On-Screen Display library - development A library for displaying a TV-like on-screen display in X. @@ -39,3 +37,0 @@ - . - Homepage: http://www.ignavus.net/software.html -