[SCM] FreeCAD packaging branch, master, updated. debian/0.11.3729.dfsg-1-19-ga14e0d5
Anton Gladky
gladky.anton at gmail.com
Tue Jun 7 20:06:53 UTC 2011
The following commit has been merged in the master branch:
commit c82751a77c70e566803e00d5c0b8706650adc417
Author: Anton Gladky <gladky.anton at gmail.com>
Date: Tue Jun 7 22:05:25 2011 +0200
Delete old patches.
diff --git a/debian/patches/fix-spelling-errors.patch b/debian/patches/fix-spelling-errors.patch
deleted file mode 100644
index 40c11bc..0000000
--- a/debian/patches/fix-spelling-errors.patch
+++ /dev/null
@@ -1,200 +0,0 @@
-Description: Fix some spelling errors, pointed out by lintian
-Author: Anton Gladky <gladky.anton at gmail.com>
-Last-Update: 2011-04-14
-
---- a/src/Gui/Window.cpp
-+++ b/src/Gui/Window.cpp
-@@ -72,7 +72,7 @@
-
- void WindowParameter::OnChange(Base::Subject<const char*> &rCaller, const char * sReason)
- {
-- Base::Console().Log("Parameter has changed and window (%s) has not overriden this function!",_handle->GetGroupName());
-+ Base::Console().Log("Parameter has changed and window (%s) has not overridden this function!",_handle->GetGroupName());
- }
-
- ParameterGrp::handle WindowParameter::getWindowParameter(void)
---- a/src/Mod/Mesh/Gui/Command.cpp
-+++ b/src/Mod/Mesh/Gui/Command.cpp
-@@ -1096,9 +1096,9 @@
- sAppModule = "Mesh";
- sGroup = QT_TR_NOOP("Mesh");
- sMenuText = QT_TR_NOOP("Remove components...");
-- sToolTipText = QT_TR_NOOP("Remove topologic independant components from the mesh");
-+ sToolTipText = QT_TR_NOOP("Remove topologic independent components from the mesh");
- sWhatsThis = "Mesh_RemoveComponents";
-- sStatusTip = QT_TR_NOOP("Remove topologic independant components from the mesh");
-+ sStatusTip = QT_TR_NOOP("Remove topologic independent components from the mesh");
- }
-
- void CmdMeshRemoveComponents::activated(int iMsg)
---- a/src/Mod/Mesh/Gui/Resources/translations/Mesh_fr.ts
-+++ b/src/Mod/Mesh/Gui/Resources/translations/Mesh_fr.ts
-@@ -397,7 +397,7 @@
- <translation>Supprimer des composants...</translation>
- </message>
- <message>
-- <source>Remove topologic independant components from the mesh</source>
-+ <source>Remove topologic independent components from the mesh</source>
- <translation>Supprime des composants topologiquement indépendants du maillage</translation>
- </message>
- </context>
---- a/src/Mod/Mesh/Gui/Resources/translations/Mesh_es.ts
-+++ b/src/Mod/Mesh/Gui/Resources/translations/Mesh_es.ts
-@@ -397,7 +397,7 @@
- <translation>Eliminar componentes...</translation>
- </message>
- <message>
-- <source>Remove topologic independant components from the mesh</source>
-+ <source>Remove topologic independent components from the mesh</source>
- <translation>Elimina componentes topológicamente independientes de la malla</translation>
- </message>
- </context>
---- a/src/Mod/Mesh/Gui/Resources/translations/Mesh_de.ts
-+++ b/src/Mod/Mesh/Gui/Resources/translations/Mesh_de.ts
-@@ -397,7 +397,7 @@
- <translation>Komponenten entfernen...</translation>
- </message>
- <message>
-- <source>Remove topologic independant components from the mesh</source>
-+ <source>Remove topologic independent components from the mesh</source>
- <translation>Entfernt topologisch unabhängige Komponenten aus dem Netz</translation>
- </message>
- </context>
---- a/src/Mod/Mesh/Gui/Resources/translations/Mesh_it.ts
-+++ b/src/Mod/Mesh/Gui/Resources/translations/Mesh_it.ts
-@@ -397,7 +397,7 @@
- <translation>Rimuovi componente...</translation>
- </message>
- <message>
-- <source>Remove topologic independant components from the mesh</source>
-+ <source>Remove topologic independent components from the mesh</source>
- <translation>Rimuovi componenti topologici indipendenti dalla mesh</translation>
- </message>
- </context>
---- a/src/Mod/Mesh/App/MeshPy.xml
-+++ b/src/Mod/Mesh/App/MeshPy.xml
-@@ -14,7 +14,7 @@
- <Author Licence="LGPL" Name="Juergen Riegel" EMail="Juergen.Riegel at web.de" />
- <UserDocu>Mesh() -- Create an empty mesh object.
-
--This class allows to manipulate the mesh object by adding new facets, deleting facets, importing from an STL file,
-+This class allows one to manipulate the mesh object by adding new facets, deleting facets, importing from an STL file,
- transforming the mesh and much more.
- For a complete overview of what can be done see also the documentation of mesh.
- A mesh object cannot be added to an existing document directly. Therefore the document must create an object
---- a/src/Mod/Points/Gui/DlgPointsRead.ui
-+++ b/src/Mod/Points/Gui/DlgPointsRead.ui
-@@ -201,7 +201,7 @@
- <item row="0" column="0">
- <widget class="QLabel" name="textLabel6">
- <property name="text">
-- <string>Number seperator:</string>
-+ <string>Number separator:</string>
- </property>
- </widget>
- </item>
-@@ -256,7 +256,7 @@
- </widget>
- </item>
- <item row="0" column="1">
-- <widget class="QComboBox" name="comboBoxSeperator">
-+ <widget class="QComboBox" name="comboBoxSeparator">
- <property name="editable">
- <bool>true</bool>
- </property>
-@@ -367,7 +367,7 @@
- <tabstop>radioButtonNbrOfPoints</tabstop>
- <tabstop>lineEditClusterStart</tabstop>
- <tabstop>lineEditComments</tabstop>
-- <tabstop>comboBoxSeperator</tabstop>
-+ <tabstop>comboBoxSeparator</tabstop>
- <tabstop>comboBoxPointsFormat</tabstop>
- <tabstop>comboBoxNextBlock1</tabstop>
- <tabstop>comboBoxNextBlock2</tabstop>
---- a/src/Mod/Points/Gui/Resources/translations/Points_se.ts
-+++ b/src/Mod/Points/Gui/Resources/translations/Points_se.ts
-@@ -96,7 +96,7 @@
- <translation>Punktformat</translation>
- </message>
- <message>
-- <source>Number seperator:</source>
-+ <source>Number separator:</source>
- <translation>Talseparator:</translation>
- </message>
- <message>
---- a/src/Mod/Points/Gui/Resources/translations/Points_es.ts
-+++ b/src/Mod/Points/Gui/Resources/translations/Points_es.ts
-@@ -96,7 +96,7 @@
- <translation>Formato de punto</translation>
- </message>
- <message>
-- <source>Number seperator:</source>
-+ <source>Number separator:</source>
- <translation>Número separador:</translation>
- </message>
- <message>
---- a/src/Mod/Points/Gui/Resources/translations/Points_de.ts
-+++ b/src/Mod/Points/Gui/Resources/translations/Points_de.ts
-@@ -96,7 +96,7 @@
- <translation>Punkteformat</translation>
- </message>
- <message>
-- <source>Number seperator:</source>
-+ <source>Number separator:</source>
- <translation>Dezimaltrenner:</translation>
- </message>
- <message>
---- a/src/Mod/Points/Gui/Resources/translations/Points_it.ts
-+++ b/src/Mod/Points/Gui/Resources/translations/Points_it.ts
-@@ -96,7 +96,7 @@
- <translation>Formato punto</translation>
- </message>
- <message>
-- <source>Number seperator:</source>
-+ <source>Number separator:</source>
- <translation>Numero separatore:</translation>
- </message>
- <message>
---- a/src/Mod/Points/Gui/Resources/translations/Points_fr.ts
-+++ b/src/Mod/Points/Gui/Resources/translations/Points_fr.ts
-@@ -96,7 +96,7 @@
- <translation>Format de point</translation>
- </message>
- <message>
-- <source>Number seperator:</source>
-+ <source>Number separator:</source>
- <translation>Séparateur de nombres:</translation>
- </message>
- <message>
---- a/src/Mod/Points/App/PointsPy.xml
-+++ b/src/Mod/Points/App/PointsPy.xml
-@@ -14,7 +14,7 @@
- <Author Licence="LGPL" Name="Juergen Riegel" EMail="Juergen.Riegel at web.de" />
- <UserDocu>Points() -- Create an empty points object.
-
--This class allows to manipulate the Points object by adding new points, deleting facets, importing from an STL file,
-+This class allows one to manipulate the Points object by adding new points, deleting facets, importing from an STL file,
- transforming and much more.
-
- </UserDocu>
---- a/src/Mod/Sketcher/App/sketchflat/solve.cpp
-+++ b/src/Mod/Sketcher/App/sketchflat/solve.cpp
-@@ -214,7 +214,7 @@
- hParam toReplace, replacement;
- if(EExprMarksTwoParamsEqual(EQ->eqn[i].e, &toReplace, &replacement)) {
-
-- dbp2("equation just marks two paramters equal:");
-+ dbp2("equation just marks two parameters equal:");
- EPrint("this: ", EQ->eqn[i].e);
- dbp2("we think %08x and %08x", toReplace, replacement);
-
---- a/src/Base/UnitsApi.cpp
-+++ b/src/Base/UnitsApi.cpp
-@@ -260,6 +260,6 @@
- UnitParser::UnitsApi_delete_buffer (my_string_buffer);
-
- if (ScanResult == DOUBLE_MIN)
-- throw Base::Exception("Unknown error in Unit expresion");
-+ throw Base::Exception("Unknown error in Unit expression");
- return ScanResult;
- }
diff --git a/debian/patches/freecad-boost-146.patch b/debian/patches/freecad-boost-146.patch
deleted file mode 100644
index d497e3c..0000000
--- a/debian/patches/freecad-boost-146.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-FreeCAD hasn't upgraded its boost filesystem compatibility
-
-Index: freecad/src/App/PreCompiled.h
-===================================================================
---- freecad.orig/src/App/PreCompiled.h
-+++ freecad/src/App/PreCompiled.h
-@@ -24,6 +24,9 @@
- #ifndef APP_PRECOMPILED_H
- #define APP_PRECOMPILED_H
-
-+// Compatibility mode with old boost filesystem
-+#define BOOST_FILESYSTEM_VERSION 2
-+
- #include <FCConfig.h>
-
- // here get the warnings of too long specifiers disabled
diff --git a/debian/patches/freecad-occ650.patch b/debian/patches/freecad-occ650.patch
deleted file mode 100644
index 6514a1d..0000000
--- a/debian/patches/freecad-occ650.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Description: OpenCASCADE 6.5.0 compatibility patch
-Author: Denis Barbier
-
-Index: freecad/src/Mod/Part/App/PrimitiveFeature.cpp
-===================================================================
---- freecad.orig/src/Mod/Part/App/PrimitiveFeature.cpp
-+++ freecad/src/Mod/Part/App/PrimitiveFeature.cpp
-@@ -141,9 +141,6 @@
- case BRepBuilderAPI_ParametersOutOfRange:
- error = "parameters out of range";
- break;
-- case BRepBuilderAPI_SurfaceNotC2:
-- error = "surface not C2";
-- break;
- default:
- error = "unknown error";
- break;
-Index: freecad/src/Mod/Part/App/TopoShape.cpp
-===================================================================
---- freecad.orig/src/Mod/Part/App/TopoShape.cpp
-+++ freecad/src/Mod/Part/App/TopoShape.cpp
-@@ -139,8 +139,6 @@
- return "Curve projection failed";
- case BRepBuilderAPI_ParametersOutOfRange:
- return "Parameters out of range";
-- case BRepBuilderAPI_SurfaceNotC2:
-- return "Surface not C2-continous";
- default:
- return "Unknown creation error";
- }
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 3f0880e..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,3 +0,0 @@
-freecad-occ650.patch
-freecad-boost-146.patch
-fix-spelling-errors.patch
--
FreeCAD packaging
More information about the debian-science-commits
mailing list