diff options
author | Ted Gould <ted@gould.cx> | 2010-04-14 08:43:40 -0500 |
---|---|---|
committer | Ted Gould <ted@gould.cx> | 2010-04-14 08:43:40 -0500 |
commit | d38c39a4e8bb745061507616cea3f83da5ed1e04 (patch) | |
tree | 1db25db44a561da343e0c6eed8e31623370b4ceb /debian | |
parent | abb09f21f69173a8dba28550f637d0d793040f64 (diff) | |
download | ayatana-indicator-application-d38c39a4e8bb745061507616cea3f83da5ed1e04.tar.gz ayatana-indicator-application-d38c39a4e8bb745061507616cea3f83da5ed1e04.tar.bz2 ayatana-indicator-application-d38c39a4e8bb745061507616cea3f83da5ed1e04.zip |
* debian/control:
+ Set libappindicator0-cil and libappindicator-cil-dev to Arch: all
+ Make libappindicator0-cil depend on libappindicator0 >= ${source:Version}
instead
* debian/rules:
+ Fix ordering of dh_*cli* (LP: #560095)
* debian/libappindicator0-cil.install,
debian/libappindicator0-cil.installcligac:
+ Fix CLI policy breakage:
- Wrong installation paths for GAC'd CLI libraries
- Direct installation of GAC'd libraries
Diffstat (limited to 'debian')
-rw-r--r-- | debian/changelog | 16 | ||||
-rw-r--r-- | debian/control | 7 | ||||
-rw-r--r-- | debian/libappindicator0-cil.install | 3 | ||||
-rw-r--r-- | debian/libappindicator0-cil.installcligac | 1 | ||||
-rwxr-xr-x | debian/rules | 11 |
5 files changed, 27 insertions, 11 deletions
diff --git a/debian/changelog b/debian/changelog index 0920364..1c8d572 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,19 @@ +indicator-application (0.0.19-0ubuntu2) lucid; urgency=low + + * debian/control: + + Set libappindicator0-cil and libappindicator-cil-dev to Arch: all + + Make libappindicator0-cil depend on libappindicator0 >= ${source:Version} + instead + * debian/rules: + + Fix ordering of dh_*cli* (LP: #560095) + * debian/libappindicator0-cil.install, + debian/libappindicator0-cil.installcligac: + + Fix CLI policy breakage: + - Wrong installation paths for GAC'd CLI libraries + - Direct installation of GAC'd libraries + + -- Chow Loong Jin <hyperair@ubuntu.com> Wed, 14 Apr 2010 18:44:22 +0800 + indicator-application (0.0.19-0ubuntu1) lucid; urgency=low * New upstream release. diff --git a/debian/control b/debian/control index 8b1e17f..e64f6ad 100644 --- a/debian/control +++ b/debian/control @@ -89,12 +89,11 @@ Description: Application Indicators Package: libappindicator0-cil Section: cli-mono -Architecture: any +Architecture: all Depends: ${shlibs:Depends}, ${misc:Depends}, ${cli:Depends}, - libappindicator0 (= ${binary:Version}) -Provides: ${cli:Provides} + libappindicator0 (>= ${source:Version}) Description: CLI bindings for libappindicator This package provides the appindicator-sharp assembly that allows CLI (.NET) programs to take menus from applications and place them in the panel. @@ -103,7 +102,7 @@ Description: CLI bindings for libappindicator Package: libappindicator-cil-dev Section: libdevel -Architecture: any +Architecture: all Depends: ${shlibs:Depends}, ${misc:Depends}, ${cli:Depends}, diff --git a/debian/libappindicator0-cil.install b/debian/libappindicator0-cil.install index 6158914..6382d9e 100644 --- a/debian/libappindicator0-cil.install +++ b/debian/libappindicator0-cil.install @@ -1,2 +1 @@ -debian/tmp/usr/lib/appindicator-sharp-0.1/* -debian/tmp/usr/lib/mono/* +debian/tmp/usr/lib/appindicator-sharp-0.1 /usr/lib/cli diff --git a/debian/libappindicator0-cil.installcligac b/debian/libappindicator0-cil.installcligac new file mode 100644 index 0000000..7e66dd2 --- /dev/null +++ b/debian/libappindicator0-cil.installcligac @@ -0,0 +1 @@ +/usr/lib/cli/appindicator-sharp-0.1/appindicator-sharp.dll diff --git a/debian/rules b/debian/rules index 7936902..2fe0be6 100755 --- a/debian/rules +++ b/debian/rules @@ -57,12 +57,13 @@ binary-post-install/indicator-application:: find debian/indicator-application/usr/lib -name \*.la -exec rm {} \; find debian/indicator-application/usr/lib -name \*.a -exec rm {} \; -binary/libappindicator0-cil:: binary-arch -binary-arch: - dh_clifixperms -i - dh_installdeb -i +binary-fixup/libappindicator0-cil:: + dh_clifixperms + +binary-predeb/libappindicator0-cil:: dh_makeclilibs -m $(API_VERSION) - dh_clideps -i -d + dh_installcligac + dh_clideps common-binary-predeb-arch:: list-missing |