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
1=== modified file 'debian/changelog'
2--- debian/changelog 2012-09-29 20:47:10 +0000
3+++ debian/changelog 2012-11-23 23:47:05 +0000
4@@ -1,3 +1,9 @@
5+fglrx-installer (2:9.000-0ubuntu4) raring; urgency=low
6+
7+ * debian/control: add ${misc:Depends} depends as needed.
8+
9+ -- Benjamin Kerensa <bkerensa@ubuntu.com> Fri, 23 Nov 2012 15:17:12 -0800
10+
11 fglrx-installer (2:9.000-0ubuntu3) quantal; urgency=low
12
13 * debian/rules:
14
15=== modified file 'debian/control'
16--- debian/control 2012-09-10 14:00:35 +0000
17+++ debian/control 2012-11-23 23:47:05 +0000
18@@ -25,7 +25,7 @@
19 Package: fglrx
20 Architecture: amd64 i386
21 Recommends: fglrx-amdcccle
22-Depends: ${shlibs:Depends}, xserver-xorg-core, lib32gcc1 [amd64], libc6-i386 [amd64], dkms, make, linux-libc-dev,
23+Depends: ${shlibs:Depends}, ${misc:Depends}, xserver-xorg-core, lib32gcc1 [amd64], libc6-i386 [amd64], dkms, make, linux-libc-dev,
24 linux-headers-generic | linux-headers,
25 ${xviddriver:Depends}
26 Provides: fglrx-driver, nvidia-current, nvidia-current-updates, nvidia-experimental,
27@@ -49,7 +49,7 @@
28
29 Package: fglrx-dev
30 Architecture: amd64 i386
31-Depends: fglrx
32+Depends: fglrx, ${misc:Depends}
33 Conflicts: fglrx-driver-dev, xfree86-driver-fglrx-dev
34 Replaces: fglrx-driver-dev, xfree86-driver-fglrx-dev, xorg-driver-fglrx-dev, fglrx-updates-dev
35 Provides: fglrx-driver-dev
36@@ -60,7 +60,7 @@
37
38 Package: fglrx-amdcccle
39 Architecture: amd64 i386
40-Depends: fglrx, ${shlibs:Depends}
41+Depends: fglrx, ${shlibs:Depends}, ${misc:Depends}
42 Conflicts: fglrx-control-qt2, fglrx-control
43 Replaces: fglrx-control, fglrx-amdcccle-updates
44 Provides: fglrx-control

Subscribers

People subscribed via source and target branches