[DebianGIS-dev] r953 - packages/qgis/trunk/debian/patches

frankie at alioth.debian.org frankie at alioth.debian.org
Fri Jun 29 14:50:09 UTC 2007 

Author: frankie
Date: 2007-06-29 14:50:08 +0000 (Fri, 29 Jun 2007)
New Revision: 953

Modified:
   packages/qgis/trunk/debian/patches/georef.dpatch
Log:
Fixing georef patch


Modified: packages/qgis/trunk/debian/patches/georef.dpatch
===================================================================
--- packages/qgis/trunk/debian/patches/georef.dpatch	2007-06-29 14:06:35 UTC (rev 952)
+++ packages/qgis/trunk/debian/patches/georef.dpatch	2007-06-29 14:50:08 UTC (rev 953)
@@ -7,7 +7,7 @@
 @DPATCH@
 diff -urNad qgis~/i18n/qgis_de.ts qgis/i18n/qgis_de.ts
 --- qgis~/i18n/qgis_de.ts	2007-06-28 13:37:36.000000000 +0200
-+++ qgis/i18n/qgis_de.ts	2007-06-29 15:39:08.000000000 +0200
++++ qgis/i18n/qgis_de.ts	2007-06-29 16:48:17.000000000 +0200
 @@ -1,14 +1,14 @@
  <?xml version="1.0" encoding="utf-8"?>
 -<!DOCTYPE TS><TS version="1.1">
@@ -877,7 +877,7 @@
      <message>
 diff -urNad qgis~/src/core/CMakeLists.txt qgis/src/core/CMakeLists.txt
 --- qgis~/src/core/CMakeLists.txt	2007-06-28 13:34:02.000000000 +0200
-+++ qgis/src/core/CMakeLists.txt	2007-06-29 15:27:51.000000000 +0200
++++ qgis/src/core/CMakeLists.txt	2007-06-29 16:48:17.000000000 +0200
 @@ -41,6 +41,7 @@
  ../gui/qgsmaprender.cpp
  ../gui/qgsmaptoolcapture.cpp
@@ -904,7 +904,7 @@
  ../gui/qgsmaptoolselect.h
 diff -urNad qgis~/src/gui/Makefile.am qgis/src/gui/Makefile.am
 --- qgis~/src/gui/Makefile.am	2007-06-28 13:12:00.000000000 +0200
-+++ qgis/src/gui/Makefile.am	2007-06-29 15:27:51.000000000 +0200
++++ qgis/src/gui/Makefile.am	2007-06-29 16:48:17.000000000 +0200
 @@ -109,6 +109,7 @@
  		qgsmapserverexport.h				\
  		qgsmaptool.h						\
@@ -931,7 +931,7 @@
  		qgsmaptoolselect.cpp			\
 diff -urNad qgis~/src/gui/qgsmaptool.cpp qgis/src/gui/qgsmaptool.cpp
 --- qgis~/src/gui/qgsmaptool.cpp	2007-06-28 13:12:00.000000000 +0200
-+++ qgis/src/gui/qgsmaptool.cpp	2007-06-29 15:27:51.000000000 +0200
++++ qgis/src/gui/qgsmaptool.cpp	2007-06-29 16:48:17.000000000 +0200
 @@ -1,5 +1,5 @@
  /***************************************************************************
 -    qgsmaptool.h  -  base class for map canvas tools
@@ -984,7 +984,7 @@
 +
 diff -urNad qgis~/src/gui/qgsmaptool.h qgis/src/gui/qgsmaptool.h
 --- qgis~/src/gui/qgsmaptool.h	2007-06-28 13:12:00.000000000 +0200
-+++ qgis/src/gui/qgsmaptool.h	2007-06-29 15:27:51.000000000 +0200
++++ qgis/src/gui/qgsmaptool.h	2007-06-29 16:48:17.000000000 +0200
 @@ -26,7 +26,7 @@
  class QgsPoint;
  class QPoint;
@@ -1034,7 +1034,7 @@
  #endif
 diff -urNad qgis~/src/gui/qgsmaptoolemitpoint.cpp qgis/src/gui/qgsmaptoolemitpoint.cpp
 --- qgis~/src/gui/qgsmaptoolemitpoint.cpp	1970-01-01 01:00:00.000000000 +0100
-+++ qgis/src/gui/qgsmaptoolemitpoint.cpp	2007-06-29 15:32:57.000000000 +0200
++++ qgis/src/gui/qgsmaptoolemitpoint.cpp	2007-06-29 16:48:17.000000000 +0200
 @@ -0,0 +1,39 @@
 +/***************************************************************************
 +    qgsmaptoolemitpoint.cpp  -  map tool that emits a signal on click
@@ -1077,7 +1077,7 @@
 +}
 diff -urNad qgis~/src/gui/qgsmaptoolemitpoint.h qgis/src/gui/qgsmaptoolemitpoint.h
 --- qgis~/src/gui/qgsmaptoolemitpoint.h	1970-01-01 01:00:00.000000000 +0100
-+++ qgis/src/gui/qgsmaptoolemitpoint.h	2007-06-29 15:32:57.000000000 +0200
++++ qgis/src/gui/qgsmaptoolemitpoint.h	2007-06-29 16:48:17.000000000 +0200
 @@ -0,0 +1,49 @@
 +/***************************************************************************
 +    qgsmaptoolemitpoint.h  -  map tool that emits a signal on click
@@ -1130,7 +1130,7 @@
 +#endif
 diff -urNad qgis~/src/plugins/georeferencer/georeferencer.qrc qgis/src/plugins/georeferencer/georeferencer.qrc
 --- qgis~/src/plugins/georeferencer/georeferencer.qrc	2007-06-28 13:33:11.000000000 +0200
-+++ qgis/src/plugins/georeferencer/georeferencer.qrc	2007-06-29 15:27:51.000000000 +0200
++++ qgis/src/plugins/georeferencer/georeferencer.qrc	2007-06-29 16:48:17.000000000 +0200
 @@ -1,6 +1,7 @@
  <RCC>
      <qresource prefix="/" >
@@ -1142,7 +1142,7 @@
  </RCC>
 diff -urNad qgis~/src/plugins/georeferencer/mapcoordsdialog.cpp qgis/src/plugins/georeferencer/mapcoordsdialog.cpp
 --- qgis~/src/plugins/georeferencer/mapcoordsdialog.cpp	2007-06-28 13:11:52.000000000 +0200
-+++ qgis/src/plugins/georeferencer/mapcoordsdialog.cpp	2007-06-29 15:39:39.000000000 +0200
++++ qgis/src/plugins/georeferencer/mapcoordsdialog.cpp	2007-06-29 16:48:17.000000000 +0200
 @@ -1,26 +1,45 @@
 +
  #include <QValidator>
@@ -1213,7 +1213,7 @@
 +
 diff -urNad qgis~/src/plugins/georeferencer/mapcoordsdialog.h qgis/src/plugins/georeferencer/mapcoordsdialog.h
 --- qgis~/src/plugins/georeferencer/mapcoordsdialog.h	2007-06-28 13:11:52.000000000 +0200
-+++ qgis/src/plugins/georeferencer/mapcoordsdialog.h	2007-06-29 15:39:39.000000000 +0200
++++ qgis/src/plugins/georeferencer/mapcoordsdialog.h	2007-06-29 16:48:17.000000000 +0200
 @@ -14,6 +14,9 @@
  
  #include <qgspoint.h>
@@ -1255,7 +1255,7 @@
  
 diff -urNad qgis~/src/plugins/georeferencer/mapcoordsdialogbase.ui qgis/src/plugins/georeferencer/mapcoordsdialogbase.ui
 --- qgis~/src/plugins/georeferencer/mapcoordsdialogbase.ui	2007-06-28 13:11:52.000000000 +0200
-+++ qgis/src/plugins/georeferencer/mapcoordsdialogbase.ui	2007-06-29 15:27:51.000000000 +0200
++++ qgis/src/plugins/georeferencer/mapcoordsdialogbase.ui	2007-06-29 16:48:17.000000000 +0200
 @@ -1,15 +1,12 @@
  <ui version="4.0" >
 - <author></author>
@@ -1515,27 +1515,9 @@
 + </resources>
   <connections/>
  </ui>
-diff -urNad qgis~/src/plugins/georeferencer/pencil.png qgis/src/plugins/georeferencer/pencil.png
---- qgis~/src/plugins/georeferencer/pencil.png	1970-01-01 01:00:00.000000000 +0100
-+++ qgis/src/plugins/georeferencer/pencil.png	2007-06-29 15:35:20.000000000 +0200
-@@ -0,0 +1,5 @@
-+‰PNG
-+
-+   
-IHDR           szzô   gAMA  ¯È7Šé   tEXtSoftware Adobe ImageReadyqÉe<  ¤IDATxÚbüÿÿ?Ã@€ bb` @î € b1)3IVœAJ‚áƒÀ_Æ †_Œ˜Þ2°þ¯b`ú¿¦üÿ™3` €¨ÒÂr¨b¿˜¢Ø¹þ.’~ÃÇjóN‘ùßb†?ŒµèZˆ…bËÕ€K‰20üü‡ðÏO¦b.¡ß=ù^)01œ}ÉÄðCå#Ë÷uÒMßX00ÿï†i ÊBÀ@šAFˆáÏ_„ئ.Ùo=!Õwdu¾2ÈÿÿÇÀÇÌÁÀ©ù‡ÃïЍÿÛþ3ÚÀ”y`¦c) åÿ`¢l?Jh~.
-­ºË &÷ƒáÛWVn¦oö"\ÜÌ‚ìÚ?X
->03üfl…i Ò£€ƒ™ÁT’““á7Èrf¨ ÐòåŠfï=¼Òž2pp“À†ßÿ2ˆ³«3‰¥1¸ˆþg˜øtõïÏ0ZÀŒ Ò À´˜Ú™Y –ð?ƒÃOÆ5šN¯MÝã^00131üþ	ôä¿Ÿ2œÖ"©’Ú?Y÷2ü``¸u˜`ß½†ç€ "ÞB@Ë-Å€Yü¡¥ç=†¿ët¼^*;‡¼F/ÐòߌÿýbPà¶ZžÌ ¦Äpùç*†Õ'60l™(ÂðõüÛ‰oŸ”ÂŒ â ÃŒs`bû
-¶þ180üÿ¿J/à…¨…Û¦ @ùÏðïÿ5^gKáD>Vq†3ßç3¬Ü»‹aÇTq†ßW^Ö0||ÑŠl4@ v€&ƒ0R‘ꌿŒ¡L¬hû¾æÒ6ÿÊÀÌ™ nÓá÷a0Œg`gáf8úe*ò-ÇöÏûùÿÆã†Ïïæ @ø`
-+LMJ@ü 
--)ÿ2ä0sýž¤æó†QAû+Ðr&PIÊÂ`ÈÄ`"Êj>ô2,^}™áäb‘÷·$0|ý¼	› „Û@‹AÿÙçÍ,¿jä=Þ2ˆ+üûœ˜4ؘÙŒ"B~1|bØûzâ%÷.¯xÄpç^$ÏÇpY@Ø`ÈÎÀ Ìµœ¢îÃ4fÑ©âNï$þ2°ãœì|¬<–BqÚ|þ_ž0ìxÚÏ°`þk†{[¸/2ܽÉðë÷u|@˜àæk= ¾Ã}ÎôùbF©ïþ¼Ö¸ÿ3°¥X€–‹q
-+18ˆ%1¨óº3¼ýwaó= Ïç~ex¶‹uÃý‡1ÀBê9¡$@¨ZnÃ	Mp`ŸK-_Í ÿÍšÕð3'0VØAEÐrn)©`Š·gxö÷$ÃÚkS–ÎþËðî Ã*†OS€9ä31 €f&: åÀ¼ö,¬4dƒê7Moì@iFˆå*|Jþ²i@ËMüÞðüÜ,†UsY¾ý3™áÑÛ" Þ?Ä/ „p€0ÁóTüßß*ß5Ô~+/ å@‹™€XWH›!T!A™W›áæÏu‹Ž-bظ€“á׉ï5Ï>µ’Z²ÂL ˆýt;Pèÿ__.~6ý_ŠßÀ+3Äçb¦Šir<ò—¾/`X°o
-Ãö¥<?ÿŸü’ÃðúÛrê5€ BÔ†ÌðP–¥ßKj¬|\ÄôÀÉt€³´=CŒr.ƒ$·ɏÓ&o^Á°m>×ûÿG?…“k9 "ØB|ÿï—“´˜„Uª©ƒ£5ñwÅÞòv‰j©Ül,»^ö0,Ù~áÊ&ÞG§?F2|ùsŒ’&@ a)þ–Úx3	I +†ÅV6¾9Äðþßk†1¬Üz’áñN`?´üÇ¿ë”6¨ ÕLMÿ°º‰3©20ñk>f?á`¾çf(\WÏððî†ï§8ö1œù¬ìŸQ£9	@¨`þWøÿµ4c~ÿNa	9†/œŸ–ßÈpôÒ¹ßoÀðiï5ág*€ b„õŒ3
-~³bx&ÇÊÀõ˜&¾ü`xõó<Ã}†Ý¯vËÙ@e_©e1Ì^€ B„ 3CÃ÷ßÀ”xç ÃM ¥öýyÔ̤eÇ €À.»F…!”‡Á(ÆJÌ^€ bèÎ)@ 
-xß €Ü  QåpÔŒ„s    IEND®B`‚
-\ No newline at end of file
 diff -urNad qgis~/src/plugins/georeferencer/qgspointdialog.cpp qgis/src/plugins/georeferencer/qgspointdialog.cpp
 --- qgis~/src/plugins/georeferencer/qgspointdialog.cpp	2007-06-28 13:33:11.000000000 +0200
-+++ qgis/src/plugins/georeferencer/qgspointdialog.cpp	2007-06-29 15:27:51.000000000 +0200
++++ qgis/src/plugins/georeferencer/qgspointdialog.cpp	2007-06-29 16:48:17.000000000 +0200
 @@ -127,6 +127,7 @@
    mToolDeletePoint = new QgsGeorefTool(mCanvas, this, FALSE /* addPoint */); 
    mToolDeletePoint->setAction(mActionDeletePoint);
@@ -1563,7 +1545,7 @@
    mcd->show();
 diff -urNad qgis~/src/plugins/georeferencer/qgspointdialog.h qgis/src/plugins/georeferencer/qgspointdialog.h
 --- qgis~/src/plugins/georeferencer/qgspointdialog.h	2007-06-28 13:11:52.000000000 +0200
-+++ qgis/src/plugins/georeferencer/qgspointdialog.h	2007-06-29 15:27:51.000000000 +0200
++++ qgis/src/plugins/georeferencer/qgspointdialog.h	2007-06-29 16:48:17.000000000 +0200
 @@ -80,6 +80,7 @@
    QgsMapTool* mToolAddPoint;
    QgsMapTool* mToolDeletePoint;

More information about the Pkg-grass-devel mailing list