lp:~jbicha/ubuntu/oneiric/liferea/liferea-1.6.6b
- Get this branch:
- bzr branch lp:~jbicha/ubuntu/oneiric/liferea/liferea-1.6.6b
Branch merges
- Daniel Holbach (community): Approve
-
Diff: 40966 lines (+13438/-22575)145 files modified.pc/01_ubuntu_feedlists/opml/feedlist.opml (+0/-38)
.pc/01_ubuntu_feedlists/opml/feedlist_ca.opml (+0/-48)
.pc/01_ubuntu_feedlists/opml/feedlist_de.opml (+0/-53)
.pc/01_ubuntu_feedlists/opml/feedlist_es.opml (+0/-43)
.pc/01_ubuntu_feedlists/opml/feedlist_eu.opml (+0/-44)
.pc/01_ubuntu_feedlists/opml/feedlist_fr.opml (+0/-50)
.pc/01_ubuntu_feedlists/opml/feedlist_nl.opml (+0/-41)
.pc/01_ubuntu_feedlists/opml/feedlist_pl.opml (+0/-37)
.pc/01_ubuntu_feedlists/opml/feedlist_pt_BR.opml (+0/-36)
.pc/01_ubuntu_feedlists/opml/feedlist_ru.opml (+0/-40)
.pc/01_ubuntu_feedlists/opml/feedlist_sk.opml (+0/-43)
.pc/01_ubuntu_feedlists/opml/feedlist_sv.opml (+0/-29)
.pc/add_X-Ubuntu-Gettext-Domain/liferea.desktop.in (+0/-11)
.pc/applied-patches (+0/-10)
.pc/debian-example-feeds/opml/feedlist.opml (+0/-35)
.pc/debian-example-feeds/opml/feedlist_bg.opml (+0/-39)
.pc/debian-example-feeds/opml/feedlist_ca.opml (+0/-46)
.pc/debian-example-feeds/opml/feedlist_de.opml (+0/-50)
.pc/debian-example-feeds/opml/feedlist_es.opml (+0/-40)
.pc/debian-example-feeds/opml/feedlist_eu.opml (+0/-42)
.pc/debian-example-feeds/opml/feedlist_fr.opml (+0/-46)
.pc/debian-example-feeds/opml/feedlist_nl.opml (+0/-39)
.pc/debian-example-feeds/opml/feedlist_pl.opml (+0/-35)
.pc/debian-example-feeds/opml/feedlist_pt.opml (+0/-35)
.pc/debian-example-feeds/opml/feedlist_pt_BR.opml (+0/-34)
.pc/debian-example-feeds/opml/feedlist_ru.opml (+0/-38)
.pc/debian-example-feeds/opml/feedlist_sk.opml (+0/-41)
.pc/debian-example-feeds/opml/feedlist_sv.opml (+0/-27)
.pc/fix_systray_behavior/src/ui/liferea_shell.c (+0/-1378)
.pc/fix_systray_behavior/src/ui/ui_tray.c (+0/-325)
.pc/gtk-status-icon.patch/po/POTFILES.in (+0/-190)
.pc/gtk-status-icon.patch/src/ui/Makefile.am (+0/-38)
.pc/gtk-status-icon.patch/src/ui/Makefile.in (+0/-945)
.pc/gtk-status-icon.patch/src/ui/eggtrayicon.c (+0/-566)
.pc/gtk-status-icon.patch/src/ui/eggtrayicon.h (+0/-80)
.pc/gtk-status-icon.patch/src/ui/ui_popup.c (+0/-364)
.pc/gtk-status-icon.patch/src/ui/ui_popup.h (+0/-74)
.pc/gtk-status-icon.patch/src/ui/ui_tray.c (+0/-328)
.pc/libindicate.patch/configure.ac (+0/-248)
.pc/libindicate.patch/src/Makefile.am (+0/-93)
.pc/libindicate.patch/src/ui/Makefile.am (+0/-37)
.pc/libindicate.patch/src/ui/liferea_shell.c (+0/-1388)
.pc/libindicate.patch/src/ui/ui_prefs.c (+0/-890)
.pc/libindicate.patch/src/ui/ui_tray.c (+0/-313)
.pc/libtool-dont-rearange-as-needed/ltmain.sh (+0/-8413)
.pc/libunity.patch/configure.ac (+0/-268)
.pc/libunity.patch/src/Makefile.am (+0/-99)
.pc/libunity.patch/src/ui/Makefile.am (+0/-38)
.pc/libunity.patch/src/ui/liferea_shell.c (+0/-1393)
.pc/libunity.patch/src/ui/ui_tray.c (+0/-323)
.pc/notification-append/src/notification/libnotify.c (+0/-305)
.pc/www-browser/src/ui/ui_prefs.c (+0/-884)
AUTHORS (+5/-0)
ChangeLog (+47/-0)
README (+9/-9)
aclocal.m4 (+6/-6)
configure (+246/-227)
configure.ac (+5/-44)
debian/changelog (+51/-0)
debian/control (+41/-17)
debian/liferea.install (+1/-1)
debian/patches/libindicate.patch (+1/-1)
debian/rules (+4/-5)
doc/html/concepts_de.html (+1/-1)
doc/html/concepts_en.html (+1/-1)
doc/html/reference_de.html (+4/-4)
doc/html/reference_en.html (+2/-2)
doc/html/subscriptions_de.html (+2/-14)
doc/html/subscriptions_en.html (+2/-13)
glade/Makefile.am (+0/-1)
glade/Makefile.in (+0/-1)
glade/bloglines_source.glade (+0/-226)
glade/liferea.glade (+8/-3)
liferea.desktop (+15/-0)
liferea.desktop.in (+0/-1)
liferea.spec (+1/-1)
ltmain.sh (+2/-16)
opml/Makefile.am (+2/-0)
opml/Makefile.in (+2/-0)
opml/feedlist.opml (+0/-2)
opml/feedlist_bg.opml (+0/-2)
opml/feedlist_ca.opml (+0/-5)
opml/feedlist_de.opml (+0/-3)
opml/feedlist_es.opml (+0/-3)
opml/feedlist_eu.opml (+0/-2)
opml/feedlist_fr.opml (+0/-5)
opml/feedlist_gl.opml (+44/-0)
opml/feedlist_he.opml (+59/-0)
opml/feedlist_nl.opml (+0/-3)
opml/feedlist_pl.opml (+0/-3)
opml/feedlist_pt.opml (+0/-3)
opml/feedlist_pt_BR.opml (+1/-3)
opml/feedlist_ru.opml (+0/-2)
opml/feedlist_sk.opml (+0/-2)
opml/feedlist_sv.opml (+0/-2)
pixmaps/AUTHORS (+0/-1)
pixmaps/Makefile.am (+0/-1)
pixmaps/Makefile.in (+0/-1)
po/ChangeLog (+4/-0)
po/LINGUAS (+5/-0)
po/POTFILES.in (+2/-3)
po/ast.po (+2277/-0)
po/da.po (+2336/-0)
po/gl.po (+2340/-0)
po/he.po (+2275/-0)
po/sq.po (+196/-439)
po/uk.po (+2285/-0)
po/zh_CN.po (+74/-712)
po/zh_TW.po (+2/-2)
src/Makefile.am (+0/-12)
src/browser.c (+6/-3)
src/common.c (+5/-1)
src/fl_sources/Makefile.am (+1/-2)
src/fl_sources/Makefile.in (+2/-19)
src/fl_sources/bloglines_source.c (+0/-101)
src/fl_sources/bloglines_source.h (+0/-31)
src/fl_sources/node_source.c (+5/-2)
src/fl_sources/opml_source.c (+2/-4)
src/fl_sources/opml_source.h (+0/-19)
src/itemlist.c (+2/-1)
src/main.c (+1/-1)
src/notification/libnotify.c (+5/-14)
src/social.c (+0/-1)
src/subscription.c (+1/-1)
src/ui/Makefile.am (+2/-3)
src/ui/Makefile.in (+17/-0)
src/ui/eggtrayicon.c (+566/-0)
src/ui/eggtrayicon.h (+80/-0)
src/ui/enclosure_list_view.c (+7/-3)
src/ui/liferea_shell.c (+18/-21)
src/ui/ui_indicator.c (+0/-195)
src/ui/ui_indicator.h (+0/-35)
src/ui/ui_popup.c (+4/-10)
src/ui/ui_popup.h (+1/-3)
src/ui/ui_prefs.c (+0/-20)
src/ui/ui_tray.c (+131/-130)
src/ui/ui_unity.c (+0/-62)
src/ui/ui_unity.h (+0/-29)
src/xml.c (+1/-0)
xslt/feed.xml (+66/-2)
xslt/folder.xml (+18/-2)
xslt/item.xml (+98/-1)
xslt/newsbin.xml (+11/-1)
xslt/source.xml (+18/-2)
xslt/vfolder.xml (+12/-1)
Branch information
- Owner:
- Jeremy Bícha
- Status:
- Merged
Recent revisions
- 114. By Jeremy Bícha
-
* New upstream release.
* Merge with Debian, remaining changes:
* debian/control:
- Build-depends on libindicate, dh_autoreconf, & libunity
* debian/rules:
- Run dh_autoreconf & update translations
- Build with libindicate
* debian/liferea. install: Install indicator files
* debian/patches/ 01_ubuntu_ feedlists
* debian/patches/ fix_systray_ behavior
* debian/patches/ add_X-Ubuntu- Gettext- Domain
* debian/patches/ gtk-status- icon.patch: Refreshed
* debian/patches/ libindicate. patch: Fixed an undefined reference
* debian/patches/ notification- append
- Support libnotify 0.7, use instead of Debian's libnotify0.7 patch
* Non-maintainer upload.
* Transition to libnotiy 0.7. Closes: #630288
- Enable libnotify0.7 patch.
- Bump Build-Depends on libnotify-dev to (>= 0.7.0).
* Non-maintainer upload.
* Don't ship .la files (Closes: #622502).
* New upstream release. Closes: #608570.
+ Properly identify the MIME type of podcasts. Closes: #593415.
* debian/control:
+ Wrap dependency fields. Closes: #610182.
+ liferea-dbg suggests gdb. Closes: #602317.
+ Remove obsolete conflicts and replaces.
+ Standards-Version is 3.9.1, no changes needed.
* debian/control,
debian/rules:
+ Link against X11 and ICE. Fixes FTBFS. Closes: #618353. - 113. By Ken VanDine
-
* debian/
patches/ libindicate. patch
- Updated to look for indicate-0.6
* debian/control
- bumped libindincate build depends to >= 0.5.90 - 112. By Maia Everett
-
* debian/
patches/ notification- append:
- Apply libnotify 0.7 API change, fixes FTBFS. (LP: #794010)
* Rebuild to correctly update connected state with Network Manager 0.9.
(LP: #791548) - 110. By Jean-Philippe Orsini
-
* debian/
patches/ libunity. patch
- Displays the number of unread items in the Unity Launcher
entry (LP: #732848).
* debian/control
- Added missing build dep to libunity-dev - 109. By Marc Deslauriers
-
* Fix indicator support again (LP: #723349)
- debian/patches/ libindicate. patch: updated check for new version of
libindicate.
- debian/control: bump libindicate-dev and libindicate-gtk-dev
version requirement. - 108. By Benjamin Drung
-
Change build dependency from libwebkit-dev to libwebkitgtk-dev
(LP: #703248). - 107. By Marc Deslauriers
-
debian/control: Add libindicate-gtk-dev to Build-Depends so indicator
support gets built properly. (LP: #689710) - 105. By Luke Yelavich
-
debian/
patches/ libindicate. patch: Fixed reversed order and missing
favicons in indicator applet, thanks to Pavol Klačanský for the patch.
(LP: #653995)
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:ubuntu/oneiric/liferea