[SCM] FreeCAD packaging branch, master, updated. debian/0.11.4446-dfsg-4-6-g4eb6526
Anton Gladky
gladky.anton at gmail.com
Mon Jan 9 20:36:29 UTC 2012
The following commit has been merged in the master branch:
commit f66ef5df7dac48ac511ef8930d7793a5bffce7b2
Author: Anton Gladky <gladky.anton at gmail.com>
Date: Mon Jan 9 21:03:51 2012 +0100
Remove patch (typo).
diff --git a/debian/patches/fix_typo_errors.patch b/debian/patches/fix_typo_errors.patch
deleted file mode 100644
index 6ddcdfc..0000000
--- a/debian/patches/fix_typo_errors.patch
+++ /dev/null
@@ -1,414 +0,0 @@
-Description: Fix typo-errors
-Author: Anton Gladky <gladky.anton at gmail.com>
-Last-Update: 2011-06-08
-
---- freecad-0.11.4446.dfsg.orig/src/3rdParty/salomesmesh/src/StdMeshers/StdMeshers_Hexa_3D.cpp
-+++ freecad-0.11.4446.dfsg/src/3rdParty/salomesmesh/src/StdMeshers/StdMeshers_Hexa_3D.cpp
-@@ -327,7 +327,7 @@ bool StdMeshers_Hexa_3D::Compute(SMESH_M
- // TopTools_IndexedDataMapOfShapeListOfShape MS;
- // TopExp::MapShapesAndAncestors(aShape, TopAbs_VERTEX, TopAbs_EDGE, MS);
-
-- // 1.2 - first face is choosen as face Y=0 of the unit cube
-+ // 1.2 - first face is chosen as face Y=0 of the unit cube
-
- const TopoDS_Shape & aFace = meshFaces[0]->GetSubShape();
- //const TopoDS_Face & F = TopoDS::Face(aFace);
---- freecad-0.11.4446.dfsg.orig/src/Doc/mainpage.dox
-+++ freecad-0.11.4446.dfsg/src/Doc/mainpage.dox
-@@ -34,7 +34,7 @@
- is by no means a well structured corpus or a textbook, but more an
- utility to browse through the sources.
-
-- If you seek informations on FreeCAD at large, please consult our
-+ If you seek information on FreeCAD at large, please consult our
- <a href="http://sourceforge.net/apps/mediawiki/free-cad/index.php?title=Main_Page">Wiki</a>
-
- FreeCAD being a fast moving target, don't hesitate to rebuild an up to
---- freecad-0.11.4446.dfsg.orig/src/Mod/Image/Gui/Command.cpp
-+++ freecad-0.11.4446.dfsg/src/Mod/Image/Gui/Command.cpp
-@@ -99,7 +99,7 @@ void CmdCreateImagePlane::activated(int
- QImage impQ(s);
- if (impQ.isNull()) {
- QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Error open image"),
-- QObject::tr("Could not load the choosen image"));
-+ QObject::tr("Could not load the chosen image"));
- return;
- }
-
---- freecad-0.11.4446.dfsg.orig/src/Mod/Image/Gui/Resources/translations/Image_fr.ts
-+++ freecad-0.11.4446.dfsg/src/Mod/Image/Gui/Resources/translations/Image_fr.ts
-@@ -166,7 +166,7 @@
- </message>
- <message>
- <location line="+1"/>
-- <source>Could not load the choosen image</source>
-+ <source>Could not load the chosen image</source>
- <translation>Impossible de charger l'image choisie</translation>
- </message>
- </context>
---- freecad-0.11.4446.dfsg.orig/src/Mod/Image/Gui/Resources/translations/Image_se.ts
-+++ freecad-0.11.4446.dfsg/src/Mod/Image/Gui/Resources/translations/Image_se.ts
-@@ -166,8 +166,8 @@
- </message>
- <message>
- <location line="+1"/>
-- <source>Could not load the choosen image</source>
-- <translation>Could not load the choosen image</translation>
-+ <source>Could not load the chosen image</source>
-+ <translation>Could not load the chosen image</translation>
- </message>
- </context>
- <context>
---- freecad-0.11.4446.dfsg.orig/src/Mod/Image/Gui/Resources/translations/Image_it.ts
-+++ freecad-0.11.4446.dfsg/src/Mod/Image/Gui/Resources/translations/Image_it.ts
-@@ -150,7 +150,7 @@
- </message>
- <message>
- <location/>
-- <source>Could not load the choosen image</source>
-+ <source>Could not load the chosen image</source>
- <translation>Impossibile caricare l'immagine scelta</translation>
- </message>
- </context>
---- freecad-0.11.4446.dfsg.orig/src/Mod/Image/Gui/Resources/translations/Image_ru.ts
-+++ freecad-0.11.4446.dfsg/src/Mod/Image/Gui/Resources/translations/Image_ru.ts
-@@ -166,8 +166,8 @@
- </message>
- <message>
- <location line="+1"/>
-- <source>Could not load the choosen image</source>
-- <translation>Could not load the choosen image</translation>
-+ <source>Could not load the chosen image</source>
-+ <translation>Could not load the chosen image</translation>
- </message>
- </context>
- <context>
---- freecad-0.11.4446.dfsg.orig/src/Mod/Image/Gui/Resources/translations/Image_af.ts
-+++ freecad-0.11.4446.dfsg/src/Mod/Image/Gui/Resources/translations/Image_af.ts
-@@ -166,8 +166,8 @@
- </message>
- <message>
- <location line="+1"/>
-- <source>Could not load the choosen image</source>
-- <translation>Could not load the choosen image</translation>
-+ <source>Could not load the chosen image</source>
-+ <translation>Could not load the chosen image</translation>
- </message>
- </context>
- <context>
---- freecad-0.11.4446.dfsg.orig/src/Mod/Image/Gui/Resources/translations/Image_es.ts
-+++ freecad-0.11.4446.dfsg/src/Mod/Image/Gui/Resources/translations/Image_es.ts
-@@ -166,7 +166,7 @@
- </message>
- <message>
- <location line="+1"/>
-- <source>Could not load the choosen image</source>
-+ <source>Could not load the chosen image</source>
- <translation>No se pudo cargar la imagen elegida</translation>
- </message>
- </context>
---- freecad-0.11.4446.dfsg.orig/src/Mod/Image/Gui/Resources/translations/Image_uk.ts
-+++ freecad-0.11.4446.dfsg/src/Mod/Image/Gui/Resources/translations/Image_uk.ts
-@@ -166,8 +166,8 @@
- </message>
- <message>
- <location line="+1"/>
-- <source>Could not load the choosen image</source>
-- <translation>Could not load the choosen image</translation>
-+ <source>Could not load the chosen image</source>
-+ <translation>Could not load the chosen image</translation>
- </message>
- </context>
- <context>
---- freecad-0.11.4446.dfsg.orig/src/Mod/Image/Gui/Resources/translations/Image_pt.ts
-+++ freecad-0.11.4446.dfsg/src/Mod/Image/Gui/Resources/translations/Image_pt.ts
-@@ -166,7 +166,7 @@
- </message>
- <message>
- <location line="+1"/>
-- <source>Could not load the choosen image</source>
-+ <source>Could not load the chosen image</source>
- <translation>Não foi possível carregar a imagem escolhida</translation>
- </message>
- </context>
---- freecad-0.11.4446.dfsg.orig/src/Mod/Image/Gui/Resources/translations/Image_no.ts
-+++ freecad-0.11.4446.dfsg/src/Mod/Image/Gui/Resources/translations/Image_no.ts
-@@ -166,7 +166,7 @@
- </message>
- <message>
- <location line="+1"/>
-- <source>Could not load the choosen image</source>
-+ <source>Could not load the chosen image</source>
- <translation>Kunne ikke laste det valgte bildet</translation>
- </message>
- </context>
---- freecad-0.11.4446.dfsg.orig/src/Mod/Image/Gui/Resources/translations/Image_fi.ts
-+++ freecad-0.11.4446.dfsg/src/Mod/Image/Gui/Resources/translations/Image_fi.ts
-@@ -166,8 +166,8 @@
- </message>
- <message>
- <location line="+1"/>
-- <source>Could not load the choosen image</source>
-- <translation>Could not load the choosen image</translation>
-+ <source>Could not load the chosen image</source>
-+ <translation>Could not load the chosen image</translation>
- </message>
- </context>
- <context>
---- freecad-0.11.4446.dfsg.orig/src/Mod/Image/Gui/Resources/translations/Image_de.ts
-+++ freecad-0.11.4446.dfsg/src/Mod/Image/Gui/Resources/translations/Image_de.ts
-@@ -159,7 +159,7 @@
- </message>
- <message>
- <location line="+1"/>
-- <source>Could not load the choosen image</source>
-+ <source>Could not load the chosen image</source>
- <translation>Das gewählte Bild konnte nicht geladen werden</translation>
- </message>
- </context>
---- freecad-0.11.4446.dfsg.orig/src/Mod/Image/Gui/Resources/translations/Image_nl.ts
-+++ freecad-0.11.4446.dfsg/src/Mod/Image/Gui/Resources/translations/Image_nl.ts
-@@ -166,8 +166,8 @@
- </message>
- <message>
- <location line="+1"/>
-- <source>Could not load the choosen image</source>
-- <translation>Could not load the choosen image</translation>
-+ <source>Could not load the chosen image</source>
-+ <translation>Could not load the chosen image</translation>
- </message>
- </context>
- <context>
---- freecad-0.11.4446.dfsg.orig/src/Mod/Image/Gui/Resources/translations/Image_hr.ts
-+++ freecad-0.11.4446.dfsg/src/Mod/Image/Gui/Resources/translations/Image_hr.ts
-@@ -150,7 +150,7 @@
- </message>
- <message>
- <location/>
-- <source>Could not load the choosen image</source>
-+ <source>Could not load the chosen image</source>
- <translation>Nije moguće učitati izabranu sliku</translation>
- </message>
- </context>
---- freecad-0.11.4446.dfsg.orig/src/Mod/Image/Gui/Resources/translations/Image_zh.ts
-+++ freecad-0.11.4446.dfsg/src/Mod/Image/Gui/Resources/translations/Image_zh.ts
-@@ -150,7 +150,7 @@
- </message>
- <message>
- <location/>
-- <source>Could not load the choosen image</source>
-+ <source>Could not load the chosen image</source>
- <translation>无法加载选择的图片</translation>
- </message>
- </context>
---- freecad-0.11.4446.dfsg.orig/src/Mod/Draft/InitGui.py
-+++ freecad-0.11.4446.dfsg/src/Mod/Draft/InitGui.py
-@@ -198,7 +198,7 @@ class DraftWorkbench (Workbench):
- self.lineList = ["Draft_UndoLine","Draft_FinishLine","Draft_CloseLine"]
- self.appendToolbar("Draft tools",self.cmdList+self.modList)
- self.appendMenu("Draft",self.cmdList+self.modList)
-- self.appendMenu(["Draft","Object appearence"],self.treecmdList)
-+ self.appendMenu(["Draft","Object appearance"],self.treecmdList)
- self.appendMenu(["Draft","Wire Tools"],self.lineList)
- FreeCAD.activeDraftCommand = None # a global place to look for active draft Command
- FreeCADGui.draftToolBar = self.draftToolBar
-@@ -217,7 +217,7 @@ class DraftWorkbench (Workbench):
- if (FreeCAD.activeDraftCommand == None):
- if (FreeCADGui.Selection.getSelection() != []):
- self.appendContextMenu("Draft",self.cmdList+self.modList)
-- self.appendContextMenu("Object appearence",self.treecmdList)
-+ self.appendContextMenu("Object appearance",self.treecmdList)
- else:
- self.appendContextMenu("Draft",self.cmdList)
- else:
-@@ -225,7 +225,7 @@ class DraftWorkbench (Workbench):
- self.appendContextMenu("",self.lineList)
- else:
- if (FreeCADGui.Selection.getSelection() != []):
-- self.appendContextMenu("Object appearence",self.treecmdList)
-+ self.appendContextMenu("Object appearance",self.treecmdList)
-
- def GetClassName(self):
- return "Gui::PythonWorkbench"
---- freecad-0.11.4446.dfsg.orig/src/Mod/Robot/App/kdl_cp/frames.cpp
-+++ freecad-0.11.4446.dfsg/src/Mod/Robot/App/kdl_cp/frames.cpp
-@@ -344,10 +344,10 @@ Vector Rotation::GetRot() const
-
- /** Returns the rotation angle around the equiv. axis
- * @param axis the rotation axis is returned in this variable
-- * @param eps : in the case of angle == 0 : rot axis is undefined and choosen
-+ * @param eps : in the case of angle == 0 : rot axis is undefined and chosen
- * to be +/- Z-axis
- * in the case of angle == PI : 2 solutions, positive Z-component
-- * of the axis is choosen.
-+ * of the axis is chosen.
- * @result returns the rotation angle (between [0..PI] )
- * /todo :
- * Check corresponding routines in rframes and rrframes
---- freecad-0.11.4446.dfsg.orig/src/Mod/Robot/App/kdl_cp/rotational_interpolation_sa.hpp
-+++ freecad-0.11.4446.dfsg/src/Mod/Robot/App/kdl_cp/rotational_interpolation_sa.hpp
-@@ -56,7 +56,7 @@ namespace KDL {
- * An interpolation algorithm which rotates a frame over the existing
- * single rotation axis
- * formed by start and end rotation. If more than one rotational axis
-- * exist, an arbitrary one will be choosen, therefore it is better to
-+ * exist, an arbitrary one will be chosen, therefore it is better to
- * not try to interpolate a 180 degrees rotation (but it will 'work').
- * @ingroup Motion
- */
---- freecad-0.11.4446.dfsg.orig/src/Mod/Robot/App/kdl_cp/frames.hpp
-+++ freecad-0.11.4446.dfsg/src/Mod/Robot/App/kdl_cp/frames.hpp
-@@ -369,10 +369,10 @@ public:
-
- /** Returns the rotation angle around the equiv. axis
- * @param axis the rotation axis is returned in this variable
-- * @param eps : in the case of angle == 0 : rot axis is undefined and choosen
-+ * @param eps : in the case of angle == 0 : rot axis is undefined and chosen
- * to be +/- Z-axis
- * in the case of angle == PI : 2 solutions, positive Z-component
-- * of the axis is choosen.
-+ * of the axis is chosen.
- * @result returns the rotation angle (between [0..PI] )
- */
- double GetRotAngle(Vector& axis,double eps=epsilon) const;
---- freecad-0.11.4446.dfsg.orig/src/Mod/Complete/Gui/Workbench.cpp
-+++ freecad-0.11.4446.dfsg/src/Mod/Complete/Gui/Workbench.cpp
-@@ -51,7 +51,7 @@ using namespace CompleteGui;
- qApp->translate("Workbench", "&Drafting");
- qApp->translate("Workbench", "Sketch based");
- qApp->translate("Workbench", "Parametric");
-- qApp->translate("Workbench", "Object appearence");
-+ qApp->translate("Workbench", "Object appearance");
- qApp->translate("Workbench", "Wire Tools");
- #endif
-
-@@ -312,7 +312,7 @@ Gui::MenuItem* Workbench::setupMenuBar()
- Drafting->setCommand("&Drafting");
-
- Gui::MenuItem* DraftContext = new Gui::MenuItem();
-- DraftContext->setCommand("Object appearence");
-+ DraftContext->setCommand("Object appearance");
-
- *DraftContext << "Draft_ApplyStyle" << "Draft_ToggleDisplayMode";
-
---- freecad-0.11.4446.dfsg.orig/src/Mod/Complete/Gui/Resources/translations/Complete_fi.ts
-+++ freecad-0.11.4446.dfsg/src/Mod/Complete/Gui/Resources/translations/Complete_fi.ts
-@@ -236,7 +236,7 @@
- </message>
- <message>
- <location line="+1"/>
-- <source>Object appearence</source>
-+ <source>Object appearance</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
---- freecad-0.11.4446.dfsg.orig/src/Mod/Complete/Gui/Resources/translations/Complete_es.ts
-+++ freecad-0.11.4446.dfsg/src/Mod/Complete/Gui/Resources/translations/Complete_es.ts
-@@ -236,7 +236,7 @@
- </message>
- <message>
- <location line="+1"/>
-- <source>Object appearence</source>
-+ <source>Object appearance</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
---- freecad-0.11.4446.dfsg.orig/src/Mod/Complete/Gui/Resources/translations/Complete_pt.ts
-+++ freecad-0.11.4446.dfsg/src/Mod/Complete/Gui/Resources/translations/Complete_pt.ts
-@@ -236,7 +236,7 @@
- </message>
- <message>
- <location line="+1"/>
-- <source>Object appearence</source>
-+ <source>Object appearance</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
---- freecad-0.11.4446.dfsg.orig/src/Mod/Complete/Gui/Resources/translations/Complete_de.ts
-+++ freecad-0.11.4446.dfsg/src/Mod/Complete/Gui/Resources/translations/Complete_de.ts
-@@ -53,7 +53,7 @@
- </message>
- <message>
- <location line="+1"/>
-- <source>Object appearence</source>
-+ <source>Object appearance</source>
- <translation>Objektdarstellung</translation>
- </message>
- <message>
---- freecad-0.11.4446.dfsg.orig/src/Mod/Complete/Gui/Resources/translations/Complete_af.ts
-+++ freecad-0.11.4446.dfsg/src/Mod/Complete/Gui/Resources/translations/Complete_af.ts
-@@ -236,7 +236,7 @@
- </message>
- <message>
- <location line="+1"/>
-- <source>Object appearence</source>
-+ <source>Object appearance</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
---- freecad-0.11.4446.dfsg.orig/src/Mod/Complete/Gui/Resources/translations/Complete_se.ts
-+++ freecad-0.11.4446.dfsg/src/Mod/Complete/Gui/Resources/translations/Complete_se.ts
-@@ -236,7 +236,7 @@
- </message>
- <message>
- <location line="+1"/>
-- <source>Object appearence</source>
-+ <source>Object appearance</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
---- freecad-0.11.4446.dfsg.orig/src/Mod/Complete/Gui/Resources/translations/Complete_nl.ts
-+++ freecad-0.11.4446.dfsg/src/Mod/Complete/Gui/Resources/translations/Complete_nl.ts
-@@ -236,7 +236,7 @@
- </message>
- <message>
- <location line="+1"/>
-- <source>Object appearence</source>
-+ <source>Object appearance</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
---- freecad-0.11.4446.dfsg.orig/src/Mod/Complete/Gui/Resources/translations/Complete_fr.ts
-+++ freecad-0.11.4446.dfsg/src/Mod/Complete/Gui/Resources/translations/Complete_fr.ts
-@@ -236,7 +236,7 @@
- </message>
- <message>
- <location line="+1"/>
-- <source>Object appearence</source>
-+ <source>Object appearance</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
---- freecad-0.11.4446.dfsg.orig/src/Mod/Complete/Gui/Resources/translations/Complete_no.ts
-+++ freecad-0.11.4446.dfsg/src/Mod/Complete/Gui/Resources/translations/Complete_no.ts
-@@ -236,7 +236,7 @@
- </message>
- <message>
- <location line="+1"/>
-- <source>Object appearence</source>
-+ <source>Object appearance</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
---- freecad-0.11.4446.dfsg.orig/src/Mod/Complete/Gui/Resources/translations/Complete_uk.ts
-+++ freecad-0.11.4446.dfsg/src/Mod/Complete/Gui/Resources/translations/Complete_uk.ts
-@@ -236,7 +236,7 @@
- </message>
- <message>
- <location line="+1"/>
-- <source>Object appearence</source>
-+ <source>Object appearance</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
---- freecad-0.11.4446.dfsg.orig/src/Mod/Complete/Gui/Resources/translations/Complete_ru.ts
-+++ freecad-0.11.4446.dfsg/src/Mod/Complete/Gui/Resources/translations/Complete_ru.ts
-@@ -236,7 +236,7 @@
- </message>
- <message>
- <location line="+1"/>
-- <source>Object appearence</source>
-+ <source>Object appearance</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
diff --git a/debian/patches/series b/debian/patches/series
index a8e1dee..c97fa04 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
-fix_typo_errors.patch
disable_memory_check.patch
fix_armel_FTBFS.patch
--
FreeCAD packaging
More information about the debian-science-commits
mailing list