Merge branch 'upstream-unstable'

diff --cc data/search
index 2cd3cbc531630cdcd502ed6b920a19567fc661d7,e75964241fa4c19a7d62afca3e6e7f3e5f9b6b77..59341ee1d37fc21bef9d3f108347173742057361
--- 1/data/search
--- 2/data/search
+++ b/data/search
@@@ -24,19 -26,4 +26,18 @@@ token=w
  name=The Free Dictionary
  text=Dictionary, Encyclopedia and Thesaurus
  uri=http://www.thefreedictionary.com/%s
- icon=
  token=fd
 +
 +[Debian Packages]
 +name=Debian Packages
 +text=Search Debian Packages
 +uri=http://packages.debian.org/%s
 +icon=
 +token=d
 +
 +[Debian Bugs]
 +name=Debian Bugs
 +text=Debian Bugs Search
 +uri=http://bugs.debian.org/%s
 +icon=
 +token=dbs