--- arora-0.10.2.orig/debian/copyright +++ arora-0.10.2/debian/copyright @@ -0,0 +1,51 @@ +This package was debianized by Sune Vuorela on +Sun, 25 May 2008 15:45:28 +0200. + +It was downloaded from http://code.google.com/p/arora/ + +Upstream Author: + Benjamin Meyer + +Copyright: + Copyright 1998-1999 Netscape Communications Corporation. All + Copyright 2005-2008 Trolltech ASA. All rights reserved. + Copyright 2005-2008 Trolltech ASA. All rights reserved. + Copyright 2006 Junio C Hamano + Copyright 2007-2009 Benjamin C. Meyer + Copyright 2008 Ariya Hidayat + Copyright 2008-2009 Christian Franke + Copyright 2008 Diego Iastrubni, elcuco, at, kde.org + Copyright 2008 Jason A. Donenfeld + Copyright 2008 Matvey Kozhev + Copyright 2008-2009 Arora Developers + Copyright 2008-2009 Benjamin K. Stuhl + Copyright 2008-2009 Jason A. Donenfeld + Copyright 2009 Jakub Wieczorek + Copyright 2009 Torch Mobile Inc. http://www.torchmobile.com/ + + + +License: + +The contents is a mix of files under GPLv2, GPLv2 or later, GPLv2 with Trolltech exceptions. +Effectively, this makes the package GPLv2: + + This package is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this package; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +On Debian systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL-2'. + +The Debian packaging is (C) 2008, Sune Vuorela and +is licensed under the GPL, see above. --- arora-0.10.2.orig/debian/control +++ arora-0.10.2/debian/control @@ -0,0 +1,16 @@ +Source: arora +Section: web +Priority: extra +XSBC-Original-Maintainer: Sune Vuorela +Maintainer: Ubuntu Developers +Build-Depends: debhelper (>= 5), libqt4-dev (>= 4.4), quilt +Standards-Version: 3.7.3 + +Package: arora +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Provides: www-browser +Description: simple cross platform web browser + simple webkit based webbrowser using Qt toolkit. Originally based + on the Qt demo browser to show the possibilities of Qt Webkit. + Arora is a very basic browser that supports history and bookmarks. --- arora-0.10.2.orig/debian/compat +++ arora-0.10.2/debian/compat @@ -0,0 +1 @@ +5 --- arora-0.10.2.orig/debian/watch +++ arora-0.10.2/debian/watch @@ -0,0 +1,3 @@ +version=3 +http://code.google.com/p/arora/downloads/list \ + http://arora.googlecode.com/files/arora-([\d\.]+)\.tar\.gz --- arora-0.10.2.orig/debian/rules +++ arora-0.10.2/debian/rules @@ -0,0 +1,78 @@ +#!/usr/bin/make -f +# -*- makefile -*- +# Sample debian/rules that uses debhelper. +# This file was originally written by Joey Hess and Craig Small. +# As a special exception, when this file is copied by dh-make into a +# dh-make output file, you may use that output file without restriction. +# This special exception was added by Craig Small in version 0.37 of dh-make. + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +include /usr/share/quilt/quilt.make + +builddir: + mkdir -p builddir + +builddir/Makefile: builddir patch + cd builddir && qmake-qt4 PREFIX=/usr ../arora.pro + +build: build-stamp + +build-stamp: builddir/Makefile + dh_testdir + + # Add here commands to compile the package. + cd builddir && $(MAKE) + #docbook-to-man debian/arora.sgml > arora.1 + + touch $@ + +clean: unpatch + dh_testdir + dh_testroot + rm -f build-stamp + + # Add here commands to clean up after the build process. + rm -rf builddir + rm -rf tools/htmlToXBel/.rcc/qrc_source.cpp + find . -name .obj | xargs rm -rf + + dh_clean + +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + + # Add here commands to install the package into debian/arora. + cd builddir && $(MAKE) INSTALL_ROOT=$(CURDIR)/debian/arora install + + +# Build architecture-independent files here. +binary-indep: build install +# We have nothing to do by default. + +# Build architecture-dependent files here. +binary-arch: build install + dh_testdir + dh_testroot + dh_installchangelogs ChangeLog + dh_installdocs + dh_installexamples + dh_installmenu + dh_installman + dh_desktop + dh_link + dh_strip + dh_compress + dh_fixperms + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install configure --- arora-0.10.2.orig/debian/changelog +++ arora-0.10.2/debian/changelog @@ -0,0 +1,234 @@ +arora (0.10.2-0ubuntu1) lucid; urgency=low + + * New upstream release + * Merge from Debian, remaining changes: + - Add watch file + - Add postinst and prerm for x-www-browser + - Provides www-browser + - Add dh_desktop to debian/rules + - Better clean rule + - Use quilt and add patch target + - kubuntu_01_locationbar_painting_fix.diff from upstream + - kubuntu_03_flash_install_prompt.diff for kubuntu notifier + - kubuntu_04_webpage_destructor.diff from upstream + - kubuntu_05_no_javascript_fix.diff from upstream + - kubuntu_06_fix_desktop_translations.diff make translations work + + -- Roderick B. Greening Mon, 07 Dec 2009 09:52:39 -0330 + +arora (0.10.1-1) unstable; urgency=low + + * New upstream release + + -- Sune Vuorela Mon, 12 Oct 2009 11:25:21 +0200 + +arora (0.9.0-1) unstable; urgency=low + + * New upstream release + + -- Sune Vuorela Mon, 31 Aug 2009 21:49:44 +0200 + +arora (0.8.0-1) unstable; urgency=low + + * New upstream release + + -- Sune Vuorela Wed, 12 Aug 2009 22:18:45 +0200 + +arora (0.10.1-0ubuntu4) karmic; urgency=low + + * Add kubuntu_06_fix_desktop_translations.diff, fix translations not + showing in menu + + -- Jonathan Riddell Thu, 15 Oct 2009 13:30:11 +0100 + +arora (0.10.1-0ubuntu3) karmic; urgency=low + + * Add patches + - kubuntu_04_webpage_destructor.diff - Fix crash when closing noaa.gov + - kubuntu_05_no_javascript_fix.diff - Workaround for crash when JS disabled + + -- Roderick B. Greening Thu, 08 Oct 2009 11:04:21 -0230 + +arora (0.10.1-0ubuntu2) karmic; urgency=low + + * Add kubuntu_01_locationbar_painting_fix.diff to fix the 1-pixel line + under the search bar while using the Oxygen widget style (LP: #444557) + + -- Jonathan Thomas Tue, 06 Oct 2009 00:37:59 -0400 + +arora (0.10.1-0ubuntu1) karmic; urgency=low + + * New release + + -- Roderick B. Greening Mon, 05 Oct 2009 12:44:10 -0230 + +arora (0.10.0-0ubuntu1) karmic; urgency=low + + * New upstream release + * Remove patches + - kubuntu_01_google_lucky.diff - Open Search now used upstream + - kubuntu_02_default_bookmarks.diff - bookmarks fixed upstream + + -- Roderick B. Greening Thu, 01 Oct 2009 16:08:58 -0230 + +arora (0.9.0-0ubuntu1) karmic; urgency=low + + * New upstream release + * Update patches: + - kubuntu_02_default_bookmarks.diff + * Remove patches: + - kubuntu_04_startpage_spacing.diff (fixed upstream) + - kubuntu_05_manpages.diff (fixed upstream) + - kubuntu_07_adblock.diff (unstable/unsuitable) + + -- Roderick B. Greening Thu, 10 Sep 2009 15:24:04 -0230 + +arora (0.8.0-0ubuntu7) karmic; urgency=low + + * Added patch for adblock support. + + -- Anthony Mercatante Wed, 26 Aug 2009 15:29:50 +0200 + +arora (0.8.0-0ubuntu6) karmic; urgency=low + + * Make lintian happier upload: + + Add dh_desktop to the install target. Also makes GNOME users happier + + Add kubuntu_05_manpages.diff, the manpages should not be in section 4, + since section 4 is usually used for device files (special files generally) + - Not bumping Standards-Version to avoid unnecessary diff to Debian + + -- Harald Sitter Sun, 09 Aug 2009 00:58:34 +0200 + +arora (0.8.0-0ubuntu5) karmic; urgency=low + + * update-x-www-browser-alternatives with Arora (LP: #410790) + + -- Harald Sitter Sun, 09 Aug 2009 00:41:45 +0200 + +arora (0.8.0-0ubuntu4) karmic; urgency=low + + * Add kubuntu_04_startpage_spacing.diff + + Reduce the top margin from 200px to 100px, otherwise it doesn't fit + on a netbook screen + + -- Harald Sitter Fri, 07 Aug 2009 19:12:57 +0200 + +arora (0.8.0-0ubuntu3) karmic; urgency=low + + * Enhance kubuntu_02_default_bookmarks.diff + + Hide the bookmarkstoolbar by default (it's empty anyway) + * Enhance clean target to also remove tools/htmlToXBel/.rcc/qrc_source.cpp + + -- Harald Sitter Fri, 07 Aug 2009 13:00:00 +0200 + +arora (0.8.0-0ubuntu2) karmic; urgency=low + + * Add kubuntu_03_flash_install_prompt.diff to prompt for Flash install + * Improve clean rule to remove what qmake doesn't + + -- Jonathan Riddell Mon, 27 Jul 2009 13:33:22 +0100 + +arora (0.8.0-0ubuntu1) karmic; urgency=low + + * New upstream release + * Fix debian/rules to apply patches + + -- Jonathan Riddell Thu, 23 Jul 2009 17:20:55 +0100 + +arora (0.7.1-0ubuntu3) karmic; urgency=low + + * Add kubuntu_02_default_bookmarks.diff to remove default bookmarks + * Add kubuntu_03_blank_default_home.diff to set default page to blank + + -- Jonathan Riddell Wed, 15 Jul 2009 16:47:31 +0100 + +arora (0.7.1-0ubuntu2) karmic; urgency=low + + * Add debian/watch (LP: #392386). + + -- Daniel T Chen Thu, 25 Jun 2009 23:42:13 -0400 + +arora (0.7.1-0ubuntu1) karmic; urgency=low + + * New upstream release + * Added kubuntu_01_google_lucky.diff: + Added Google "I'm lucky" support for the location bar + + -- Anthony Mercatante Mon, 01 Jun 2009 08:08:21 +0200 + +arora (0.7.0-1~jaunty1) jaunty-backports; urgency=low + + * Automated backport upload; no source changes. + + -- Christian Mangold Thu, 28 May 2009 23:01:41 +0100 + +arora (0.7.0-1) unstable; urgency=low + + * New upstream release + * Update copyright file + * Qt4.5 is in testing, let us just require Qt4.4 for now. + + -- Sune Vuorela Mon, 25 May 2009 01:11:52 +0200 + +arora (0.6.1-1) unstable; urgency=low + + * New upstream release + + -- Sune Vuorela Sat, 09 May 2009 13:08:50 +0200 + +arora (0.6-1) unstable; urgency=low + + * New upstream. (Closes: #525862) + - Crtl-Q works. (Closes: #520279) + - Letters with accents are supposed to work: (Closes: #520419) + * Keep strong dependencies for now to ensure feature parity across + architectures. + * Add menu file, thanks Pawel Sadkowski. (Closes: 513794) + + -- Sune Vuorela Tue, 28 Apr 2009 09:53:33 +0200 + +arora (0.5-10) experimental; urgency=low + + * Put in experimental with experimental qt. Stronger build-depends. + + -- Sune Vuorela Wed, 18 Mar 2009 10:04:47 +0100 + +arora (0.5-1) unstable; urgency=low + + * New upstream release. (Closes: #519400) + * Update copyright file. + * Make sure not to compress makefile before it is installed. + + -- Sune Vuorela Sun, 15 Mar 2009 21:42:10 +0100 + +arora (0.4-1) unstable; urgency=low + + * New upstream release. (Closes: #501524) + + -- Sune Vuorela Sun, 12 Oct 2008 12:20:34 +0200 + +arora (0.3-1) unstable; urgency=low + + * New upstream release. + + -- Sune Vuorela Tue, 19 Aug 2008 00:32:03 +0200 + +arora (0.2-1) unstable; urgency=low + + * Finally a upstream release. + * Use make install instead of handpicking files. + + -- Sune Vuorela Sun, 29 Jun 2008 22:41:06 +0200 + +arora (0.2~gitcee18fe62222ce55bf-1) unstable; urgency=low + + * New upstream snapshot. + + -- Sune Vuorela Sun, 08 Jun 2008 00:32:56 +0200 + +arora (0.2~git9fbbe4bd99818a12-1) unstable; urgency=low + + * Initial release (Closes: #482846) + + -- Sune Vuorela Sun, 25 May 2008 15:45:28 +0200 + --- arora-0.10.2.orig/debian/arora.prerm +++ arora-0.10.2/debian/arora.prerm @@ -0,0 +1,10 @@ +#!/bin/sh +set -e + +if [ "$1" = "remove" ] || [ "$1" = "deconfigure" ] ; then + update-alternatives --remove x-www-browser /usr/bin/arora +fi + +#DEBHELPER# + +exit 0 --- arora-0.10.2.orig/debian/arora.postinst +++ arora-0.10.2/debian/arora.postinst @@ -0,0 +1,8 @@ +#!/bin/sh +set -e + +update-alternatives --install \ + /usr/bin/x-www-browser x-www-browser /usr/bin/arora 90 \ + --slave /usr/share/man/man1/x-www-browser.1.gz x-www-browser.1.gz /usr/share/man/man1/arora.1.gz + +#DEBHELPER# --- arora-0.10.2.orig/debian/arora.menu +++ arora-0.10.2/debian/arora.menu @@ -0,0 +1,3 @@ +?package(arora):needs="x11" section="Applications/Network/Web Browsing" \ + title="Arora" longtitle="Arora Web Browser" \ + command="arora" icon="/usr/share/pixmaps/arora.xpm" --- arora-0.10.2.orig/debian/patches/kubuntu_05_no_javascript_fix.diff +++ arora-0.10.2/debian/patches/kubuntu_05_no_javascript_fix.diff @@ -0,0 +1,14 @@ +--- arora-0.10.1/src/webpage.cpp 2009-10-05 01:01:48.000000000 -0230 ++++ arora-0.10.1/src/webpage.cpp.new 2009-10-08 11:09:11.181265660 -0230 +@@ -194,6 +194,11 @@ + + void WebPage::addExternalBinding(QWebFrame *frame) + { ++#if QT_VERSION < 0x040600 ++ QWebSettings *defaultSettings = QWebSettings::globalSettings(); ++ if (!defaultSettings->testAttribute(QWebSettings::JavascriptEnabled)) ++ return; ++#endif + if (!m_javaScriptExternalObject) + m_javaScriptExternalObject = new JavaScriptExternalObject(this); + --- arora-0.10.2.orig/debian/patches/kubuntu_03_flash_install_prompt.diff +++ arora-0.10.2/debian/patches/kubuntu_03_flash_install_prompt.diff @@ -0,0 +1,30 @@ +--- orig/arora-0.8.0/src/browserapplication.cpp 2009-07-19 23:47:14.000000000 +0100 ++++ arora-0.8.0/src/browserapplication.cpp 2009-07-27 13:14:55.000000000 +0100 +@@ -83,6 +83,9 @@ + + #include + ++#include ++#include ++ + DownloadManager *BrowserApplication::s_downloadManager = 0; + HistoryManager *BrowserApplication::s_historyManager = 0; + NetworkAccessManager *BrowserApplication::s_networkAccessManager = 0; +@@ -146,6 +149,17 @@ + QTimer::singleShot(0, this, SLOT(postLaunch())); + #endif + languageManager(); ++ ++ //Added by Kubuntu for update-notifier-kde to prompt for restricted codec install ++ QDBusMessage m = QDBusMessage::createMethodCall(QLatin1String("org.kubuntu.restrictedInstall"), ++ QLatin1String("/org/kubuntu/restrictedInstall"), ++ QLatin1String("org.kubuntu.restrictedInstall"), ++ QLatin1String("installRestricted")); ++ QList dbusargs; ++ dbusargs.append(QLatin1String("Arora Web Browser")); ++ dbusargs.append(QLatin1String("flashplugin-installer")); ++ m.setArguments(dbusargs); ++ bool queued = QDBusConnection::sessionBus().send(m); + } + + BrowserApplication::~BrowserApplication() --- arora-0.10.2.orig/debian/patches/series +++ arora-0.10.2/debian/patches/series @@ -0,0 +1,5 @@ +kubuntu_01_locationbar_painting_fix.diff +kubuntu_03_flash_install_prompt.diff +kubuntu_04_webpage_destructor.diff +kubuntu_05_no_javascript_fix.diff +kubuntu_06_fix_desktop_translations.diff --- arora-0.10.2.orig/debian/patches/kubuntu_01_locationbar_painting_fix.diff +++ arora-0.10.2/debian/patches/kubuntu_01_locationbar_painting_fix.diff @@ -0,0 +1,74 @@ +Index: arora-0.10.1/src/locationbar/locationbar.cpp +=================================================================== +--- arora-0.10.1.orig/src/locationbar/locationbar.cpp 2009-10-06 00:34:17.000000000 -0400 ++++ arora-0.10.1/src/locationbar/locationbar.cpp 2009-10-06 00:37:38.000000000 -0400 +@@ -63,10 +63,6 @@ + setUpdatesEnabled(true); + + m_defaultBaseColor = palette().color(QPalette::Base); +- +- QPalette p = palette(); +- p.setColor(QPalette::Base, QColor(255, 255, 255, 100)); +- setPalette(p); + } + + void LocationBar::setWebView(WebView *webView) +@@ -93,21 +89,8 @@ + setCursorPosition(0); + } + +-static QLinearGradient generateGradient(const QColor &top, const QColor &middle, int height) +-{ +- QLinearGradient gradient(0, 0, 0, height); +- gradient.setColorAt(0, top); +- gradient.setColorAt(0.15, middle.lighter(120)); +- gradient.setColorAt(0.5, middle); +- gradient.setColorAt(0.85, middle.lighter(120)); +- gradient.setColorAt(1, top); +- return gradient; +-} +- + void LocationBar::paintEvent(QPaintEvent *event) + { +- QPainter painter(this); +- + QPalette p = palette(); + QColor backgroundColor = m_defaultBaseColor; + if (m_webView && m_webView->url().scheme() == QLatin1String("https") +@@ -116,29 +99,19 @@ + backgroundColor = lightYellow; + } + +- // paint the text background +- QStyleOptionFrameV2 panel; +- initStyleOption(&panel); +- QRect backgroundRect = style()->subElementRect(QStyle::SE_LineEditContents, &panel, this); +- painter.setBrush(backgroundColor); +- painter.setPen(backgroundColor); +- painter.drawRect(backgroundRect); +- +- // paint the progressbar +- if (m_webView && !hasFocus()) { ++ // set the progress bar ++ if (m_webView) { + int progress = m_webView->progress(); + QColor loadingColor = QColor(116, 192, 250); + if (p.color(QPalette::Text).value() >= 128) + loadingColor = m_defaultBaseColor.darker(200); + +- painter.setBrush(generateGradient(m_defaultBaseColor, loadingColor, height())); +- painter.setPen(Qt::transparent); +- +- int mid = backgroundRect.width() * progress / 100; +- QRect progressRect = QRect(backgroundRect.x(), backgroundRect.y(), mid, backgroundRect.height()); +- painter.drawRect(progressRect); ++ QLinearGradient gradient(0, 0, width(), 0); ++ gradient.setColorAt(0, loadingColor); ++ gradient.setColorAt(((double)progress)/100, backgroundColor); ++ p.setBrush(QPalette::Base, gradient); ++ setPalette(p); + } +- painter.end(); + + LineEdit::paintEvent(event); + } --- arora-0.10.2.orig/debian/patches/kubuntu_06_fix_desktop_translations.diff +++ arora-0.10.2/debian/patches/kubuntu_06_fix_desktop_translations.diff @@ -0,0 +1,47 @@ +--- arora/src/arora.desktop 2009-10-05 04:31:48.000000000 +0100 ++++ arora/src/arora.desktop 2009-10-15 13:23:30.000000000 +0100 +@@ -1,6 +1,5 @@ + [Desktop Entry] + Name=Arora +-Name[en_US]=Arora + Name[es]=Arora + Name[gl]=Arora + Name[sr]=Арора +@@ -8,27 +7,27 @@ + Comment=Browse the World Wide Web + Comment[ast]=Restola pola World Wide Web + Comment[es]=Navegar por internet +-Comment[fr_FR]=Surfer sur le web ++Comment[fr]=Surfer sur le web + Comment[gl]=Navegar pola internet + Comment[nl]=Surfen op het wereldwijde web +-Comment[nl_NL]=Surfen op het wereldwijde web ++Comment[nl]=Surfen op het wereldwijde web + Comment[sr]=Крстарите интернетом + Comment[sr@latin]=Krstarite Internetom +-Comment[ja_JP]=Webを閲覧します ++Comment[ja]=Webを閲覧します + GenericName=Web Browser + GenericName[ast]=Restolador web +-GenericName[cs_CZ]=Webový prohlížeč +-GenericName[en_US]=Web Browser ++GenericName[cs]=Webový prohlížeč ++GenericName[en]=Web Browser + GenericName[es]=Navegador web +-GenericName[fr_FR]=Navigateur web ++GenericName[fr]=Navigateur web + GenericName[gl]=Navegador web + GenericName[nl]=Webbrowser +-GenericName[nl_NL]=Webbrowser +-GenericName[pl_PL]=Przeglądarka WWW ++GenericName[nl]=Webbrowser ++GenericName[pl]=Przeglądarka WWW + GenericName[sr]=Веб прегледач + GenericName[sr@latin]=Web pregledač +-GenericName[nb_NO]=Nettleser +-GenericName[ja_JP]=Webブラウザ ++GenericName[nb]=Nettleser ++GenericName[ja]=Webブラウザ + Exec=arora %u + Terminal=false + Type=Application --- arora-0.10.2.orig/debian/patches/kubuntu_04_webpage_destructor.diff +++ arora-0.10.2/debian/patches/kubuntu_04_webpage_destructor.diff @@ -0,0 +1,25 @@ +--- arora-0.10.1/src/webpage.cpp 2009-10-05 01:01:48.000000000 -0230 ++++ arora-0.10.1/src/webpage.cpp.new 2009-10-08 11:00:22.213789555 -0230 +@@ -114,6 +114,11 @@ + loadSettings(); + } + ++WebPage::~WebPage() ++{ ++ setNetworkAccessManager(0); ++} ++ + WebPluginFactory *WebPage::webPluginFactory() + { + if (!s_webPluginFactory) +--- arora-0.10.1/src/webpage.h 2009-10-05 01:01:48.000000000 -0230 ++++ arora-0.10.1/src/webpage.h.new 2009-10-08 11:03:09.713783760 -0230 +@@ -74,6 +74,8 @@ + + public: + WebPage(QObject *parent = 0); ++ ~WebPage(); ++ + void loadSettings(); + + static WebPluginFactory *webPluginFactory();