~noskcaj/ubuntu/wily/xfce4-panel/merge

« back to all changes in this revision

Viewing changes to libxfce4panel/Makefile.am

  • Committer: Package Import Robot
  • Author(s): Lionel Le Folgoc
  • Date: 2013-07-07 10:54:09 UTC
  • mfrom: (4.2.15 sid)
  • Revision ID: package-import@ubuntu.com-20130707105409-nam2sh68h1reuiv4
Tags: 4.10.1-1ubuntu1
* Merge from Debian unstable, remaining Ubuntu changes:
  - debian/patches:
    + xubuntu_migrate-tasklist-separator.patch: added, try to be smart and
      work around the non-expandable tasklist plugin from 4.10 by setting
      as expandable the separator next to it (should work with the default
      panel layouts from Xubuntu, Mythbuntu and UbuntuStudio).
    + xubuntu_add-calendar-popup-to-clock-plugin.patch: added, taken from
      upstream git to show a calendar when left-clicking on the clock plugin
      (so we don't need orage/xfce4-datetime-plugin for this feature only).

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
1
 
2
 
INCLUDES = \
 
2
AM_CPPFLAGS = \
3
3
        -I$(top_srcdir) \
4
4
        -DG_LOG_DOMAIN=\"libxfce4panel\" \
5
5
        -DLIBXFCE4PANEL_COMPILATION \