* Non-maintainer upload.

* New upstream release.

diff --git a/debian/changelog b/debian/changelog
index 3882d2c85e499c54c9c577c65abfed37d661b9ba..f4d82ec58ea59f7f0d3510b71b43c7327c1c2e3d 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,14 +1,14 @@
-midori (0.3.2-0.1) UNRELEASED; urgency=low
+midori (0.3.3-0.1) UNRELEASED; urgency=low
 
-  * debian/patches:
-    - 0001-Don-t-limit-search-engines-shown-in-completion-popup added.
+  * Non-maintainer upload.
+  * New upstream release.
   * debian/rules:
     - ignore ChangeLog in dh_installchangelogs since make install already
       installs it.
   * debian/control:
     - drop dpkg PreDepends.
 
- -- Yves-Alexis Perez <corsac@debian.org>  Sun, 06 Mar 2011 23:41:30 +0100
+ -- Yves-Alexis Perez <corsac@debian.org>  Tue, 15 Mar 2011 19:29:35 +0100
 
 midori (0.3.2-0.1) unstable; urgency=low
 

diff --git a/debian/patches/0001-Don-t-limit-search-engines-shown-in-completion-popup.patch b/debian/patches/0001-Don-t-limit-search-engines-shown-in-completion-popup.patch
deleted file mode 100644 (file)
index 6c2b2d8..0000000
--- a/debian/patches/0001-Don-t-limit-search-engines-shown-in-completion-popup.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From a205df3970659d0956c21641d251824da2d7d2b3 Mon Sep 17 00:00:00 2001
-From: Christian Dywan <christian@twotoasts.de>
-Date: Sun, 20 Feb 2011 20:07:29 +0100
-Subject: [PATCH] Don't limit search engines shown in completion popup
-
----
- midori/midori-locationaction.c |    2 --
- 1 files changed, 0 insertions(+), 2 deletions(-)
-
-diff --git a/midori/midori-locationaction.c b/midori/midori-locationaction.c
-index 000fec2..d54ac43 100644
---- a/midori/midori-locationaction.c
-+++ b/midori/midori-locationaction.c
-@@ -505,8 +505,6 @@ midori_location_action_popup_timeout_cb (gpointer data)
-             g_free (uri);
-             g_free (title);
-             i++;
--            if (i > 4)
--                break;
-         }
-         searches += i;
-     }
--- 
-1.7.4.1
-

diff --git a/debian/patches/series b/debian/patches/series
index 33fb249560156243400e75b7f74ea4525af0bafb..5367257f30a59fcc1e88dd37ed150700a839a778 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 add-debian-searches
-0001-Don-t-limit-search-engines-shown-in-completion-popup.patch