<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array">
    <added>
      <filename>src/data/arora.1</filename>
    </added>
    <added>
      <filename>src/data/arora.xpm</filename>
    </added>
  </added>
  <modified type="array">
    <modified>
      <diff>@@ -1 +1 @@
-6
+5</diff>
      <filename>debian-upstream/compat</filename>
    </modified>
    <modified>
      <diff>@@ -1,23 +1,16 @@
 Source: arora
 Section: web
-Priority: optional
+Priority: extra
 Maintainer: Ubuntu MOTU Developers &lt;ubuntu-motu@lists.ubuntu.com&gt;
-XSBC-Original-Maintainer: Matvey Kozhev &lt;sikon@ubuntu.com&gt;
-Build-Depends: cdbs, debhelper (&gt;= 6), git-core, libqt4-dev (&gt;= 4.4.0)
+XSBC-Original-Maintainer: Sune Vuorela &lt;debian@pusling.com&gt;
+Build-Depends: debhelper (&gt;= 5), libqt4-dev (&gt;= 4.4)
 Standards-Version: 3.7.3
 Homepage: http://arora-browser.org
 
 Package: arora
 Architecture: any
 Depends: ${shlibs:Depends}
-Description: Lightweight web browser based on Qt and WebKit
- Arora is a lightweight, cross-platform web browser using the Qt 4.4 port of
- the WebKit layout engine. It is based on the demo browser application shipped
- with Qt demos.
- .
- Its features include:
-  * WebKit layout engine
-  * History
-  * Bookmarks
-  * User styles
-  * Tabbed browsing
+Description: Simple cross-platform QtWebKit web browser
+ Arora is a simple WebKit-based web browser using the Qt toolkit, originally
+ based on the Qt demo browser written to showcase the capabilities of QtWebKit.
+ Arora is a very basic browser that supports history and bookmarks.</diff>
      <filename>debian-upstream/control</filename>
    </modified>
    <modified>
      <diff>@@ -1,54 +1,42 @@
-This package was debianized by Matvey Kozhev &lt;sikon@ubuntu.com&gt; on
-Sun, 18 May 2008 22:29:04 +0700.
+This package was debianized by Sune Vuorela &lt;debian@pusling.com&gt; on
+Sun, 25 May 2008 15:45:28 +0200.
 
-It was downloaded from &lt;http://arora-browser.org&gt;.
+It was downloaded from http://arora-browser.org
 
-Upstream Authors: 
+Upstream Author: 
 
-    Copyright 2008 Benjamin C. Meyer &lt;ben@meyerhome.net&gt;
-    Copyright (C) 2007-2008 Trolltech ASA. All rights reserved.
+   Benjamin Meyer &lt;ben@meyerhome.net&gt;
 
-License:
+Copyright: 
+
+ Copyright (C) 2007-2008 Benjamin C. Meyer &lt;ben@meyerhome.net&gt;
+ Copyright (C) 2008 Ariya Hidayat &lt;ariya.hidayat@gmail.com&gt;
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+ Copyright (C) 2005-2008 Trolltech ASA. All rights reserved.
+ Copyright (C) 2008 Jason A. Donenfeld &lt;Jason@zx2c4.com&gt;
 
-   This file may be used under the terms of the GNU General Public
-   License versions 2.0 or 3.0 as published by the Free Software
-   Foundation and appearing in the files LICENSE.GPL2 and LICENSE.GPL3
-   included in the packaging of this file.  Alternatively you may (at
-   your option) use any later version of the GNU General Public
-   License if such license has been publicly approved by Trolltech ASA
-   (or its successors, if any) and the KDE Free Qt Foundation. In
-   addition, as a special exception, Trolltech gives you certain
-   additional rights. These rights are described in the Trolltech GPL
-   Exception version 1.2, which can be found at
-   http://www.trolltech.com/products/qt/gplexception/ and in the file
-   GPL_EXCEPTION.txt in this package.
-  
-   Please review the following information to ensure GNU General
-   Public Licensing requirements will be met:
-   http://trolltech.com/products/qt/licenses/licensing/opensource/. If
-   you are unsure which license is appropriate for your use, please
-   review the following information:
-   http://trolltech.com/products/qt/licenses/licensing/licensingoverview
-   or contact the sales department at sales@trolltech.com.
-  
-   In addition, as a special exception, Trolltech, as the sole
-   copyright holder for Qt Designer, grants users of the Qt/Eclipse
-   Integration plug-in the right for the Qt/Eclipse Integration to
-   link to functionality provided by Qt Designer and its related
-   libraries.
-  
-   This file is provided &quot;AS IS&quot; with NO WARRANTY OF ANY KIND,
-   INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR
-   A PARTICULAR PURPOSE. Trolltech reserves all rights not expressly
-   granted herein.
-  
-   This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-   WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-
-The Debian packaging is (C) 2008, Matvey Kozhev &lt;sikon@ubuntu.com&gt; and
-is licensed under the same conditions as above.
-
-On Debian systems, the complete text of the GNU General Public License is
-available at `/usr/share/common-licenses/GPL-2' for version 2 and
-`/usr/share/common-licenses/GPL-3' for version 3.
 
+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 &lt;debian@pusling.com&gt; and
+is licensed under the GPL, see above.</diff>
      <filename>debian-upstream/copyright</filename>
    </modified>
    <modified>
      <diff>@@ -1,26 +1,56 @@
 #!/usr/bin/make -f
-  
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/qmake.mk
-
-QMAKE                       = qmake-qt4
-DEB_QMAKE_ARGS             += PREFIX=/usr QMAKE_LFLAGS+=-Wl,--as-needed
-DEB_PHONY_RULES            += get-orig-source
-VERSION                     = $(shell dpkg-parsechangelog | egrep '^Version' | sed s/&quot;Version: &quot;//)
-UPSTREAM_VERSION            = $(shell echo $(VERSION) | sed s/-.*//)
-DEB_INSTALL_CHANGELOGS_ALL  = ChangeLog
-
-makebuilddir/arora::
-	./generateAuthors
-
-install/arora::
-	cp src/data/arora-16.png debian/arora/usr/share/icons/hicolor/16x16/apps/arora.png
-	cp src/data/arora-32.png debian/arora/usr/share/icons/hicolor/32x32/apps/arora.png
-	cp src/data/arora-128.png debian/arora/usr/share/icons/hicolor/128x128/apps/arora.png
-
-get-orig-source:
-	cd debian &amp;&amp; git clone git://github.com/icefox/arora.git arora-$(UPSTREAM_VERSION)
-	cd debian/arora-$(UPSTREAM_VERSION) &amp;&amp; \
-	    git archive --format=tar --prefix=arora-$(UPSTREAM_VERSION)/ HEAD | \
-	    gzip -9c &gt; ../../../arora_$(UPSTREAM_VERSION).orig.tar.gz
-	rm -rf debian/arora-$(UPSTREAM_VERSION)
+# -*- 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
+
+
+builddir:
+	mkdir -p builddir
+
+builddir/Makefile: builddir
+	cd builddir &amp;&amp; qmake-qt4 PREFIX=/usr ../arora.pro
+
+build: build-stamp
+
+build-stamp: builddir/Makefile
+	dh_testdir
+	cd builddir &amp;&amp; $(MAKE)
+	touch $@
+
+clean:
+	dh_testdir
+	dh_testroot
+	rm -rf builddir
+	dh_clean build-stamp
+
+install: build
+	dh_testdir
+	dh_testroot
+	dh_clean -k 
+	cd builddir &amp;&amp; $(MAKE) INSTALL_ROOT=$(CURDIR)/debian/arora install
+
+binary-indep: build install
+
+binary-arch: build install
+	dh_testdir
+	dh_testroot
+	dh_installchangelogs ChangeLog
+	dh_installdocs
+	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</diff>
      <filename>debian-upstream/rules</filename>
    </modified>
    <modified>
      <diff>@@ -38,7 +38,7 @@ QMAKE_EXTRA_COMPILERS += updateqm
 PRE_TARGETDEPS += compiler_updateqm_make_all
 
 unix {
-    INSTALLS += target translations desktop
+    INSTALLS += target translations desktop iconxpm iconsvg icon16 icon32 icon128 man man-compress
 
     target.path = $$BINDIR
 
@@ -47,4 +47,25 @@ unix {
 
     desktop.path = $$DATADIR/applications
     desktop.files += arora.desktop
+    
+    iconxpm.path = $$DATADIR/pixmaps
+    iconxpm.files += data/arora.xpm
+    
+    iconsvg.path = $$DATADIR/icons/hicolor/scalable/apps
+    iconsvg.files += data/arora.svg
+    
+    icon16.path = $$DATADIR/icons/hicolor/16x16/apps
+    icon16.files += data/16x16/arora.png
+    
+    icon32.path = $$DATADIR/icons/hicolor/32x32/apps
+    icon32.files += data/32x32/arora.png
+    
+    icon128.path = $$DATADIR/icons/hicolor/128x128/apps
+    icon128.files += data/128x128/arora.png
+    
+    man.path = $$DATADIR/man/man1
+    man.files += data/arora.1
+    
+    man-compress.path = $$DATADIR/man/man1
+    man-compress.extra = &quot;&quot; &quot;gzip -9 -f \$(INSTALL_ROOT)/$$DATADIR/man/man1/arora.1&quot; &quot;&quot;
 }</diff>
      <filename>src/src.pro</filename>
    </modified>
  </modified>
  <removed type="array">
    <removed>
      <filename>debian-upstream/arora.1</filename>
    </removed>
    <removed>
      <filename>debian-upstream/dirs</filename>
    </removed>
    <removed>
      <filename>debian-upstream/manpages</filename>
    </removed>
  </removed>
  <parents type="array">
    <parent>
      <id>416ad2d0dcd2530f7d9a79308dcf2bca6885a7d3</id>
    </parent>
  </parents>
  <author>
    <name>Matvey Kozhev</name>
    <email>sikon@ubuntu.com</email>
  </author>
  <url>http://github.com/Arora/arora/commit/876821b1eb8d8274eeec00ab3fd3899243a8c962</url>
  <id>876821b1eb8d8274eeec00ab3fd3899243a8c962</id>
  <committed-date>2008-06-19T04:15:13-07:00</committed-date>
  <authored-date>2008-06-19T04:02:57-07:00</authored-date>
  <message>Added icon installation in pro file; synced debian-upstream with pusling's Debian package</message>
  <tree>1f018622c02337ceffa39ff476fd2c0a125d69e4</tree>
  <committer>
    <name>Benjamin C Meyer</name>
    <email>ben@meyerhome.net</email>
  </committer>
</commit>
