lp:~mvo/jockey/mvo

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:jockey

Martin Pitt (community): Approve on 2010-12-01

Diff: 3113 lines (+2474/-222)

34 files modified

.bzr-builddeb/default.conf (+2/-0)
data/handlers/broadcom_wl.py (+54/-0)
data/handlers/dvb_usb_firmware.py (+51/-0)
data/handlers/fglrx.py (+51/-2)
data/handlers/nvidia.py (+103/-30)
data/modaliases/b43 (+2/-0)
data/modaliases/disable-upstream-nvidia (+6/-0)
debian/apport_hook.py (+20/-0)
debian/changelog (+1363/-0)
debian/compat (+1/-0)
debian/control (+67/-0)
debian/copyright (+25/-0)
debian/debhelper/dh_modaliases (+149/-0)
debian/debhelper/modaliases.pm (+11/-0)
debian/debhelper/test_dh_modaliases (+74/-0)
debian/dh-modaliases.install (+2/-0)
debian/jockey-common.dirs (+1/-0)
debian/jockey-common.install (+11/-0)
debian/jockey-common.logrotate (+9/-0)
debian/jockey-common.postinst (+28/-0)
debian/jockey-common.postrm (+7/-0)
debian/jockey-gtk.install (+5/-0)
debian/jockey-kde.install (+5/-0)
debian/jockey.ubiquity (+14/-0)
debian/pycompat (+1/-0)
debian/rules (+24/-0)
debian/source/format (+1/-0)
debian/watch (+2/-0)
do-release (+0/-39)
jockey/oslib.py (+291/-117)
jockey/ui.py (+5/-6)
kde/jockey-kde (+10/-1)
kde/jockey-kde.desktop.in (+1/-0)
tests/oslib.py (+78/-27)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

452. By Michael Vogt on 2010-12-01

* jockey/oslib.py:
  - fix crash if a given package has no candidate version

451. By Martin Pitt on 2010-11-25

releasing version 0.6-0ubuntu2

450. By Martin Pitt on 2010-11-25

debian/control: Drop bcmwl-modaliases recommends, it's replaced with
a package header now.

449. By Martin Pitt on 2010-11-25

releasing version 0.6-0ubuntu1

448. By Martin Pitt on 2010-11-25

debian/rules: Drop simple-patchsys.mk, we don't need it (patches are
inline, maintained in bzr).

447. By Martin Pitt on 2010-11-25

New upstream release 0.6:

446. By Martin Pitt on 2010-11-25

jockey/oslib.py: Change deprecated apt.apt_pkg.Config.Set() to .set().

445. By Martin Pitt on 2010-11-25

* Add support for putting modalias definitions in driver package's
  debian/control, so that we can replace the /usr/share/jockey/modaliases/*
  lists with lookups in the package database (see blueprint
  hardware-desktop-n-package-field-modaliases). With this we can drop the
  foo-modaliases packages, and shipping third-party driver packages will
  just work in Jockey without any further integration.
  - Add debian/debhelper/dh_jockey: Debhelper program to produce a
    ${modaliases} substvar from scanning .ko files or
    debian/packagename.modaliases.
  - Add debian/debhelper/test_dh_jockey: Automatic test script for
    dh_jockey.
  - Add debian/debhelper/modaliases.pm: dh_auto sequencer for dh_modaliases.
  - debian/control: Add dh-modaliases package.
  - debian/dh-modaliases.install: Install dh_modaliases and modaliases.pm.
  - debian/rules: Create manpage from dh_modaliases POD.
  - jockey/oslib.py: Add apt implementation for package_header_modaliases().
  - tests/oslib.py: Add test case for our package_header_modaliases()
    implementation. This only really tests anything if there is at least one
    package with a "Modaliases:" field in the local apt repository.

444. By Martin Pitt on 2010-11-25

merge from trunk: Add support and test case for reading modaliases from package headers

443. By Martin Pitt on 2010-11-25

* Merge changes from trunk:
  - Put back "Additional Drivers" progress window title. Thanks Bilal
    Akhtar! (LP: #323815)
  - jockey/detection.py, get_hardware(): Disable printer detection.
    cupshelpers.getDevices() is excruciatingly slow (about 15 seconds), and
    jockey is not normally used directly to install printer drivers.
    Instead, system-config-printer picks up new printers, and calls jockey
    with the device ID, so jockey does not need to detect printers by
    itself.
  - jockey-kde: Use runtime .ui loading instead of pykdeuic4; the latter
    just keeps breaking.
  - gtk/jockey-gtk.ui: Drop obsolete has_separator property; Explicitly set
    topmost GtkVBox fill property to True, as the default changed in GTK 3.0
    (GNOME #634592)
  - Various test suite fixes.
* debian/control: Drop now obsolete python-{qt4,kde}* build dependencies.
* debian/jockey-kde.install: Install the KDE *.ui files.