Author: frankie
Date: 2007-10-15 16:07:06 +0000 (Mon, 15 Oct 2007)
New Revision: 1190

Added:
   packages/qgis/trunk/debian/patches/composer.dpatch
Modified:
   packages/qgis/trunk/debian/changelog
   packages/qgis/trunk/debian/control
   packages/qgis/trunk/debian/patches/00list
Log:
Added patch for FTBS


Modified: packages/qgis/trunk/debian/changelog
===================================================================
--- packages/qgis/trunk/debian/changelog        2007-10-15 10:59:02 UTC (rev 
1189)
+++ packages/qgis/trunk/debian/changelog        2007-10-15 16:07:06 UTC (rev 
1190)
@@ -5,11 +5,12 @@
   * Fixed wrong build-deps:
        python-qt4-dev -> python-qt4
         python-sip4-dev -> python-sip4
+  * Added composer.dpatch that should fix some archs FTBS. 
 
   [ Paul Wise ]
   * Switch to new Homepage field
 
- -- Paul Wise <[EMAIL PROTECTED]>  Thu, 27 Sep 2007 10:59:07 +1000
+ -- Francesco Paolo Lovergine <[EMAIL PROTECTED]>  Mon, 15 Oct 2007 18:03:32 
+0200
 
 qgis (0.8.1-1) unstable; urgency=high
 

Modified: packages/qgis/trunk/debian/control
===================================================================
--- packages/qgis/trunk/debian/control  2007-10-15 10:59:02 UTC (rev 1189)
+++ packages/qgis/trunk/debian/control  2007-10-15 16:07:06 UTC (rev 1190)
@@ -8,6 +8,7 @@
  libmysqlclient15-dev, flex, bison, python-dev, cmake (>=2.4.3) , python-sip4, 
python-qt4,
  sharutils
 Standards-Version: 3.7.2
+Homepage: http://qgis.org/
 
 Package: qgis
 Architecture: any
@@ -24,8 +25,6 @@
  of various georeferenced raster and Digital
  Elevation Model (DEM) formats including
  GeoTIFF, Arc/Info ASCII Grid, and USGS ASCII DEM.
- .
-  Home page: http://qgis.org/
 
 Package: libqgis1
 Architecture: any
@@ -37,8 +36,6 @@
  .
  This package contains the shared library that
  provides an interface for plugins.
- .
-  Home page: http://qgis.org/
 
 Package: libqgis1-dev
 Architecture: any
@@ -54,8 +51,6 @@
  .
  This package contains the headers and libraries
  needed to develop plugins for QGIS.
- .
-  Home page: http://qgis.org/
 
 Package: qgis-plugin-grass
 Architecture: any
@@ -63,5 +58,3 @@
 Description: Plugin for accessing GRASS data from QGIS
  This plugin enables a GRASS data access toolbox in the QGIS
  geographic data viewer.
- .
-  Home page: http://qgis.org/

Modified: packages/qgis/trunk/debian/patches/00list
===================================================================
--- packages/qgis/trunk/debian/patches/00list   2007-10-15 10:59:02 UTC (rev 
1189)
+++ packages/qgis/trunk/debian/patches/00list   2007-10-15 16:07:06 UTC (rev 
1190)
@@ -1,3 +1,4 @@
 cmake
+composer
 #georef
 #grid_maker

Added: packages/qgis/trunk/debian/patches/composer.dpatch
===================================================================
--- packages/qgis/trunk/debian/patches/composer.dpatch                          
(rev 0)
+++ packages/qgis/trunk/debian/patches/composer.dpatch  2007-10-15 16:07:06 UTC 
(rev 1190)
@@ -0,0 +1,28 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## composer.dpatch by Francesco Paolo Lovergine <[EMAIL PROTECTED]>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
[EMAIL PROTECTED]@
+diff -urNad qgis~/src/composer/qgscomposition.cpp 
qgis/src/composer/qgscomposition.cpp
+--- qgis~/src/composer/qgscomposition.cpp      2007-06-28 13:12:02.000000000 
+0200
++++ qgis/src/composer/qgscomposition.cpp       2007-10-15 18:02:55.000000000 
+0200
+@@ -236,7 +236,7 @@
+   mLastPoint = p;
+ 
+   double x,y;
+-  mView->inverseWorldMatrix().map( e->pos().x(), e->pos().y(), &x, &y );
++  mView->inverseWorldMatrix().map( (double) e->pos().x(), (double) 
e->pos().y(), &x, &y );
+ 
+   switch ( mTool ) {
+     case Select:
+@@ -395,7 +395,7 @@
+     case Select:
+       if ( mSelectedItem ) {
+         double x,y;
+-        mView->inverseWorldMatrix().map( e->pos().x(), e->pos().y(), &x, &y );
++        mView->inverseWorldMatrix().map( (double) e->pos().x(), (double) 
e->pos().y(), &x, &y );
+ 
+         mSelectedItem->moveBy ( x - mLastX, y - mLastY );
+ 


Property changes on: packages/qgis/trunk/debian/patches/composer.dpatch
___________________________________________________________________
Name: svn:executable
   + *


_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel

Reply via email to