Merge lp:~laney/overlay-scrollbar/swap-depends into lp:overlay-scrollbar

Proposed by Iain Lane
Status: Merged
Approved by: Lars Karlitski
Approved revision: 394
Merged at revision: 394
Proposed branch: lp:~laney/overlay-scrollbar/swap-depends
Merge into: lp:overlay-scrollbar
Diff against target: 26 lines (+6/-3)
1 file modified
debian/control (+6/-3)
To merge this branch: bzr merge lp:~laney/overlay-scrollbar/swap-depends
Reviewer Review Type Date Requested Status
Lars Karlitski Approve
Sebastien Bacher (community) Approve
Review via email: mp+277726@code.launchpad.net

Commit message

Have the -gtk2 library depend on overlay-scrollbar. It contains gsettings schemas and configuration, so having it this way round is right.

To post a comment you must log in.
Revision history for this message
Sebastien Bacher (seb128) wrote :

sweat!

review: Approve
Revision history for this message
Sebastien Bacher (seb128) wrote :

(sweet even, but I don't have the lp power to approve it)

Revision history for this message
Lars Karlitski (larsu) wrote :

Sweaty!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/control'
--- debian/control 2015-06-04 08:48:33 +0000
+++ debian/control 2015-11-17 16:51:56 +0000
@@ -22,6 +22,7 @@
22Multi-Arch: same22Multi-Arch: same
23Depends: ${misc:Depends},23Depends: ${misc:Depends},
24 ${shlibs:Depends},24 ${shlibs:Depends},
25 overlay-scrollbar (= ${source:Version}),
25Replaces: liboverlay-scrollbar-0.2-0 (<< 0.2.16+r348),26Replaces: liboverlay-scrollbar-0.2-0 (<< 0.2.16+r348),
26 liboverlay-scrollbar-0.2-dev (<< 0.2.16+r348),27 liboverlay-scrollbar-0.2-dev (<< 0.2.16+r348),
27Conflicts: liboverlay-scrollbar-0.2-0 (<< 0.2.16+r348),28Conflicts: liboverlay-scrollbar-0.2-0 (<< 0.2.16+r348),
@@ -32,9 +33,11 @@
32Package: overlay-scrollbar33Package: overlay-scrollbar
33Section: libs34Section: libs
34Architecture: all35Architecture: all
35Depends: overlay-scrollbar-gtk2,36Depends: ${misc:Depends},
36 ${misc:Depends},
37Conflicts: overlay-scrollbar-gtk337Conflicts: overlay-scrollbar-gtk3
38Replaces: overlay-scrollbar-gtk338Replaces: overlay-scrollbar-gtk3
39Description: Scrollbar overlay39Description: Scrollbar overlay - configuration
40 Overlay scrollbar is a GtkModule enabling a dynamic overlay behavior.40 Overlay scrollbar is a GtkModule enabling a dynamic overlay behavior.
41 .
42 This package contains GSettings schemas and startup scripts for overlay
43 scrollbars.

Subscribers

People subscribed via source and target branches