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

12 files changed, 44 insertions, 32 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
deleted 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
new 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
new file mode 100644
index 0000000000..16ed13b54f
--- /dev/null
+++ b/news/liferea/liferea-1.7.1.tar.gz.sig
diff --git a/news/snownews/BUILD b/news/snownews/BUILD
index 78a473056c..378126da4c 100755
--- a/news/snownews/BUILD
+++ b/news/snownews/BUILD
@@ -1,7 +1,3 @@
-OPTS="--charset=${CHARSET}
-      --prefix=${INSTALL_ROOT}/usr
-      ${OPTS}
-" &&
-
+OPTS="--prefix=${INSTALL_ROOT}/usr ${OPTS}" &&
 ./configure ${OPTS} &&
 make
diff --git a/news/snownews/CONFIGURE b/news/snownews/CONFIGURE
deleted file mode 100755
index 8a81e3c6b2..0000000000
--- a/news/snownews/CONFIGURE
+++ /dev/null
@@ -1 +0,0 @@
-config_query_string CHARSET "Select charset" ISO-8859-1
diff --git a/news/snownews/DEPENDS b/news/snownews/DEPENDS
index 7d4546e2cc..45de2f462b 100755
--- a/news/snownews/DEPENDS
+++ b/news/snownews/DEPENDS
@@ -1,5 +1,5 @@
-depends glibc   &&
 depends ncurses &&
 depends libxml2 &&
 depends gettext &&
+depends xml-libxml &&
 depends perl    
diff --git a/news/snownews/DETAILS b/news/snownews/DETAILS
index 31a439beaf..72d317a703 100755
--- a/news/snownews/DETAILS
+++ b/news/snownews/DETAILS
@@ -1,13 +1,13 @@
            SPELL=snownews
-         VERSION=1.5.7
+         VERSION=1.5.11
           SOURCE=${SPELL}-${VERSION}.tar.gz
-         SOURCE2=${SOURCE}.sign
+         SOURCE2=${SOURCE}.asc
 SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
       SOURCE_URL=http://kiza.kcore.de/software/snownews/download/$SOURCE
-     SOURCE2_URL=${SOURCE_URL}.sign
+     SOURCE2_URL=${SOURCE_URL}.asc
   SOURCE2_IGNORE=signature
         WEB_SITE=http://kiza.kcore.de/software/snownews/
-      SOURCE_GPG="snownews.gpg:${SOURCE}.sign"
+      SOURCE_GPG="snownews.gpg:${SOURCE2}:UPSTREAM_KEY"
          ENTERED=20060119
       LICENSE[0]=GPL
         KEYWORDS="client rss news"
@@ -21,10 +21,13 @@ XML parsing. ncurses must be at least version 5.0. It should work with any
 version of libxml2.  Features
 
     * Runs on Linux,
-    *BSD, OS X (Darwin), Solaris and probably many more Unices. Yes, even works under Cygwin.
+    *BSD, OS X (Darwin), Solaris and probably many more Unices. Yes, even
+    works under Cygwin.
     * Fast and very resource friendly.
-    * Builtin HTTP client will follow server redirects and update feed URLs that point to permanent redirects (301) automatically.
-    * Snownews understands "Not-Modified" (304) server replies and handles gzip compression.
+    * Builtin HTTP client will follow server redirects and update feed URLs
+    that point to permanent redirects (301) automatically.
+    * Snownews understands "Not-Modified" (304) server replies and handles
+    gzip compression.
     * Local cache for minimal network traffic.
     * HTTP proxy support.
     * HTTP authentication support (basic and digest methods).
diff --git a/news/snownews/HISTORY b/news/snownews/HISTORY
index 3ee3b19ba2..eabf76961b 100644
--- a/news/snownews/HISTORY
+++ b/news/snownews/HISTORY
@@ -1,3 +1,9 @@
+2009-06-29 Andraž "ruskie" Levstik <ruskie+f03a580f@codemages.net>
+	* DETAILS: updated spell to 1.5.11
+	  fixed long description wrap
+	* CONFIGURE: removed
+	* DEPENDS: added xml-libxml
+
 2007-03-24 Mark Bainter <mbainter-smgl@lostinagoodbook.org>
 	* DEPENDS: Added perl to the depends list, required to run the configure script