← Back to branch summary

~ubuntu-branches/ubuntu/vivid/liferea/vivid-proposed

« back to all changes in this revision

Viewing changes to .pc/libunity.patch/src/ui/Makefile.am

  • Committer: Package Import Robot
  • Author(s): bojo42
  • Date: 2012-03-29 14:17:21 UTC
  • mfrom: (1.3.9) (3.2.5 sid)
  • Revision ID: package-import@ubuntu.com-20120329141721-tbfopcrc5797wxt7
Tags: 1.8.3-0.1ubuntu1
https://launchpad.net/bugs/290666
https://launchpad.net/bugs/371754
https://launchpad.net/bugs/741543
https://launchpad.net/bugs/716688
https://launchpad.net/bugs/935147
* New upstream release (LP: #290666, #371754, #741543, #716688)
* Merge from Debian unstable (LP: #935147), remaining changes:
* debian/patches:
  - drop gtk-status-icon.patch & notification-append as in upstream
  - drop fix_systray_behavior as mostly upstreamed and rest seems unused
  - 01_ubuntu_feedlists: update & rename, move planets to "Open Source"  
  - add_X-Ubuntu-Gettext-Domain: rebase
  - libunity.patch: rebase, apply before indicator patch (liferea_shell.c)
  - libindicate_increase_version.patch: exclude from libindicate.patch
  - deactivate libindicate.patch, seems partly upstreamed and needs rework
* debian/control: libindicate-dev, libindicate-gtk-dev & libunity-dev
* debian/liferea.indicate & liferea.install: ship indicator desktop file
* debian/rules: enable libindicate

Show diffs side-by-side

added added

removed removed

Lines of Context:
.pc/libunity.patch/src/ui/Makefile.am
1
1
## Process this file with automake to produce Makefile.in
2
2
 
3
 
INCLUDES = \
 
3
AM_CPPFLAGS = \
4
4
        -DPACKAGE_DATA_DIR=\""$(datadir)"\" \
5
5
        -DPACKAGE_LIB_DIR=\""$(pkglibdir)"\" \
6
6
        -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
8
8
 
9
9
noinst_LIBRARIES = libliui.a
10
10
 
11
 
libliui_a_CFLAGS = $(PACKAGE_CFLAGS) $(DBUS_CFLAGS)     $(LIBINDICATE_CFLAGS)
 
11
libliui_a_CFLAGS = $(PACKAGE_CFLAGS) $(LIBINDICATE_CFLAGS)
12
12
libliui_a_SOURCES = \
13
13
        auth_dialog.c auth_dialog.h \
14
14
        browser_tabs.c browser_tabs.h \
15
15
        enclosure_list_view.c enclosure_list_view.h \
 
16
        feed_list_view.c feed_list_view.h \
 
17
        icons.c icons.h \
 
18
        item_list_view.c item_list_view.h \
16
19
        itemview.c itemview.h \
17
20
        liferea_dialog.c liferea_dialog.h \
18
21
        liferea_htmlview.c liferea_htmlview.h \
19
22
        liferea_shell.c liferea_shell.h \
 
23
        popup_menu.c popup_menu.h \
20
24
        rule_editor.c rule_editor.h \
21
25
        search_dialog.c search_dialog.h \
22
 
        search_engine_dialog.c search_engine_dialog.h \
23
26
        search_folder_dialog.c search_folder_dialog.h \
 
27
        subscription_dialog.c subscription_dialog.h \
24
28
        ui_common.c ui_common.h \
25
29
        ui_dnd.c ui_dnd.h \
26
 
        ui_feedlist.c ui_feedlist.h \
27
30
        ui_folder.c ui_folder.h \
28
31
        ui_indicator.c ui_indicator.h \
29
 
        ui_itemlist.c ui_itemlist.h \
30
32
        ui_node.c ui_node.h \
31
 
        ui_popup.c ui_popup.h \
32
33
        ui_prefs.c ui_prefs.h \
33
 
        ui_script.c ui_script.h \
34
 
        ui_search.c ui_search.h \
35
34
        ui_session.c ui_session.h \
36
 
        ui_subscription.c ui_subscription.h \
37
35
        ui_tray.c ui_tray.h \
38
36
        ui_update.c ui_update.h