[pkg-boinc-commits] r544 - in /trunk/kboincspy/debian: changelog control control.in copyright

[fst-guest at users.alioth.debian.org]

Author: fst-guest
Date: Sun Oct 22 20:18:41 2006
New Revision: 544

URL: http://svn.debian.org/wsvn/pkg-boinc/?sc=1&rev=544
Log:
Removed nvidia-glx from Build-Conflicts because #208198 was fixed. I don't
changed this to a versioned B-C because this problem will not be present in the
soon to be released Debian/stable and I don't like to carry such cruft with me.

Modified:
    trunk/kboincspy/debian/changelog
    trunk/kboincspy/debian/control
    trunk/kboincspy/debian/control.in
    trunk/kboincspy/debian/copyright

Modified: trunk/kboincspy/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-boinc/trunk/kboincspy/debian/changelog?rev=544&op=diff
==============================================================================
--- trunk/kboincspy/debian/changelog (original)
+++ trunk/kboincspy/debian/changelog Sun Oct 22 20:18:41 2006
@@ -4,11 +4,13 @@
   * Added Russian translation (ru.po) from upstream's SVN.
   * Fixed typo in manpage and added more generic options to it.
   * debian/control.in:
+    - Removed nvidia-glx from Build-Conflicts because #208198 was fixed in
+      nvidia-graphics-drivers/1.0.8774-4.
     - Added XS-Vcs-Svn field to the source stanza.
   * debian/copyright:
     - Added copyright note about the Debian packaging.
 
- -- Frank S. Thomas <frank at thomas-alfeld.de>  Sat, 23 Sep 2006 07:57:50 +0200
+ -- Frank S. Thomas <frank at thomas-alfeld.de>  Sun, 22 Oct 2006 22:11:10 +0200
 
 kboincspy (0.9.1-3) unstable; urgency=medium
 

Modified: trunk/kboincspy/debian/control
URL: http://svn.debian.org/wsvn/pkg-boinc/trunk/kboincspy/debian/control?rev=544&op=diff
==============================================================================
--- trunk/kboincspy/debian/control (original)
+++ trunk/kboincspy/debian/control Sun Oct 22 20:18:41 2006
@@ -3,7 +3,6 @@
 Priority: optional
 Maintainer: Frank S. Thomas <frank at thomas-alfeld.de>
 Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 4.2.0), patchutils (>= 0.2.25), autotools-dev, libtool, autoconf (>= 2.52), automake1.9, kdelibs4-dev (>= 4:3.3.0), libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, docbook2x, docbook-xml
-Build-Conflicts: nvidia-glx
 Standards-Version: 3.7.2
 XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-boinc/trunk/kboincspy
 

Modified: trunk/kboincspy/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-boinc/trunk/kboincspy/debian/control.in?rev=544&op=diff
==============================================================================
--- trunk/kboincspy/debian/control.in (original)
+++ trunk/kboincspy/debian/control.in Sun Oct 22 20:18:41 2006
@@ -3,7 +3,6 @@
 Priority: optional
 Maintainer: Frank S. Thomas <frank at thomas-alfeld.de>
 Build-Depends: @cdbs@, autotools-dev, libtool, autoconf (>= 2.52), automake1.9, kdelibs4-dev (>= 4:3.3.0), libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, docbook2x, docbook-xml
-Build-Conflicts: nvidia-glx
 Standards-Version: 3.7.2
 XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-boinc/trunk/kboincspy
 

Modified: trunk/kboincspy/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-boinc/trunk/kboincspy/debian/copyright?rev=544&op=diff
==============================================================================
--- trunk/kboincspy/debian/copyright (original)
+++ trunk/kboincspy/debian/copyright Sun Oct 22 20:18:41 2006
@@ -62,7 +62,7 @@
    and with no Back-Cover Texts.
 
    A copy of the GNU Free Documentation License (Version 1.2) is
-   included below: 
+   included below:
 
 
                    GNU Free Documentation License