~ubuntu-branches/ubuntu/oneiric/lxpanel/oneiric

Viewing all changes in revision 17.

  • Committer: Bazaar Package Importer
  • Author(s): Artur Rona
  • Date: 2011-01-07 03:19:29 UTC
  • mfrom: (4.1.7 sid)
  • Revision ID: james.westby@ubuntu.com-20110107031929-aukbu7yxm16jbmuq
Tags: 0.5.6-1ubuntu1
* Merge from debian unstable.  Remaining changes:
  - debian/apport/source_lxpanel.py:
    + Add apport hook.
  - debian/control:
    + Wrap depends and build-depends.
    + Add libindicator-dev build-depends.
    + New lxpanel-indicator-applet-plugin binary.
    + Build-depends on lsb-release, needed to detect the distribution.
    + Add a debug package.
  - debian/copyright:
    + Update with indicator-support.patch.
    + Update copyright for xkb plugin.
  - debian/dirs: Removed.
  - debian/lxpanel-indicator-applet-plugin.install:
    + Install indicator plugin.
  - debian/lxpanel.install:
    + Install all files except indicator plugin.
  - debian/patches/configure_X11.patch:
    + Add X11 to the linker to fix FTBFS with DSO. (Closes: #608419)
  - debian/patches/configure_desktop_number.patch: (Closes: #608421)
    + Add configuration for desktop number for the pager plugin.
  - debian/patches/indicator-support.patch:
    + Add indicator support.
  - debian/rules:
    + Install apport hook only on Ubuntu.
    + Add override for dh_strip.
    + Add --enable-indicator-support flag.
    + Add --fail-missing to dh_install.
* debian/control:
  - Build-Depends on autopoint and dh-autoreconf.
  - wrap-and-sort, get it professionally.
* debian/rules: Build-Depends on autopoint and dh_autoreconf.
  - Use dh $@ --with autoreconf to refresh configure and Makefile.
* Dropped changes:
  - debian/patches/redefine-alarm-variable.patch:
    + Superceded by Debian.
  - debian/patches/99-autotools.patch:
    + Use debian/rules for it.

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: