Ubuntu
indicator-sound package

Merge lp:~charlesk/ubuntu/quantal/indicator-sound/remove-gtk2 into lp:ubuntu/lucid/indicator-sound

  1. Quantal (12.10)
  2. remove-gtk2
  3. Merge into ubuntu
Proposed by Charles Kerr
Status: Rejected
Rejected by: Sebastien Bacher
Proposed branch: lp:~charlesk/ubuntu/quantal/indicator-sound/remove-gtk2
Merge into: lp:ubuntu/lucid/indicator-sound
Diff against target: 71 lines (+1/-22)
3 files modified
debian/control (+0/-15)
debian/indicator-sound-gtk2.install (+0/-1)
debian/rules (+1/-6)
To merge this branch: bzr merge lp:~charlesk/ubuntu/quantal/indicator-sound/remove-gtk2
Reviewer Review Type Date Requested Status
Sebastien Bacher Disapprove
Review via email: mp+116580@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Sebastien Bacher (seb128) wrote :

not sure what happened there, but we did drop gtk2 since, closing since it's deprecated

review: Disapprove

Unmerged revisions

141. By Charles Kerr

Remove gtk2 package and dependencies

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/control'
2--- debian/control 2012-02-09 21:49:44 +0000
3+++ debian/control 2012-07-25 04:04:20 +0000
4@@ -8,16 +8,12 @@
5 quilt,
6 autotools-dev,
7 libglib2.0-dev (>= 2.22.3),
8- libgtk2.0-dev (>= 2.12.0),
9 libgtk-3-dev,
10 libdbusmenu-glib-dev (>= 0.5.90),
11- libdbusmenu-gtk-dev (>= 0.5.90),
12 libdbusmenu-gtk3-dev (>= 0.5.90),
13- libindicator-dev (>= 0.3.90),
14 libindicator3-dev (>= 0.3.90),
15 libpulse-dev (>= 0.9.18),
16 libpulse-mainloop-glib0 (>= 0.9.18),
17- libido-0.1-dev (>= 0.1.11),
18 libido3-0.1-dev (>= 0.2.90),
19 libgee-dev,
20 libxml2-dev,
21@@ -35,14 +31,3 @@
22 Description: System sound indicator.
23 System sound indicator which provides easy control of the PulseAudio sound
24 daemon.
25-
26-Package: indicator-sound-gtk2
27-Architecture: any
28-Depends: ${shlibs:Depends},
29- ${misc:Depends},
30- indicator-sound (= ${binary:Version}),
31- pulseaudio
32-Replaces: indicator-sound (<< 0.7.1)
33-Description: System sound indicator.
34- System sound indicator which provides easy control of the PulseAudio sound
35- daemon.
36
37=== removed file 'debian/indicator-sound-gtk2.install'
38--- debian/indicator-sound-gtk2.install 2011-06-28 14:50:09 +0000
39+++ debian/indicator-sound-gtk2.install 1970-01-01 00:00:00 +0000
40@@ -1,1 +0,0 @@
41-debian/tmp/gtk2/usr/lib/indicators /usr/lib/
42
43=== modified file 'debian/rules'
44--- debian/rules 2012-01-24 22:17:40 +0000
45+++ debian/rules 2012-07-25 04:04:20 +0000
46@@ -1,7 +1,7 @@
47 #!/usr/bin/make -f
48
49 DEB_BUILDDIR = build
50-DEB_MAKE_FLAVORS = gtk2 gtk3
51+DEB_MAKE_FLAVORS = gtk3
52
53 include /usr/share/cdbs/1/rules/autoreconf.mk
54 include /usr/share/cdbs/1/rules/debhelper.mk
55@@ -10,16 +10,11 @@
56 DEB_MAKE_DESTDIRSKEL = $(CURDIR)/debian/tmp/@FLAVOR@
57 DEB_DESTDIR = $(CURDIR)/debian/tmp/$(cdbs_make_curflavor)/
58
59-DEB_CONFIGURE_FLAGS_gtk2 = --with-gtk=2
60-DEB_CONFIGURE_FLAGS_gtk3 = --with-gtk=3
61 DEB_CONFIGURE_EXTRA_FLAGS = --disable-static
62
63 CFLAGS += -Wno-error=deprecated-declarations
64 LDFLAGS += -Wl,-z,defs -Wl,--as-needed
65
66-debian/stamp-autotools/gtk2: cdbs_configure_flags += $(DEB_CONFIGURE_FLAGS_gtk2)
67-debian/stamp-autotools/gtk3: cdbs_configure_flags += $(DEB_CONFIGURE_FLAGS_gtk3)
68-
69 common-install-arch::
70 find debian/tmp -name \*.la -delete
71 find debian/tmp -name \*.a -delete

Subscribers

People subscribed via source and target branches

to all changes: