Merge lp:~brian-murray/jockey/brian into lp:ubuntu/karmic/jockey

[Brian Murray]

[Martin Pitt (pitti)]

$ bzr merge lp:~brian-murray/jockey/brian
bzr: ERROR: Branches have no common ancestor, and no merge base revision was specified.

I pick the change manually. Seems you didn't base on Vcs-Bzr, but perhaps on the auto-imports?

review: Approve

[Martin Pitt (pitti)]

See bug report.

review: Needs Information

Unmerged revisions

70. By Brian Murray on 2009-10-22

Depend on nvidia-common as NvidiaDetector is imported unconditionally
(LP: #438791)

=== modified file 'debian/changelog'
--- debian/changelog	2009-10-02 13:27:28 +0000
+++ debian/changelog	2009-10-22 01:40:21 +0000
@@ -1,3 +1,10 @@
+jockey (0.5.5-0ubuntu2) karmic; urgency=low
+
+  * Depend on nvidia-common as NvidiaDetector is imported unconditionally
+    (LP: #438791)
+
+ -- Brian Murray <[e-mail]>  Wed, 21 Oct 2009 17:16:37 -0700
+
 jockey (0.5.5-0ubuntu1) karmic; urgency=low
 
   * New upstream bug fix release:
 
=== modified file 'debian/control'
--- debian/control	2009-07-14 17:42:12 +0000
+++ debian/control	2009-10-22 01:40:21 +0000
@@ -13,8 +13,9 @@
 Package: jockey-common
 Architecture: all
 XB-Python-Version: ${python:Versions}
-Depends: ${python:Depends}, python-xdg, python-xkit, python-dbus, python-apt, policykit-1
-Recommends: nvidia-common, fglrx-modaliases, bcmwl-modaliases
+Depends: ${python:Depends}, python-xdg, python-xkit, python-dbus, python-apt, 
+ policykit-1, nvidia-common
+Recommends: fglrx-modaliases, bcmwl-modaliases
 Description: user interface and desktop integration for driver management
  Jockey provides a user interface for configuring third-party drivers,
  such as the Nvidia and ATI fglrx X.org and various Wireless LAN