Application Indicators

Merge lp:~indicator-applet-developers/indicator-application/lucid into lp:~ubuntu-desktop/indicator-application/ubuntu

  1. lucid
  2. Merge into ubuntu
Proposed by Ted Gould
Status: Merged
Merged at revision: not available
Proposed branch: lp:~indicator-applet-developers/indicator-application/lucid
Merge into: lp:~ubuntu-desktop/indicator-application/ubuntu
Diff against target: 161 lines (+49/-18)
6 files modified
bindings/mono/appindicator-sharp-0.1.pc.in (+1/-1)
debian/changelog (+25/-0)
debian/control (+9/-6)
debian/libappindicator0.0-cil.install (+1/-1)
debian/libappindicator0.0-cil.installcligac (+1/-1)
debian/rules (+12/-9)
To merge this branch: bzr merge lp:~indicator-applet-developers/indicator-application/lucid
Reviewer Review Type Date Requested Status
Sebastien Bacher Pending
Review via email: mp+23591@code.launchpad.net

Description of the change

Package rename for mono bindings. From #ubuntu-devel:

(04:59:14 PM) slangasek: tedg: indicator-application> yes, seems reasonable here, please go ahead
(05:00:00 PM) Ted: Yeah! slangasek thinks I'm reasonable! ;)
(05:00:04 PM) Ted: slangasek: Thanks, will do.
(05:00:35 PM) bryceh: tedg, well that's just weird

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bindings/mono/appindicator-sharp-0.1.pc.in'
2--- bindings/mono/appindicator-sharp-0.1.pc.in 2009-12-16 21:15:52 +0000
3+++ bindings/mono/appindicator-sharp-0.1.pc.in 2010-04-16 22:30:42 +0000
4@@ -1,7 +1,7 @@
5 prefix=@prefix@
6 exec_prefix=@exec_prefix@
7 libdir=@libdir@
8-assemblies_dir=${libdir}/appindicator-sharp-0.1
9+assemblies_dir=${libdir}/cli/appindicator-sharp-0.0
10
11 Name: appindicator-sharp
12 Description: application indicators for .NET
13
14=== modified file 'debian/changelog'
15--- debian/changelog 2010-04-14 21:20:45 +0000
16+++ debian/changelog 2010-04-16 22:30:42 +0000
17@@ -1,3 +1,28 @@
18+indicator-application (0.0.19-0ubuntu4) UNRELEASED; urgency=low
19+
20+ * bindings/mono/appindicator-sharp-0.1.pc.in:
21+ + Fix pcfile to point to library install location (LP: #564506)
22+ * debian/control,
23+ debian/libappindicator0-cil.install,
24+ debian/libappindicator0-cil.installcligac,
25+ debian/libappindicator-cil-dev.install,
26+ debian/libappindicator0.0-cil.install,
27+ debian/libappindicator0.0-cil.installcligac,
28+ debian/libappindicator0.1-cil-dev.install:
29+ + Rename packages to comply with Debian CLI policy
30+ * debian/libappindicator0.0-cil.install,
31+ debian/libappindicator0.0-cil.installcligac:
32+ + Fix library install location to comply with Debian CLI policy
33+ * debian/control,
34+ debian/rules:
35+ + Pass CSC variable to use mono-csc default compiler from mono-devel
36+ 2.4.3, rather than the default 2.0-only compiler
37+ * debian/rules:
38+ + Fix processing of rules to track dependency information on Mono
39+ binding, by running rules in correct order
40+
41+ -- Jo Shields <directhex@apebox.org> Fri, 16 Apr 2010 10:42:48 +0100
42+
43 indicator-application (0.0.19-0ubuntu3) lucid; urgency=low
44
45 * Merging patch to add assembly information to Mono binding (LP: #547195)
46
47=== modified file 'debian/control'
48--- debian/control 2010-04-14 13:43:40 +0000
49+++ debian/control 2010-04-16 22:30:42 +0000
50@@ -20,7 +20,7 @@
51 libdbusmenu-gtk-dev (>= 0.2.2),
52 libdbusmenu-glib-dev (>= 0.2.2),
53 cli-common-dev (>= 0.5.7),
54- mono-devel (>= 2.0.1),
55+ mono-devel (>= 2.4.3),
56 gtk-sharp2-gapi,
57 libmono-dev,
58 libnunit-cil-dev,
59@@ -87,26 +87,29 @@
60 .
61 This package contains developer documentation.
62
63-Package: libappindicator0-cil
64+Package: libappindicator0.0-cil
65 Section: cli-mono
66 Architecture: all
67+Replaces: libappindicator0-cil (<= 0.0.19-0ubuntu4~)
68+Conflicts: libappindicator0-cil (<= 0.0.19-0ubuntu4~)
69 Depends: ${shlibs:Depends},
70 ${misc:Depends},
71- ${cli:Depends},
72- libappindicator0 (>= ${source:Version})
73+ ${cli:Depends}
74 Description: CLI bindings for libappindicator
75 This package provides the appindicator-sharp assembly that allows CLI (.NET)
76 programs to take menus from applications and place them in the panel.
77 .
78 This package contains assemblies to be used by applications.
79
80-Package: libappindicator-cil-dev
81+Package: libappindicator0.1-cil-dev
82 Section: libdevel
83 Architecture: all
84+Replaces: libappindicator-cil-dev (<= 0.0.19-0ubuntu4~)
85+Conflicts: libappindicator-cil-dev (<= 0.0.19-0ubuntu4~)
86 Depends: ${shlibs:Depends},
87 ${misc:Depends},
88 ${cli:Depends},
89- libappindicator0-cil (= ${binary:Version})
90+ libappindicator0.0-cil (= ${binary:Version})
91 Description: Application Indicators
92 A library and indicator to take menus from applications and place them in
93 the panel.
94
95=== renamed file 'debian/libappindicator0-cil.install' => 'debian/libappindicator0.0-cil.install'
96--- debian/libappindicator0-cil.install 2010-04-14 13:43:40 +0000
97+++ debian/libappindicator0.0-cil.install 2010-04-16 22:30:42 +0000
98@@ -1,1 +1,1 @@
99-debian/tmp/usr/lib/appindicator-sharp-0.1 /usr/lib/cli
100+debian/tmp/usr/lib/appindicator-sharp-0.1/* /usr/lib/cli/appindicator-sharp-0.0
101
102=== renamed file 'debian/libappindicator0-cil.installcligac' => 'debian/libappindicator0.0-cil.installcligac'
103--- debian/libappindicator0-cil.installcligac 2010-04-14 13:43:40 +0000
104+++ debian/libappindicator0.0-cil.installcligac 2010-04-16 22:30:42 +0000
105@@ -1,1 +1,1 @@
106-/usr/lib/cli/appindicator-sharp-0.1/appindicator-sharp.dll
107+/usr/lib/cli/appindicator-sharp-0.0/appindicator-sharp.dll
108
109=== renamed file 'debian/libappindicator-cil-dev.install' => 'debian/libappindicator0.1-cil-dev.install'
110=== modified file 'debian/rules'
111--- debian/rules 2010-04-14 13:43:40 +0000
112+++ debian/rules 2010-04-16 22:30:42 +0000
113@@ -3,6 +3,7 @@
114 DEB_PYTHON_SYSTEM=pycentral
115 PY_VERSIONS = $(shell pyversions --requested debian/control)
116 export MONO_SHARED_DIR=$(CURDIR)
117+export CSC=/usr/bin/mono-csc
118
119 include /usr/share/cdbs/1/rules/debhelper.mk
120 include /usr/share/cdbs/1/class/autotools-vars.mk
121@@ -12,6 +13,8 @@
122 DEB_CONFIGURE_EXTRA_FLAGS += --enable-gtk-doc
123 API_VERSION = 0.1
124
125+DEB_DH_MAKESHLIBS_ARGS_libappindicator0 := -V 'libappindicator0 (>= 0.0.19)'
126+
127 configure-stamp-%:
128 mkdir build-$*
129 cd build-$* && PYTHON=`which $*` \
130@@ -35,6 +38,15 @@
131 binary-install/python-appindicator::
132 dh_pycentral
133
134+binary-install/libappindicator0.0-cil::
135+ dh_clistrip
136+ dh_clifixperms
137+ dh_makeclilibs -V
138+ dh_installcligac
139+
140+binary-predeb/libappindicator0.0-cil:: binary-fixup/libappindicator0
141+ dh_clideps -plibappindicator0.0-cil
142+
143 configure-stamp:
144 $(DEB_CONFIGURE_SCRIPT) $(DEB_CONFIGURE_NORMAL_ARGS) $(DEB_CONFIGURE_EXTRA_FLAGS)
145 touch $@
146@@ -57,15 +69,6 @@
147 find debian/indicator-application/usr/lib -name \*.la -exec rm {} \;
148 find debian/indicator-application/usr/lib -name \*.a -exec rm {} \;
149
150-binary-fixup/libappindicator0-cil::
151- dh_clifixperms
152-
153-binary-predeb/libappindicator0-cil::
154- dh_makeclilibs -m $(API_VERSION)
155- dh_installcligac
156- dh_clideps
157-
158-
159 common-binary-predeb-arch:: list-missing
160
161 clean::

Subscribers

People subscribed via source and target branches

to all changes: