--- newsbeuter-0.9.orig/Makefile +++ newsbeuter-0.9/Makefile @@ -17,7 +17,7 @@ # compiler and linker flags DEFINES=-D_ENABLE_NLS -DLOCALEDIR=\"$(localedir)\" -DPACKAGE=\"$(PACKAGE)\" WARNFLAGS=-Wall -Wextra -CXXFLAGS+=-ggdb -I./include -I./stfl -I./filter -I. -I./xmlrss $(WARNFLAGS) $(DEFINES) +CXXFLAGS+=-ggdb -I./include -I./stfl -I./filter -I. $(WARNFLAGS) $(DEFINES) CFLAGS+=-ggdb -I./xmlrss $(WARNFLAGS) $(DEFINES) LDFLAGS+=-L. @@ -40,7 +40,7 @@ NEWSBEUTER=$(PACKAGE) NEWSBEUTER_SOURCES:=$(shell cat newsbeuter.deps) NEWSBEUTER_OBJS:=$(patsubst %.cpp,%.o,$(NEWSBEUTER_SOURCES)) -NEWSBEUTER_LIBS=-lbeuter -lfilter -lstfl -lncursesw -lpthread -lxmlrss +NEWSBEUTER_LIBS=-lbeuter -lfilter -lstfl -lncursesw -lpthread -lnxml -lmrss XMLRSSLIB_SOURCES:=$(wildcard xmlrss/*.c) XMLRSSLIB_OBJS:=$(patsubst xmlrss/%.c,xmlrss/%.o,$(XMLRSSLIB_SOURCES)) @@ -75,7 +75,7 @@ all: $(NEWSBEUTER) $(PODBEUTER) -NB_DEPS=$(MOFILES) $(XMLRSSLIB_OUTPUT) $(LIB_OUTPUT) $(FILTERLIB_OUTPUT) $(NEWSBEUTER_OBJS) +NB_DEPS=$(MOFILES) $(LIB_OUTPUT) $(FILTERLIB_OUTPUT) $(NEWSBEUTER_OBJS) $(NEWSBEUTER): $(NB_DEPS) $(CXX) $(LDFLAGS) $(CXXFLAGS) -o $(NEWSBEUTER) $(NEWSBEUTER_OBJS) $(NEWSBEUTER_LIBS) --- newsbeuter-0.9.orig/debian/compat +++ newsbeuter-0.9/debian/compat @@ -0,0 +1 @@ +6 --- newsbeuter-0.9.orig/debian/copyright +++ newsbeuter-0.9/debian/copyright @@ -0,0 +1,33 @@ +This package was debianized by Nico Golde on +Mon, 15 Jan 2007 23:10:03 +0100. + +It was downloaded from: http://synflood.at/newsbeuter.html + +Upstream Author: Andreas Krennmair + +Copyright: 2006-2008 Andreas Krennmair + +License: + +MIT/X Consortium License + +Permission is hereby granted, free of charge, to any person obtaining a +copy of this software and associated documentation files (the "Software"), +to deal in the Software without restriction, including without limitation +the rights to use, copy, modify, merge, publish, distribute, sublicense, +and/or sell copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +DEALINGS IN THE SOFTWARE. + +The Debian packaging is (C) 2007-2008, Nico Golde and +is licensed under the GPL, see `/usr/share/common-licenses/GPL'. --- newsbeuter-0.9.orig/debian/config +++ newsbeuter-0.9/debian/config @@ -0,0 +1 @@ +browser sensible-browser --- newsbeuter-0.9.orig/debian/watch +++ newsbeuter-0.9/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://synflood.at/newsbeuter.html (?:.*/)?newsbeuter-?_?([\d+\.]+|\d+)\.tar.* debian uupdate --- newsbeuter-0.9.orig/debian/rules +++ newsbeuter-0.9/debian/rules @@ -0,0 +1,58 @@ +#!/usr/bin/make -f +#export DH_VERBOSE=1 + +#include /usr/share/dpatch/dpatch.make + +CFLAGS = -Wall -g +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS += -O0 +else + CFLAGS += -O2 +endif + +export CFLAGS + +build: build-stamp + +build-stamp: + dh_testdir + $(MAKE) prefix=/usr all + touch $@ + +clean: + dh_testdir + dh_testroot + rm -f build-stamp + dh_clean + + $(MAKE) distclean + +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + + $(MAKE) prefix=$(CURDIR)/debian/newsbeuter/usr install + install -m644 debian/config $(CURDIR)/debian/newsbeuter/etc/newsbeuter + +binary-indep: build install +binary-arch: build install + dh_testdir + dh_testroot + dh_installchangelogs CHANGES + dh_installdocs + dh_link + dh_strip + dh_compress + dh_fixperms + dh_installdeb + dh_shlibdeps + libnxml-depends + libmrss-depends + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install --- newsbeuter-0.9.orig/debian/control +++ newsbeuter-0.9/debian/control @@ -0,0 +1,19 @@ +Source: newsbeuter +Section: net +Priority: optional +Maintainer: Nico Golde +Build-Depends: libncursesw5-dev, debhelper (>= 6), libnxml0-dev(>= 0.18), libmrss0-dev (>= 0.18), libstfl-dev (>= 0.14), libsqlite3-dev, perl, pkg-config +Standards-Version: 3.7.3 +Homepage: http://synflood.at/newsbeuter.html + +Package: newsbeuter +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: text mode rss feed reader with podcast support + newsbeuter is an innovative RSS feed reader for the text console. + It supports OPML import/exports, HTML rendering, podcast (podbeuter), + offline reading, searching and storing articles to your filesystem, + and many more features. + . + Its user interface is coherent, easy to use, and might look + common to users of mutt and slrn. --- newsbeuter-0.9.orig/debian/dirs +++ newsbeuter-0.9/debian/dirs @@ -0,0 +1 @@ +etc/newsbeuter --- newsbeuter-0.9.orig/debian/docs +++ newsbeuter-0.9/debian/docs @@ -0,0 +1,3 @@ +AUTHORS +TODO +README --- newsbeuter-0.9.orig/debian/changelog +++ newsbeuter-0.9/debian/changelog @@ -0,0 +1,187 @@ +newsbeuter (0.9-1) unstable; urgency=low + + * New upstream release. + - Fix problem displaying titles when using zh_CN.UTF-8 + locale (Closes: #471434). + * Add default configuration to set sensible-browser as browser and + add dirs file to create /etc/newsbeuter (Closes: #470833). + * remove libnxml-depends and libmrss-depends calls in rules and + related dependency lines in control since they are not needed + anymore (Closes: #467201). + + -- Nico Golde Thu, 01 May 2008 14:51:20 +0200 + +newsbeuter (0.8.2-1) unstable; urgency=low + + * New upstream release. + + -- Nico Golde Sun, 16 Mar 2008 16:38:06 +0100 + +newsbeuter (0.8.1-1) unstable; urgency=low + + * New upstream release. + - Fixes crash in special locale combinations + due to a bug when converting database content from multibyte to + widechar (Closes: #470390). + + -- Nico Golde Tue, 11 Mar 2008 21:46:40 +0100 + +newsbeuter (0.8-1) unstable; urgency=low + + * New upstream version. + * debian/rules: care about DEB_BUILD_OPTIONS. + * debian/copyright: adjust copyright years. + * debian/control: adding pkg-config as build-dependency as newsbeuter's + buildsystem makes use of it now. + * Patch Makefile and various source files to prevent linking against local + copy of mrss and nxml. + + -- Nico Golde Fri, 07 Mar 2008 13:44:43 +0100 + +newsbeuter (0.7-5) unstable; urgency=low + + * Tighten the build dependencies to libnxml and libmrss to workaround + possible future ABI breaks in those libs, thanks Torsten Werner for the + patch. + + -- Nico Golde Tue, 04 Mar 2008 15:17:49 +0100 + +newsbeuter (0.7-4) unstable; urgency=low + + * Switch to compat level 6 as it is default now. + * Change free call to sqlite3_free because we have sqlite-3.5 + in Debian now (Closes: #468476). + + -- Nico Golde Fri, 29 Feb 2008 15:10:16 +0100 + +newsbeuter (0.7-3) unstable; urgency=low + + * Add missing include headers to prevent FTBFS + with gcc 4.3 (Closes: #455611). + + -- Nico Golde Sun, 20 Jan 2008 13:27:17 +0100 + +newsbeuter (0.7-2) unstable; urgency=low + + * Bump Standards Version, no changes needed. + * Use the new Homepage control field instead of the Homepage tag. + * Add missing includes for cstdlib in formatstring.cpp, + cstdlib and cstring in configparser.cpp and alloca.h + in logger.cpp (Closes: #455611). + + -- Nico Golde Wed, 12 Dec 2007 19:14:21 +0100 + +newsbeuter (0.7-1) unstable; urgency=low + + * New upstream release. + - numbering of URLs not inconsistent anymore (Closes: #439170). + * New release makes previously introduced patches obsolete so + dpatch stuff and patches/ removed. + + -- Nico Golde Tue, 18 Sep 2007 13:54:54 +0200 + +newsbeuter (0.6-2) unstable; urgency=low + + * Included patch (01_quotefix.dpatch) to workaround design error + in stfl_quote (see #439644). + * Created patch (02_error-on-failed-inclusion.dpatch) to report an error + message on failed file inclusion via the configuration + file (Closes: #438936). + * Build-Depend on dpatch for patches now. + + -- Nico Golde Sun, 02 Sep 2007 11:58:58 +0200 + +newsbeuter (0.6-1) unstable; urgency=low + + * New upstream release + - fixed broken OPML import (Closes: #436477). + * Added watch file. + + -- Nico Golde Tue, 14 Aug 2007 15:05:24 +0200 + +newsbeuter (0.5-1) unstable; urgency=low + + * New upstream release. + * Removed debian/config, upstream no ships an example config + file. + * Updated dependencies to specific versions since newsbeuter + won't work with older versions. + * Do not suppress clean target output in rules any longer. + + -- Nico Golde Wed, 01 Aug 2007 15:49:28 +0200 + +newsbeuter (0.4-2) unstable; urgency=low + + * Added example config file, thanks to Gregor Herrmann (Closes: #423083). + Next upstream release will ship an example file. + + -- Nico Golde Thu, 10 May 2007 17:13:07 +0000 + +newsbeuter (0.4-1) unstable; urgency=low + + * New upstream release. + * Removed dpatch dependency and patch for header inclusion, + included upstream. + * Changed Build-Dependencies to nxml >= 0.17.2 and mrss >= 0.17.1. + + -- Nico Golde Tue, 08 May 2007 18:35:46 +0200 + +newsbeuter (0.3-6) unstable; urgency=low + + * Recompile to fix broken ABI change of libmrss (Closes: #420340). + + -- Nico Golde Sat, 21 Apr 2007 19:44:35 +0200 + +newsbeuter (0.3-5) unstable; urgency=low + + * Added dependency on dpatch and created patch to prevent FTBS with + newer gcc versions (Closes: #417447). + + -- Nico Golde Tue, 03 Apr 2007 00:33:56 +0200 + +newsbeuter (0.3-4) unstable; urgency=low + + * Fixed prefix for make target *grml*. + + -- Nico Golde Wed, 28 Mar 2007 11:17:32 +0200 + +newsbeuter (0.3-3) unstable; urgency=low + + * Added prefix to make call in rules to prevent + broken locales since the prefix is needed during compile + time here. + + -- Nico Golde Wed, 28 Mar 2007 10:43:53 +0200 + +newsbeuter (0.3-2) unstable; urgency=low + + * Added ncursesw dependency to prevent FTBFS. + + -- Nico Golde Mon, 26 Mar 2007 21:22:07 +0200 + +newsbeuter (0.3-1) unstable; urgency=low + + * New upstream release. + - Dependency on libidn not needed anymore, dropped. + * Changed maintainer address. + * Dependency on libnxml is now >=0.17.1 because of a bug + in previous versions. + + -- Nico Golde Fri, 23 Mar 2007 13:06:57 +0100 + +newsbeuter (0.2-1) unstable; urgency=low + + * New upstream release. + * Added search capability to description field. + * Build-dependencies for libnxml0 (>=0.16) and libmrss0-dev (>=0.17) + since the new release works only with newer versions of these libs. + * Added CHANGES file to dh_installchangelogs instruction in rules. + * Added README to docs. + + -- Nico Golde Wed, 21 Feb 2007 13:53:58 +0100 + +newsbeuter (0.1.1-1) unstable; urgency=low + + * Initial release (Closes: #407054). + + -- Nico Golde Mon, 15 Jan 2007 23:10:03 +0100 --- newsbeuter-0.9.orig/src/controller.cpp +++ newsbeuter-0.9/src/controller.cpp @@ -24,7 +24,7 @@ #include #include -#include <_nxml.h> +#include #include #include --- newsbeuter-0.9.orig/src/rss.cpp +++ newsbeuter-0.9/src/rss.cpp @@ -54,7 +54,7 @@ int my_errno = 0; CURLcode ccode = CURLE_OK; if (my_uri.substr(0,5) == "http:" || my_uri.substr(0,6) == "https:") { - mrss_options_t * options = mrss_options_new(30, proxy, proxy_auth, NULL, NULL, NULL, 0, NULL, user_agent.c_str()); + mrss_options_t * options = mrss_options_new(30, proxy, proxy_auth, NULL, NULL, NULL, 0, NULL, (char *) user_agent.c_str()); { scope_measure m1("mrss_parse_url_with_options_and_error"); err = mrss_parse_url_with_options_and_error(const_cast(my_uri.c_str()), &mrss, options, &ccode); @@ -330,7 +330,7 @@ proxy_auth = const_cast(cfgcont->get_configvalue("proxy-auth").c_str()); } - mrss_options_t * options = mrss_options_new(30, proxy, proxy_auth, NULL, NULL, NULL, 0, NULL, utils::get_useragent(cfgcont).c_str()); + mrss_options_t * options = mrss_options_new(30, proxy, proxy_auth, NULL, NULL, NULL, 0, NULL, (char *) utils::get_useragent(cfgcont).c_str()); err = mrss_get_last_modified_with_options(const_cast(my_uri.c_str()), &newlm, options); --- newsbeuter-0.9.orig/include/urlreader.h +++ newsbeuter-0.9/include/urlreader.h @@ -7,7 +7,7 @@ #include #include -#include <_nxml.h> +#include namespace newsbeuter { --- newsbeuter-0.9.orig/include/controller.h +++ newsbeuter-0.9/include/controller.h @@ -4,7 +4,7 @@ #include #include #include -#include <_nxml.h> +#include #include #include --- newsbeuter-0.9.orig/include/rss.h +++ newsbeuter-0.9/include/rss.h @@ -9,7 +9,7 @@ extern "C" { -#include <_mrss.h> +#include } namespace newsbeuter {