[SCM] FreeCAD packaging branch, master, updated. debian/0.11.3729.dfsg-1-9-g83ef483
Anton Gladky
gladky.anton at gmail.com
Sun Apr 17 07:50:50 UTC 2011
The following commit has been merged in the master branch:
commit 83ef483b65ede2a8e1a74fe8e3faa826e1a1fb57
Author: Anton Gladky <gladky.anton at gmail.com>
Date: Sun Apr 17 10:49:11 2011 +0100
Fix lintian warnings
diff --git a/debian/patches/fix-spelling-errors.patch b/debian/patches/fix-spelling-errors.patch
index 57742cd..40c11bc 100644
--- a/debian/patches/fix-spelling-errors.patch
+++ b/debian/patches/fix-spelling-errors.patch
@@ -93,6 +93,24 @@ Last-Update: 2011-04-14
</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 @@
@@ -170,26 +188,6 @@ Last-Update: 2011-04-14
EPrint("this: ", EQ->eqn[i].e);
dbp2("we think %08x and %08x", toReplace, replacement);
---- 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())
-- ("log-file", value<string>(), "Unlike to --write-log this allows to log to an arbitrary file")
-+ ("log-file", value<string>(), "Unlike to --write-log this allows one to log to an arbitrary file")
- ("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")
--- a/src/Base/UnitsApi.cpp
+++ b/src/Base/UnitsApi.cpp
@@ -260,6 +260,6 @@
@@ -200,226 +198,3 @@ 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);
- }
diff --git a/debian/rules b/debian/rules
index 585e1f5..a476e27 100755
--- a/debian/rules
+++ b/debian/rules
@@ -117,6 +117,9 @@ install-stamp:
override_dh_compress:
dh_compress -X.qch -X.qhc
+override_dh_makeshlibs:
+
+
binary-indep: build install
dh binary-indep
--
FreeCAD packaging
More information about the debian-science-commits
mailing list