diff options
| author | Eric Sandall | 2009-10-09 21:03:17 -0700 |
|---|---|---|
| committer | Eric Sandall | 2009-10-09 21:03:17 -0700 |
| commit | 03ffcbbf8ac1b3793a70ca65fe5966c166385cbf (patch) | |
| tree | 54605ecce21a06ea680d47b1c0d1cdeffbc3da75 /news/liferea | |
| parent | 3343eedcb6a835ca4bc96167785190c525772385 (diff) | |
| parent | 0afd953ca6a5315584df84aaa09d4bdd75345432 (diff) | |
Merge branch 'master' into devel-gcc
Conflicts:
ChangeLog
gnome2-libs/bug-buddy2/HISTORY
gnu/gcc/HISTORY
gnu/gcc33/HISTORY
graphics/imagemagick/DETAILS
graphics/imagemagick/HISTORY
http/midori/DETAILS
http/midori/HISTORY
http/webkitgtk/DETAILS
http/webkitgtk/HISTORY
kde4/kdeadmin4/DETAILS
kde4/kdeadmin4/HISTORY
kde4/kdegames4/DETAILS
kde4/kdegames4/HISTORY
kde4/kdegraphics4/DETAILS
kde4/kdegraphics4/HISTORY
kde4/kdemultimedia4/DETAILS
kde4/kdemultimedia4/HISTORY
kde4/kdeutils4/DETAILS
kde4/kdeutils4/HISTORY
kde4/kdevelop4/DETAILS
kde4/kdevelop4/HISTORY
kde4/kdevplatform4/DETAILS
kde4/kdevplatform4/HISTORY
kde4/oxygen-icons/DETAILS
kde4/oxygen-icons/HISTORY
news/liferea/DETAILS
news/liferea/HISTORY
Diffstat (limited to 'news/liferea')
| -rwxr-xr-x | news/liferea/CONFIGURE | 3 | ||||
| -rwxr-xr-x | news/liferea/DEPENDS | 14 | ||||
| -rwxr-xr-x | news/liferea/DETAILS | 4 | ||||
| -rw-r--r-- | news/liferea/HISTORY | 23 | ||||
| -rw-r--r-- | news/liferea/liferea-1.4.28.tar.gz.sig | bin | 287 -> 0 bytes | |||
| -rw-r--r-- | news/liferea/liferea-1.6.0.tar.gz.sig | bin | 0 -> 543 bytes | |||
| -rw-r--r-- | news/liferea/liferea-1.7.1.tar.gz.sig | bin | 0 -> 287 bytes |
7 files changed, 26 insertions, 18 deletions
diff --git a/news/liferea/CONFIGURE b/news/liferea/CONFIGURE deleted file mode 100755 index 50fcc8d7d0..0000000000 --- a/news/liferea/CONFIGURE +++ /dev/null @@ -1,3 +0,0 @@ -if [[ "$LIFEREA_DEVEL" == "n" ]]; then - config_query_list LIFEREA_HTTP_BE "Select http backend" gecko webkit gtkhtml -fi diff --git a/news/liferea/DEPENDS b/news/liferea/DEPENDS index cdf1f391a7..faf8397e83 100755 --- a/news/liferea/DEPENDS +++ b/news/liferea/DEPENDS @@ -3,19 +3,7 @@ depends gconf2 && depends libxml2 && depends sqlite && depends libglade2 && - -if [[ "$LIFEREA_DEVEL" == "n" ]]; then - if [[ $LIFEREA_HTTP_BE == gecko ]]; then - depends GECKO "--disable-gtkhtml2 --disable-webkit" - elif [[ $LIFEREA_HTTP_BE == webkit ]]; then - depends webkitgtk "--disable-gecko --disable-gtkhtml2" - elif [[ $LIFEREA_HTTP_BE == gtkhtml ]]; then - depends libgtkhtml "--disable-webkit --disable-gecko" - fi -else - depends webkitgtk && - depends libsoup -fi && +depends webkitgtk && optional_depends gnutls \ "--enable-gnutls" \ diff --git a/news/liferea/DETAILS b/news/liferea/DETAILS index 1c52190b00..b7e20eda58 100755 --- a/news/liferea/DETAILS +++ b/news/liferea/DETAILS @@ -1,9 +1,9 @@ SPELL=liferea if [ "$LIFEREA_DEVEL" == "y" ]; then - VERSION=1.6.0-rc3 + VERSION=1.7.1 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION else - VERSION=1.4.28 + VERSION=1.6.0 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION fi SOURCE=$SPELL-$VERSION.tar.gz diff --git a/news/liferea/HISTORY b/news/liferea/HISTORY index 970e3ee605..6f12adba62 100644 --- a/news/liferea/HISTORY +++ b/news/liferea/HISTORY @@ -1,3 +1,26 @@ +2009-08-10 George Sherwood <gsherwood@sourcemage.org> + * DETAILS: Updated devel to 1.7.1 + +2009-07-26 George Sherwood <gsherwood@sourcemage.org> + * DETAILS: Update devel to current stable also. + * CONFIGURE: Removed. No other backends other than webkitgtk + * DEPENDS: Only backend is webkitgtk + +2009-07-25 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de> + * CONFIGURE, DEPENDS, DETAILS: updated stable to 1.6.0 + +2009-07-21 George Sherwood <gsherwood@sourcemage.org> + * DETAILS: Updated devel to 1.6.0-rc7 + +2009-06-29 George Sherwood <gsherwood@sourcemage.org> + * DETAILS: Updated devel to 1.6.0-rc6 + +2009-06-13 George Sherwood <gsherwood@sourcemage.org> + * DETAILS: Updated devel to 1.6.0-rc5 + +2009-06-05 George Sherwood <gsherwood@sourcemage.org> + * DETAILS: Updated devel to 1.6.0-rc4 + 2009-05-29 George Sherwood <gsherwood@sourcemage.org> * DETAILS: Updated devel to 1.6.0-rc3 diff --git a/news/liferea/liferea-1.4.28.tar.gz.sig b/news/liferea/liferea-1.4.28.tar.gz.sig Binary files differdeleted file mode 100644 index 77879d53af..0000000000 --- a/news/liferea/liferea-1.4.28.tar.gz.sig +++ /dev/null diff --git a/news/liferea/liferea-1.6.0.tar.gz.sig b/news/liferea/liferea-1.6.0.tar.gz.sig Binary files differnew file mode 100644 index 0000000000..e46ec5a047 --- /dev/null +++ b/news/liferea/liferea-1.6.0.tar.gz.sig diff --git a/news/liferea/liferea-1.7.1.tar.gz.sig b/news/liferea/liferea-1.7.1.tar.gz.sig Binary files differnew file mode 100644 index 0000000000..16ed13b54f --- /dev/null +++ b/news/liferea/liferea-1.7.1.tar.gz.sig |