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
=== modified file 'bindings/mono/appindicator-sharp-0.1.pc.in'
--- bindings/mono/appindicator-sharp-0.1.pc.in 2009-12-16 21:15:52 +0000
+++ bindings/mono/appindicator-sharp-0.1.pc.in 2010-04-16 22:30:42 +0000
@@ -1,7 +1,7 @@
1prefix=@prefix@1prefix=@prefix@
2exec_prefix=@exec_prefix@2exec_prefix=@exec_prefix@
3libdir=@libdir@3libdir=@libdir@
4assemblies_dir=${libdir}/appindicator-sharp-0.14assemblies_dir=${libdir}/cli/appindicator-sharp-0.0
55
6Name: appindicator-sharp6Name: appindicator-sharp
7Description: application indicators for .NET7Description: application indicators for .NET
88
=== modified file 'debian/changelog'
--- debian/changelog 2010-04-14 21:20:45 +0000
+++ debian/changelog 2010-04-16 22:30:42 +0000
@@ -1,3 +1,28 @@
1indicator-application (0.0.19-0ubuntu4) UNRELEASED; urgency=low
2
3 * bindings/mono/appindicator-sharp-0.1.pc.in:
4 + Fix pcfile to point to library install location (LP: #564506)
5 * debian/control,
6 debian/libappindicator0-cil.install,
7 debian/libappindicator0-cil.installcligac,
8 debian/libappindicator-cil-dev.install,
9 debian/libappindicator0.0-cil.install,
10 debian/libappindicator0.0-cil.installcligac,
11 debian/libappindicator0.1-cil-dev.install:
12 + Rename packages to comply with Debian CLI policy
13 * debian/libappindicator0.0-cil.install,
14 debian/libappindicator0.0-cil.installcligac:
15 + Fix library install location to comply with Debian CLI policy
16 * debian/control,
17 debian/rules:
18 + Pass CSC variable to use mono-csc default compiler from mono-devel
19 2.4.3, rather than the default 2.0-only compiler
20 * debian/rules:
21 + Fix processing of rules to track dependency information on Mono
22 binding, by running rules in correct order
23
24 -- Jo Shields <directhex@apebox.org> Fri, 16 Apr 2010 10:42:48 +0100
25
1indicator-application (0.0.19-0ubuntu3) lucid; urgency=low26indicator-application (0.0.19-0ubuntu3) lucid; urgency=low
227
3 * Merging patch to add assembly information to Mono binding (LP: #547195)28 * Merging patch to add assembly information to Mono binding (LP: #547195)
429
=== modified file 'debian/control'
--- debian/control 2010-04-14 13:43:40 +0000
+++ debian/control 2010-04-16 22:30:42 +0000
@@ -20,7 +20,7 @@
20 libdbusmenu-gtk-dev (>= 0.2.2),20 libdbusmenu-gtk-dev (>= 0.2.2),
21 libdbusmenu-glib-dev (>= 0.2.2),21 libdbusmenu-glib-dev (>= 0.2.2),
22 cli-common-dev (>= 0.5.7),22 cli-common-dev (>= 0.5.7),
23 mono-devel (>= 2.0.1),23 mono-devel (>= 2.4.3),
24 gtk-sharp2-gapi,24 gtk-sharp2-gapi,
25 libmono-dev,25 libmono-dev,
26 libnunit-cil-dev,26 libnunit-cil-dev,
@@ -87,26 +87,29 @@
87 .87 .
88 This package contains developer documentation.88 This package contains developer documentation.
8989
90Package: libappindicator0-cil90Package: libappindicator0.0-cil
91Section: cli-mono91Section: cli-mono
92Architecture: all92Architecture: all
93Replaces: libappindicator0-cil (<= 0.0.19-0ubuntu4~)
94Conflicts: libappindicator0-cil (<= 0.0.19-0ubuntu4~)
93Depends: ${shlibs:Depends},95Depends: ${shlibs:Depends},
94 ${misc:Depends},96 ${misc:Depends},
95 ${cli:Depends},97 ${cli:Depends}
96 libappindicator0 (>= ${source:Version})
97Description: CLI bindings for libappindicator98Description: CLI bindings for libappindicator
98 This package provides the appindicator-sharp assembly that allows CLI (.NET)99 This package provides the appindicator-sharp assembly that allows CLI (.NET)
99 programs to take menus from applications and place them in the panel.100 programs to take menus from applications and place them in the panel.
100 .101 .
101 This package contains assemblies to be used by applications.102 This package contains assemblies to be used by applications.
102103
103Package: libappindicator-cil-dev104Package: libappindicator0.1-cil-dev
104Section: libdevel105Section: libdevel
105Architecture: all106Architecture: all
107Replaces: libappindicator-cil-dev (<= 0.0.19-0ubuntu4~)
108Conflicts: libappindicator-cil-dev (<= 0.0.19-0ubuntu4~)
106Depends: ${shlibs:Depends},109Depends: ${shlibs:Depends},
107 ${misc:Depends},110 ${misc:Depends},
108 ${cli:Depends},111 ${cli:Depends},
109 libappindicator0-cil (= ${binary:Version})112 libappindicator0.0-cil (= ${binary:Version})
110Description: Application Indicators113Description: Application Indicators
111 A library and indicator to take menus from applications and place them in114 A library and indicator to take menus from applications and place them in
112 the panel.115 the panel.
113116
=== renamed file 'debian/libappindicator0-cil.install' => 'debian/libappindicator0.0-cil.install'
--- debian/libappindicator0-cil.install 2010-04-14 13:43:40 +0000
+++ debian/libappindicator0.0-cil.install 2010-04-16 22:30:42 +0000
@@ -1,1 +1,1 @@
1debian/tmp/usr/lib/appindicator-sharp-0.1 /usr/lib/cli1debian/tmp/usr/lib/appindicator-sharp-0.1/* /usr/lib/cli/appindicator-sharp-0.0
22
=== renamed file 'debian/libappindicator0-cil.installcligac' => 'debian/libappindicator0.0-cil.installcligac'
--- debian/libappindicator0-cil.installcligac 2010-04-14 13:43:40 +0000
+++ debian/libappindicator0.0-cil.installcligac 2010-04-16 22:30:42 +0000
@@ -1,1 +1,1 @@
1/usr/lib/cli/appindicator-sharp-0.1/appindicator-sharp.dll1/usr/lib/cli/appindicator-sharp-0.0/appindicator-sharp.dll
22
=== renamed file 'debian/libappindicator-cil-dev.install' => 'debian/libappindicator0.1-cil-dev.install'
=== modified file 'debian/rules'
--- debian/rules 2010-04-14 13:43:40 +0000
+++ debian/rules 2010-04-16 22:30:42 +0000
@@ -3,6 +3,7 @@
3DEB_PYTHON_SYSTEM=pycentral3DEB_PYTHON_SYSTEM=pycentral
4PY_VERSIONS = $(shell pyversions --requested debian/control)4PY_VERSIONS = $(shell pyversions --requested debian/control)
5export MONO_SHARED_DIR=$(CURDIR)5export MONO_SHARED_DIR=$(CURDIR)
6export CSC=/usr/bin/mono-csc
67
7include /usr/share/cdbs/1/rules/debhelper.mk8include /usr/share/cdbs/1/rules/debhelper.mk
8include /usr/share/cdbs/1/class/autotools-vars.mk9include /usr/share/cdbs/1/class/autotools-vars.mk
@@ -12,6 +13,8 @@
12DEB_CONFIGURE_EXTRA_FLAGS += --enable-gtk-doc13DEB_CONFIGURE_EXTRA_FLAGS += --enable-gtk-doc
13API_VERSION = 0.114API_VERSION = 0.1
1415
16DEB_DH_MAKESHLIBS_ARGS_libappindicator0 := -V 'libappindicator0 (>= 0.0.19)'
17
15configure-stamp-%:18configure-stamp-%:
16 mkdir build-$*19 mkdir build-$*
17 cd build-$* && PYTHON=`which $*` \20 cd build-$* && PYTHON=`which $*` \
@@ -35,6 +38,15 @@
35binary-install/python-appindicator::38binary-install/python-appindicator::
36 dh_pycentral39 dh_pycentral
3740
41binary-install/libappindicator0.0-cil::
42 dh_clistrip
43 dh_clifixperms
44 dh_makeclilibs -V
45 dh_installcligac
46
47binary-predeb/libappindicator0.0-cil:: binary-fixup/libappindicator0
48 dh_clideps -plibappindicator0.0-cil
49
38configure-stamp:50configure-stamp:
39 $(DEB_CONFIGURE_SCRIPT) $(DEB_CONFIGURE_NORMAL_ARGS) $(DEB_CONFIGURE_EXTRA_FLAGS)51 $(DEB_CONFIGURE_SCRIPT) $(DEB_CONFIGURE_NORMAL_ARGS) $(DEB_CONFIGURE_EXTRA_FLAGS)
40 touch $@52 touch $@
@@ -57,15 +69,6 @@
57 find debian/indicator-application/usr/lib -name \*.la -exec rm {} \;69 find debian/indicator-application/usr/lib -name \*.la -exec rm {} \;
58 find debian/indicator-application/usr/lib -name \*.a -exec rm {} \;70 find debian/indicator-application/usr/lib -name \*.a -exec rm {} \;
5971
60binary-fixup/libappindicator0-cil::
61 dh_clifixperms
62
63binary-predeb/libappindicator0-cil::
64 dh_makeclilibs -m $(API_VERSION)
65 dh_installcligac
66 dh_clideps
67
68
69common-binary-predeb-arch:: list-missing72common-binary-predeb-arch:: list-missing
7073
71clean::74clean::

Subscribers

People subscribed via source and target branches

to all changes: