← Back to branch summary

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

« back to all changes in this revision

Viewing changes to 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:
Makefile.am
13
13
cssdir = $(pkgdatadir)/css
14
14
css_DATA = \
15
15
        css/liferea.css \
 
16
        css/user.css \
16
17
        css/adblock.css
17
18
 
18
19
dtddir = $(pkgdatadir)/dtd
19
20
dtd_DATA = dtd/html.ent
20
21
 
21
 
EXTRA_DIST = autogen.sh \
22
 
        liferea.spec \
23
 
        src/liferea-add-feed \
 
22
EXTRA_DIST = \
24
23
        po/liferea.pot \
25
24
        $(desktop_in_files) \
26
25
        $(desktop_DATA) \
36
35
 
37
36
 
38
37
DISTCLEANFILES = \
39
 
        liferea.spec \
40
38
        liferea.desktop \
41
39
        intltool-extract \
42
40
        intltool-merge \