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<[EMAIL
PROTECTED]@� � b�1)3IV��AJ�����_� �_���2���b`������3` ����
r�b���ع�.�~��j�N����b�?���Z��b�ՀK�20�����O�b.��=�^)01�}���C�#��u�M
�X00���i [EMAIL PROTECTED])���`�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
�`߽��� "[EMAIL PROTECTED]����=���t�^*;��F/��ߌ��bP��Z��
¦�p��*��'60l�(����ۉo�� � ��s`b�
-��180���J/[EMAIL PROTECTED]>Vq�3��3�ܻ�a�Tq��W^�0||[EMAIL
PROTECTED]&�0R�ꌿ��L�h����6����� [EMAIL PROTECTED]
[EMAIL PROTECTED]
--)�2�0s������QA�+�r&PI��`��`"�j>�2,^}���b���$0|�� [EMAIL
PROTECTED]�,�j�=�2�+����4ؘ��"B~1|[EMAIL PROTECTED]|�<�Bq�|�
_�0�x�ϰ`�k�{[�/2ܽ����u|�[EMAIL PROTECTED]
[EMAIL PROTECTED] Mp`�K-_�
�͚��3'0V�AE�rn)�`��gx��$��kS������ �*�OS�9�31
��f&:�����,�4d��7M�o[EMAIL PROTECTED]|J[EMAIL
PROTECTED],�UsY��3����"��?�/ �p�0���T���*�5�~+/[EMAIL PROTECTED]
��-bظ����5�>��Z��L���t;P��__.~6�_���+3��b��ir<���/`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��&[EMAIL PROTECTED])���x3
I +��V6�9����k��1��z���N`?��ǿ��6� �LM����3�20�k>f?�`��f(\W�������8�1�����Q�9
[EMAIL PROTECTED] 9�/�����p�ҹ�o���iÃ��5�g*� b���3
-~��bx&�����&��`x��<�}��[EMAIL PROTECTED] �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;
_______________________________________________
Pkg-grass-devel mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel