Skip to content
Permalink
Browse files
debian packaging update: merge downstream debian changes
  • Loading branch information
jef-n committed Apr 6, 2014
1 parent 0305be7 commit e9f43c49095535dfa06f7ff8c069a4ad2715932e
Showing with 550 additions and 2,219 deletions.
  1. +3 −1 debian/changelog
  2. +3 −0 debian/compat.in
  3. +0 −1 debian/compat.jessie
  4. +0 −1 debian/compat.precise
  5. +0 −1 debian/compat.quantal
  6. +0 −1 debian/compat.raring
  7. +0 −1 debian/compat.saucy
  8. +0 −1 debian/compat.sid
  9. +0 −1 debian/compat.trusty
  10. +0 −1 debian/compat.wheezy
  11. +1 −1 debian/control
  12. +178 −45 debian/{control.sid-oracle → control.in}
  13. +0 −251 debian/control.jessie
  14. +0 −231 debian/control.precise
  15. +0 −253 debian/control.quantal
  16. +0 −253 debian/control.raring
  17. +0 −251 debian/control.saucy
  18. +0 −251 debian/control.sid
  19. +0 −249 debian/control.trusty
  20. +0 −230 debian/control.wheezy
  21. +1 −0 debian/libqgis-analysis{QGIS_ABI}.install
  22. +1 −0 debian/libqgis-core{QGIS_ABI}.install
  23. +1 −0 debian/libqgis-gui{QGIS_ABI}.install
  24. +1 −0 debian/libqgis-networkanalysis{QGIS_ABI}.install
  25. +1 −0 debian/libqgisgrass{QGIS_ABI}.install
  26. +1 −0 debian/libqgissqlanyconnection{QGIS_ABI}.install
  27. +0 −4 debian/libqgis{QGIS_ABI}.install
  28. +1 −1 debian/mime/application/x-esri-crs.desktop
  29. +1 −1 debian/mime/application/x-esri-shape.desktop
  30. +1 −1 debian/mime/application/x-mapinfo-mif.desktop
  31. +1 −1 debian/mime/application/x-qgis-layer-settings.desktop
  32. +1 −1 debian/mime/application/x-qgis-project.desktop
  33. +1 −1 debian/mime/application/x-raster-aig.desktop
  34. +1 −1 debian/mime/application/x-raster-ecw.desktop
  35. +1 −1 debian/mime/application/x-raster-mrsid.desktop
  36. +5 −0 debian/python-qgis.install.in
  37. +0 −3 debian/python-qgis.install.jessie
  38. +0 −5 debian/python-qgis.install.precise
  39. +0 −3 debian/python-qgis.install.quantal
  40. +0 −5 debian/python-qgis.install.raring
  41. +0 −5 debian/python-qgis.install.saucy
  42. +0 −3 debian/python-qgis.install.sid
  43. +0 −5 debian/python-qgis.install.trusty
  44. +0 −5 debian/python-qgis.install.wheezy
  45. +2 −1 debian/qbrowser.desktop
  46. +170 −0 debian/qgis-icon.xpm
  47. BIN debian/qgis-icon128x128.png
  48. BIN debian/qgis-icon16x16.png
  49. BIN debian/qgis-icon192x192.png
  50. BIN debian/qgis-icon22x22.png
  51. BIN debian/qgis-icon24x24.png
  52. BIN debian/qgis-icon256x256.png
  53. BIN debian/qgis-icon32x32.png
  54. BIN debian/qgis-icon36x36.png
  55. BIN debian/qgis-icon42x42.png
  56. BIN debian/qgis-icon48x48.png
  57. BIN debian/qgis-icon512x512.png
  58. BIN debian/qgis-icon64x64.png
  59. BIN debian/qgis-icon72x72.png
  60. BIN debian/qgis-icon80x80.png
  61. BIN debian/qgis-icon8x8.png
  62. BIN debian/qgis-icon96x96.png
  63. +0 −1 debian/qgis-plugin-grass.install.in
  64. +9 −0 debian/qgis-providers-common.postinst
  65. +2 −2 debian/qgis-providers-common.prerm
  66. +4 −3 debian/qgis-providers.postinst
  67. +1 −0 debian/qgis-providers.triggers
  68. +0 −1 debian/qgis-sqlanywhere.install.in
  69. +2 −1 debian/qgis.desktop
  70. +5 −15 debian/qgis.install
  71. +4 −0 debian/qgis.lintian-overrides
  72. +1 −1 debian/qgis.menu
  73. +11 −11 debian/qgis.xml
  74. +130 −109 debian/rules
  75. +1 −1 debian/watch
  76. +2 −1 doc/CMakeLists.txt
  77. BIN doc/images/qgis_new_80pct.png
  78. +1 −1 doc/index.dox
  79. +1 −1 doc/index.html
@@ -3,8 +3,10 @@ qgis (2.3.0) UNRELEASED; urgency=medium
* New development version 2.3 after branch of 2.2
* enable globe on jessie
* add dependency on libqt4-sql-sqlite to qgis-provider
* merge debian packageing changes
* merge distribution specific file templates into one file template

-- Jürgen E. Fischer <jef@norbit.de> Sun, 23 Feb 2014 11:36:30 +0100
-- Jürgen E. Fischer <jef@norbit.de> Sun, 06 Apr 2014 00:30:34 +0200

qgis (2.2.0) unstable; urgency=medium

@@ -0,0 +1,3 @@
#sid jessie sid-oracle#9
#wheezy quantal jessie#8
#trusty saucy raring precise#7

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

@@ -10,7 +10,7 @@ Build-Depends:
grass-dev,
libexpat1-dev,
libfcgi-dev,
libgdal1-dev,
libgdal1-dev | libgdal-dev,
libgeos-dev (>= 3.0.0),
libgsl0-dev,
libpq-dev,

0 comments on commit e9f43c4

Please sign in to comment.