[SCM] FreeCAD packaging branch, master, updated. debian/0.11.3729.dfsg-1-8-g2bb3302
Anton Gladky
gladky.anton at gmail.com
Sat Apr 16 06:57:15 UTC 2011
The following commit has been merged in the master branch:
commit 2bb3302581a04d39fd7bcf50e93cf7f49b3dfd9d
Author: Anton Gladky <gladky.anton at gmail.com>
Date: Sat Apr 16 09:56:19 2011 +0100
Fix some lintian warnings
diff --git a/debian/freecad-doc.doc-base b/debian/freecad-doc.doc-base
index 2c06220..8e58ee3 100644
--- a/debian/freecad-doc.doc-base
+++ b/debian/freecad-doc.doc-base
@@ -1,17 +1,18 @@
-Document: FreeCAD-development-documentation
+Document: freecad-development-documentation
Title: FreeCAD development documentation
Author: FreeCAD developers
-Abstract: FreeCAD is a general purpose Open Source 3D CAD/MCAD/CAx/CAE/PLM modeler, aimed directly at mechanical engineering and product design but also fits in a wider range of uses around engineering, such as architecture or other engineering specialties. It is a feature-based parametric modeler with a modular software architecture which makes it easy to provide additional functionality without modifying the core system.
+Abstract: FreeCAD is a general purpose Open Source 3D
+ CAD/MCAD/CAx/CAE/PLM modeler, aimed directly at mechanical engineering
+ and product design but also fits in a wider range of uses around
+ engineering, such as architecture or other engineering specialties.
+ It is a feature-based parametric modeler with a modular software
+ architecture which makes it easy to provide additional functionality
+ without modifying the core system.
Section: Science/Engineering
Format: HTML
Index: /usr/share/doc/freecad/Start_Page.html
-Files: /usr/share/doc/freecad/*.*
+Files: /usr/share/doc/freecad/*.q*
Format: PDF
-Files: /usr/share/doc/freecad/kr_16.pdf.gz
-Files: /usr/share/doc/freecad/kr_210_2.pdf.gz
-Files: /usr/share/doc/freecad/kr_500_2.pdf.gz
-
-
-
+Files: /usr/share/doc/freecad/kr_16.pdf.gz /usr/share/doc/freecad/kr_210_2.pdf.gz /usr/share/doc/freecad/kr_500_2.pdf.gz
diff --git a/debian/patches/fix-spelling-errors.patch b/debian/patches/fix-spelling-errors.patch
index a697bbf..57742cd 100644
--- a/debian/patches/fix-spelling-errors.patch
+++ b/debian/patches/fix-spelling-errors.patch
@@ -2,9 +2,9 @@ Description: Fix some spelling errors, pointed out by lintian
Author: Anton Gladky <gladky.anton at gmail.com>
Last-Update: 2011-04-14
---- freecad-0.11.3729.dfsg.orig/src/Gui/Window.cpp
-+++ freecad-0.11.3729.dfsg/src/Gui/Window.cpp
-@@ -72,7 +72,7 @@ bool WindowParameter::setGroupName(const
+--- 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)
{
@@ -13,9 +13,9 @@ Last-Update: 2011-04-14
}
ParameterGrp::handle WindowParameter::getWindowParameter(void)
---- freecad-0.11.3729.dfsg.orig/src/Mod/Mesh/Gui/Command.cpp
-+++ freecad-0.11.3729.dfsg/src/Mod/Mesh/Gui/Command.cpp
-@@ -1096,9 +1096,9 @@ CmdMeshRemoveComponents::CmdMeshRemoveCo
+--- 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...");
@@ -27,8 +27,8 @@ Last-Update: 2011-04-14
}
void CmdMeshRemoveComponents::activated(int iMsg)
---- freecad-0.11.3729.dfsg.orig/src/Mod/Mesh/Gui/Resources/translations/Mesh_fr.ts
-+++ freecad-0.11.3729.dfsg/src/Mod/Mesh/Gui/Resources/translations/Mesh_fr.ts
+--- 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>
@@ -38,8 +38,8 @@ Last-Update: 2011-04-14
<translation>Supprime des composants topologiquement indépendants du maillage</translation>
</message>
</context>
---- freecad-0.11.3729.dfsg.orig/src/Mod/Mesh/Gui/Resources/translations/Mesh_es.ts
-+++ freecad-0.11.3729.dfsg/src/Mod/Mesh/Gui/Resources/translations/Mesh_es.ts
+--- 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>
@@ -49,8 +49,8 @@ Last-Update: 2011-04-14
<translation>Elimina componentes topológicamente independientes de la malla</translation>
</message>
</context>
---- freecad-0.11.3729.dfsg.orig/src/Mod/Mesh/Gui/Resources/translations/Mesh_de.ts
-+++ freecad-0.11.3729.dfsg/src/Mod/Mesh/Gui/Resources/translations/Mesh_de.ts
+--- 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>
@@ -60,8 +60,8 @@ Last-Update: 2011-04-14
<translation>Entfernt topologisch unabhängige Komponenten aus dem Netz</translation>
</message>
</context>
---- freecad-0.11.3729.dfsg.orig/src/Mod/Mesh/Gui/Resources/translations/Mesh_it.ts
-+++ freecad-0.11.3729.dfsg/src/Mod/Mesh/Gui/Resources/translations/Mesh_it.ts
+--- 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>
@@ -71,8 +71,8 @@ Last-Update: 2011-04-14
<translation>Rimuovi componenti topologici indipendenti dalla mesh</translation>
</message>
</context>
---- freecad-0.11.3729.dfsg.orig/src/Mod/Mesh/App/MeshPy.xml
-+++ freecad-0.11.3729.dfsg/src/Mod/Mesh/App/MeshPy.xml
+--- 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.
@@ -82,8 +82,8 @@ Last-Update: 2011-04-14
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
---- freecad-0.11.3729.dfsg.orig/src/Mod/Points/Gui/DlgPointsRead.ui
-+++ freecad-0.11.3729.dfsg/src/Mod/Points/Gui/DlgPointsRead.ui
+--- 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">
@@ -93,8 +93,8 @@ Last-Update: 2011-04-14
</property>
</widget>
</item>
---- freecad-0.11.3729.dfsg.orig/src/Mod/Points/Gui/Resources/translations/Points_se.ts
-+++ freecad-0.11.3729.dfsg/src/Mod/Points/Gui/Resources/translations/Points_se.ts
+--- 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>
@@ -104,8 +104,8 @@ Last-Update: 2011-04-14
<translation>Talseparator:</translation>
</message>
<message>
---- freecad-0.11.3729.dfsg.orig/src/Mod/Points/Gui/Resources/translations/Points_es.ts
-+++ freecad-0.11.3729.dfsg/src/Mod/Points/Gui/Resources/translations/Points_es.ts
+--- 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>
@@ -115,8 +115,8 @@ Last-Update: 2011-04-14
<translation>Número separador:</translation>
</message>
<message>
---- freecad-0.11.3729.dfsg.orig/src/Mod/Points/Gui/Resources/translations/Points_de.ts
-+++ freecad-0.11.3729.dfsg/src/Mod/Points/Gui/Resources/translations/Points_de.ts
+--- 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>
@@ -126,8 +126,8 @@ Last-Update: 2011-04-14
<translation>Dezimaltrenner:</translation>
</message>
<message>
---- freecad-0.11.3729.dfsg.orig/src/Mod/Points/Gui/Resources/translations/Points_it.ts
-+++ freecad-0.11.3729.dfsg/src/Mod/Points/Gui/Resources/translations/Points_it.ts
+--- 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>
@@ -137,8 +137,8 @@ Last-Update: 2011-04-14
<translation>Numero separatore:</translation>
</message>
<message>
---- freecad-0.11.3729.dfsg.orig/src/Mod/Points/Gui/Resources/translations/Points_fr.ts
-+++ freecad-0.11.3729.dfsg/src/Mod/Points/Gui/Resources/translations/Points_fr.ts
+--- 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>
@@ -148,8 +148,8 @@ Last-Update: 2011-04-14
<translation>Séparateur de nombres:</translation>
</message>
<message>
---- freecad-0.11.3729.dfsg.orig/src/Mod/Points/App/PointsPy.xml
-+++ freecad-0.11.3729.dfsg/src/Mod/Points/App/PointsPy.xml
+--- 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.
@@ -159,9 +159,9 @@ Last-Update: 2011-04-14
transforming and much more.
</UserDocu>
---- freecad-0.11.3729.dfsg.orig/src/Mod/Sketcher/App/sketchflat/solve.cpp
-+++ freecad-0.11.3729.dfsg/src/Mod/Sketcher/App/sketchflat/solve.cpp
-@@ -214,7 +214,7 @@ static void SolveByForwardSubstitution(v
+--- 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)) {
@@ -170,9 +170,18 @@ Last-Update: 2011-04-14
EPrint("this: ", EQ->eqn[i].e);
dbp2("we think %08x and %08x", toReplace, replacement);
---- freecad-0.11.3729.dfsg.orig/src/App/Application.cpp
-+++ freecad-0.11.3729.dfsg/src/App/Application.cpp
-@@ -1351,7 +1351,7 @@ void Application::ParseOptions(int ac, c
+--- a/src/App/Application.cpp
++++ b/src/App/Application.cpp
+@@ -537,7 +537,7 @@
+
+ std::string::size_type pos = cName.find(':');
+
+- // is there a path seperator ?
++ // is there a path separator ?
+ if (pos == std::string::npos) {
+ throw Base::Exception("Application::GetParameterGroupByPath() no parameter set name specified");
+ }
+@@ -1351,7 +1351,7 @@
config.add_options()
//("write-log,l", value<string>(), "write a log file")
("write-log,l", descr.c_str())
@@ -181,9 +190,9 @@ Last-Update: 2011-04-14
("user-cfg,u", value<string>(),"User config file to load/save user settings")
("system-cfg,s", value<string>(),"Systen config file to load/save system settings")
("run-test,t", value<int>() ,"Test level")
---- freecad-0.11.3729.dfsg.orig/src/Base/UnitsApi.cpp
-+++ freecad-0.11.3729.dfsg/src/Base/UnitsApi.cpp
-@@ -260,6 +260,6 @@ double UnitsApi::parse(const char* buffe
+--- 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)
@@ -191,3 +200,226 @@ Last-Update: 2011-04-14
+ throw Base::Exception("Unknown error in Unit expression");
return ScanResult;
}
+--- a/src/Tools/DistTools.py
++++ b/src/Tools/DistTools.py
+@@ -119,11 +119,11 @@
+ dcount = dcount + 1
+
+ def BuildDistName():
+- # line seperator
++ # line separator
+ ls = os.linesep
+- # path seperator
++ # path separator
+ ps = os.pathsep
+- # dir seperator
++ # dir separator
+ ds = os.sep
+
+ # Building dist name
+@@ -133,11 +133,11 @@
+
+ return DistName
+ def BuildSetupName():
+- # line seperator
++ # line separator
+ ls = os.linesep
+- # path seperator
++ # path separator
+ ps = os.pathsep
+- # dir seperator
++ # dir separator
+ ds = os.sep
+
+ # Building dist name
+@@ -148,11 +148,11 @@
+ return DistName
+
+ def GetVersion():
+- # line seperator
++ # line separator
+ ls = os.linesep
+- # path seperator
++ # path separator
+ ps = os.pathsep
+- # dir seperator
++ # dir separator
+ ds = os.sep
+
+ # Building dist name
+@@ -161,11 +161,11 @@
+ return FCVersionMajor[23:-1] + '.' +FCVersionMinor[23:-1]
+
+ def GetBuildNbr():
+- # line seperator
++ # line separator
+ ls = os.linesep
+- # path seperator
++ # path separator
+ ps = os.pathsep
+- # dir seperator
++ # dir separator
+ ds = os.sep
+
+ # Building dist name
+@@ -174,11 +174,11 @@
+ return FCVersionBuild[23:-1]
+
+ def GetBuildDate():
+- # line seperator
++ # line separator
+ ls = os.linesep
+- # path seperator
++ # path separator
+ ps = os.pathsep
+- # dir seperator
++ # dir separator
+ ds = os.sep
+
+ # Building dist name
+--- a/src/Tools/fcbt/DistBin.py
++++ b/src/Tools/fcbt/DistBin.py
+@@ -6,11 +6,11 @@
+
+ import DistTools, FileTools
+
+-# line seperator
++# line separator
+ ls = os.linesep
+-# path seperator
++# path separator
+ ps = os.pathsep
+-# dir seperator
++# dir separator
+ ds = os.sep
+
+ DistName = DistTools.BuildDistName()
+@@ -59,4 +59,4 @@
+ #os.popen("rar.exe a "+DistDir+DistBin+".rar "+ DistDir+DistBin)
+ os.popen("7z a -tzip "+DistDir+DistBin+".zip "+ DistDir+DistBin+ " -mx9")
+
+-FileTools.rmall(DistDir+DistBin)
+\ No newline at end of file
++FileTools.rmall(DistDir+DistBin)
+--- a/src/Tools/fcbt/DistSetup.py
++++ b/src/Tools/fcbt/DistSetup.py
+@@ -6,11 +6,11 @@
+
+ import DistTools,FileTools
+
+-# line seperator
++# line separator
+ ls = os.linesep
+-# path seperator
++# path separator
+ ps = os.pathsep
+-# dir seperator
++# dir separator
+ ds = os.sep
+
+ DistName = DistTools.BuildDistName()
+--- a/src/Tools/fcbt/DistSrc.py
++++ b/src/Tools/fcbt/DistSrc.py
+@@ -6,11 +6,11 @@
+
+ import DistTools, FileTools
+
+-# line seperator
++# line separator
+ ls = os.linesep
+-# path seperator
++# path separator
+ ps = os.pathsep
+-# dir seperator
++# dir separator
+ ds = os.sep
+
+ DistName = DistTools.BuildDistName()
+--- a/src/Tools/fcbt/DistTools.py
++++ b/src/Tools/fcbt/DistTools.py
+@@ -9,11 +9,11 @@
+
+
+ def BuildDistName():
+- # line seperator
++ # line separator
+ ls = os.linesep
+- # path seperator
++ # path separator
+ ps = os.pathsep
+- # dir seperator
++ # dir separator
+ ds = os.sep
+
+ # Building dist name
+@@ -23,11 +23,11 @@
+
+ return DistName
+ def BuildSetupName():
+- # line seperator
++ # line separator
+ ls = os.linesep
+- # path seperator
++ # path separator
+ ps = os.pathsep
+- # dir seperator
++ # dir separator
+ ds = os.sep
+
+ # Building dist name
+@@ -38,11 +38,11 @@
+ return DistName
+
+ def GetVersion():
+- # line seperator
++ # line separator
+ ls = os.linesep
+- # path seperator
++ # path separator
+ ps = os.pathsep
+- # dir seperator
++ # dir separator
+ ds = os.sep
+
+ # Building dist name
+@@ -51,11 +51,11 @@
+ return FCVersionMajor[23:-1] + '.' +FCVersionMinor[23:-1]
+
+ def GetBuildNbr():
+- # line seperator
++ # line separator
+ ls = os.linesep
+- # path seperator
++ # path separator
+ ps = os.pathsep
+- # dir seperator
++ # dir separator
+ ds = os.sep
+
+ # Building dist name
+@@ -64,11 +64,11 @@
+ return FCVersionBuild[23:-1]
+
+ def GetBuildDate():
+- # line seperator
++ # line separator
+ ls = os.linesep
+- # path seperator
++ # path separator
+ ps = os.pathsep
+- # dir seperator
++ # dir separator
+ ds = os.sep
+
+ # Building dist name
+--- a/src/Base/Parameter.cpp
++++ b/src/Base/Parameter.cpp
+@@ -299,7 +299,7 @@
+
+ std::string::size_type pos = cName.find('/');
+
+- // is there a path seperator ?
++ // is there a path separator ?
+ if (pos == std::string::npos) {
+ return _GetGroup(Name);
+ }
--
FreeCAD packaging
More information about the debian-science-commits
mailing list