INSTALL

@@ -1221,7 +1221,7 @@ Download William Kyngesburye's excellent GDAL Complete package that includes
 PROJ, GEOS, GDAL, SQLite3, Spatialite, and image libraries, as frameworks.
 There is also a GSL framework.
 
-http://www.kyngchaos.com/wiki/software/frameworks
+http://www.kyngchaos.com/software/frameworks
 
 Once downloaded, open and install the frameworks.
 
@@ -1230,11 +1230,11 @@ support).  QGIS just needs the libpq client library, so unless you want to
 setup the full Postgres + PostGIS server, all you need is the client-only
 package.  It's available here:
 
-http://www.kyngchaos.com/wiki/software/postgres 
+http://www.kyngchaos.com/software/postgres 
 
 Also available is a GRASS application:
 
-http://www.kyngchaos.com/wiki/software/grass
+http://www.kyngchaos.com/software/grass
 
 
     5.2.1. Additional Dependencies: General compatibility note

debian/changelog

@@ -3,8 +3,10 @@ qgis (1.9.90) UNRELEASED; urgency=low
   * new development version 1.9.90 after branch of 1.8.0
   * include function help in package
   * include heatmap plugin
+  * drop extra include path for QtWebkit on oneiric and natty
+  * add translations for desktop link
 
- -- Jürgen E. Fischer <jef@norbit.de>  Mon, 13 Feb 2012 17:38:05 +0100
+ -- Jürgen E. Fischer <jef@norbit.de>  Thu, 16 Feb 2012 23:21:09 +0100
 
 qgis (1.8.0) UNRELEASED; urgency=low
 

debian/qgis.desktop

@@ -3,7 +3,50 @@ Type=Application
 Name=Quantum GIS
 Version=1.0
 GenericName=Geographical Information System
+GenericName[ar]=نظام المعلومات الجغرافي
+GenericName[az]=Coğrafi informasiya sistemi
+GenericName[bg]=Географска информационна система
+GenericName[bs]=Geografski informacioni sistem
+GenericName[ca]=Sistema d'informació geogràfica
+GenericName[cs]=Geografický Informační Systém
 GenericName[de]=Geographisches Informationssystem
+GenericName[el]=Σύστημα Γεωγραφικών Πληροφοριών
+GenericName[es]=Sistema de Información Geográfica
+GenericName[et]=Geoinfosüsteem
+GenericName[eu]=Geografia-informazioko sistemen
+GenericName[fa]=سامانه اطلاعات مکانی
+GenericName[fi]=Maantieteellinen Tietojärjestelmä
+GenericName[fr]=Système d'Information Géographique
+GenericName[gl]=Sistema de información xeográfica
+GenericName[he]=מערכת מידע גאוגרפית
+GenericName[hi]=भूगोलीय_सूचना_प्रणाली
+GenericName[hr]=Geografski informacijski sustav
+GenericName[hu]=Földrajzi információs rendszer
+GenericName[hy]=Աշխարհագրական տեղեկատվական համակարգ
+GenericName[id]=Sistem informasi geografis
+GenericName[is]=Landfræðilegt upplýsingakerfi
+GenericName[it]=Sistema Informativo Geografico
+GenericName[ka]=გეოინფორმაციული სისტემა
+GenericName[lt]=Geografinė informacinė sistema
+GenericName[lv]=Ģeogrāfiskā informācijas sistēma
+GenericName[mk]=Географски информационен систем
+GenericName[ml]=ജി.ഐ.എസ്.
+GenericName[nl]=Geografisch informatiesysteem
+GenericName[nn]=Geografiske informasjonssystem
+GenericName[no]=Geografiske informasjonssystemer
+GenericName[pl]=System Informacji Geograficznej
+GenericName[pt]=Sistema de Informação Geográfica
+GenericName[ro]=Sistem Informatic Geografic
+GenericName[ru]=Геоинформационная система
+GenericName[sh]=Geografski informacijski sistem
+GenericName[sk]=Geografický informačný systém
+GenericName[sl]=Geografski informacijski sistem
+GenericName[sr]=Географски информациони систем
+GenericName[sv]=Geografiskt Informationssystem
+GenericName[th]=ระบบสารสนเทศภูมิศาสตร์
+GenericName[tr]=Coğrafi bilgi sistemi
+GenericName[uk]=Геоінформаційна система
+GenericName[uz]=Geografik axborot tizimi
 Icon=qgis-icon
 TryExec=/usr/bin/qgis
 Exec=/usr/bin/qgis %F

debian/rules

@@ -32,10 +32,6 @@ CMAKE_OPTS := \
 	-D QGIS_CGIBIN_SUBDIR=/usr/lib/cgi-bin \
 	-D WITH_APIDOC=TRUE
 
-ifneq (,$(findstring $(DISTRIBUTION),"natty oneiric"))
-	CMAKE_OPTS += -D QT_QTWEBKIT_INCLUDE_DIR=/usr/include/QtWebKit
-endif
-
 #ifeq (,$(findstring $(DISTRIBUTION),"squeeze lucid maverick natty oneiric sid"))
 	CMAKE_OPTS += -D WITH_INTERNAL_SPATIALITE=TRUE
 #else