~ubuntu-branches/ubuntu/intrepid/xfce4-panel/intrepid-proposed

Viewing all changes in revision 28.

  • Committer: Bazaar Package Importer
  • Author(s): Lionel Le Folgoc
  • Date: 2007-11-24 21:18:05 UTC
  • Revision ID: james.westby@ubuntu.com-20071124211805-woxpp37ttojop0kc
Tags: 4.4.1-2ubuntu1
* Merge with Debian Unstable, Ubuntu changes:
  - use our xfce.mk class
  - debian/control: remove quilt and chrpath build-dependencies and add cdbs
  - Adhere to DebianMaintainerField
  - debian/patches/series: dropped, we use simple-patchsys
  - debian/patches/01_lower-margins-in-launchers.patch: dropped
  - debian/xfce4-panel.1: update bug reporting (LP instead of Debian BTS)
  - debian/compat: bump to 5
  - Homepage, XS-Vcs-Bzr & XS-Vcs-Browser fields added
  - debian/xfce4-panel.install: drop usr/share/man to fix FTBFS.
* Drop uneeded delta with Debian: rename debian/patches/01_fix-segfault-with-2nd-panel.patch
  to debian/patches/02_fix-segfault-gtk2.11.patch.
* debian/control: use Vcs-* instead of XS-Vcs-*.

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: