Merge lp:~bkerensa/ubuntu/raring/fglrx-installer/depends-fix1 into lp:ubuntu/raring/fglrx-installer

Proposed by Benjamin Kerensa
Status: Merged
Merge reported by: Alberto Milone
Merged at revision: not available
Proposed branch: lp:~bkerensa/ubuntu/raring/fglrx-installer/depends-fix1
Merge into: lp:ubuntu/raring/fglrx-installer
Diff against target: 44 lines (+9/-3)
2 files modified
debian/changelog (+6/-0)
debian/control (+3/-3)
To merge this branch: bzr merge lp:~bkerensa/ubuntu/raring/fglrx-installer/depends-fix1
Reviewer Review Type Date Requested Status
Alberto Milone Approve
Ubuntu branches Pending
Review via email: mp+135993@code.launchpad.net

Description of the change

Added ${misc:Depends} to debian/control.

To post a comment you must log in.
Revision history for this message
Alberto Milone (albertomilone) wrote :

Thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/changelog'
--- debian/changelog 2012-09-29 20:47:10 +0000
+++ debian/changelog 2012-11-23 23:47:05 +0000
@@ -1,3 +1,9 @@
1fglrx-installer (2:9.000-0ubuntu4) raring; urgency=low
2
3 * debian/control: add ${misc:Depends} depends as needed.
4
5 -- Benjamin Kerensa <bkerensa@ubuntu.com> Fri, 23 Nov 2012 15:17:12 -0800
6
1fglrx-installer (2:9.000-0ubuntu3) quantal; urgency=low7fglrx-installer (2:9.000-0ubuntu3) quantal; urgency=low
28
3 * debian/rules:9 * debian/rules:
410
=== modified file 'debian/control'
--- debian/control 2012-09-10 14:00:35 +0000
+++ debian/control 2012-11-23 23:47:05 +0000
@@ -25,7 +25,7 @@
25Package: fglrx25Package: fglrx
26Architecture: amd64 i38626Architecture: amd64 i386
27Recommends: fglrx-amdcccle27Recommends: fglrx-amdcccle
28Depends: ${shlibs:Depends}, xserver-xorg-core, lib32gcc1 [amd64], libc6-i386 [amd64], dkms, make, linux-libc-dev,28Depends: ${shlibs:Depends}, ${misc:Depends}, xserver-xorg-core, lib32gcc1 [amd64], libc6-i386 [amd64], dkms, make, linux-libc-dev,
29 linux-headers-generic | linux-headers,29 linux-headers-generic | linux-headers,
30 ${xviddriver:Depends}30 ${xviddriver:Depends}
31Provides: fglrx-driver, nvidia-current, nvidia-current-updates, nvidia-experimental,31Provides: fglrx-driver, nvidia-current, nvidia-current-updates, nvidia-experimental,
@@ -49,7 +49,7 @@
4949
50Package: fglrx-dev50Package: fglrx-dev
51Architecture: amd64 i38651Architecture: amd64 i386
52Depends: fglrx52Depends: fglrx, ${misc:Depends}
53Conflicts: fglrx-driver-dev, xfree86-driver-fglrx-dev53Conflicts: fglrx-driver-dev, xfree86-driver-fglrx-dev
54Replaces: fglrx-driver-dev, xfree86-driver-fglrx-dev, xorg-driver-fglrx-dev, fglrx-updates-dev54Replaces: fglrx-driver-dev, xfree86-driver-fglrx-dev, xorg-driver-fglrx-dev, fglrx-updates-dev
55Provides: fglrx-driver-dev55Provides: fglrx-driver-dev
@@ -60,7 +60,7 @@
6060
61Package: fglrx-amdcccle61Package: fglrx-amdcccle
62Architecture: amd64 i38662Architecture: amd64 i386
63Depends: fglrx, ${shlibs:Depends}63Depends: fglrx, ${shlibs:Depends}, ${misc:Depends}
64Conflicts: fglrx-control-qt2, fglrx-control64Conflicts: fglrx-control-qt2, fglrx-control
65Replaces: fglrx-control, fglrx-amdcccle-updates65Replaces: fglrx-control, fglrx-amdcccle-updates
66Provides: fglrx-control66Provides: fglrx-control

Subscribers

People subscribed via source and target branches