[SCM] FreeCAD packaging branch, master, updated. debian/0.12.5284-dfsg-4-4-g299b832

[Anton Gladky]

The following commit has been merged in the master branch:
commit 28cb8bae4895a708271fdaa62615cf736c35a9bd
Author: Anton Gladky <gladky.anton at gmail.com>
Date:   Sun Mar 18 08:50:09 2012 +0100

    Fix bug of identifying SWIG version. Thanks to Werner Mayer <werner.wm.mayer at gmx.de>. (Closes: #646374)

diff --git a/debian/patches/fix_draft_line.patch b/debian/patches/fix_draft_line.patch
new file mode 100644
index 0000000..a039c80
--- /dev/null
+++ b/debian/patches/fix_draft_line.patch
@@ -0,0 +1,72 @@
+Description: Fix bug with identifying SWIG version
+Origin: http://free-cad.git.sourceforge.net/git/gitweb.cgi?p=free-cad/free-cad;a=blobdiff;f=src/Base/Interpreter.cpp;h=6e31a38103caf9735f074544dcf650b539d0a1ef;hp=a1bd56a9a139f22b6e7c85a23f787d170b0fbbb0;hb=0e7df97961dbd238094b9223efd217502fe1c747;hpb=10b0601c54ab3d70c11503a0a0ba909ecda99d3b
+http://free-cad.git.sourceforge.net/git/gitweb.cgi?p=free-cad/free-cad;a=blobdiff;f=src/Base/Interpreter.cpp;h=0a8c4b9e8b6c69582d5ad07112d15eb71a8a01e8;hp=6e31a38103caf9735f074544dcf650b539d0a1ef;hb=1f690c0c817500159c078f2d91ee15a7ebda3cc9;hpb=06d708c86ea7bcf1078dca5799949260ed72d619
+Bug-Debian: http://bugs.debian.org/646374
+Author: Werner Mayer <werner.wm.mayer at gmx.de>
+Reviewed-by: Anton Gladky <gladky.anton at gmail.com>
+Last-Update: 2012-03-14
+
+--- a/src/Base/Interpreter.cpp
++++ b/src/Base/Interpreter.cpp
+@@ -474,7 +474,7 @@
+             // file can have the extension .py or .pyc
+             filename = filename.substr(0, filename.rfind("."));
+             filename += ".py";
+-            boost::regex rx("^# Version ([1-9])\\.([1-9])\\.([1-9][0-9])");
++            boost::regex rx("^# Version ([1-9])\\.([0-9])\\.([0-9]+)"); 
+             boost::cmatch what;
+ 
+             std::string line;
+@@ -518,21 +518,21 @@
+     PyObject* proxy=0;
+     PyGILStateLocker locker;
+     int version = getSWIGVersionFromModule(Module);
+-    switch (version&0xff)
++    switch (version)
+     {
+-    case 25:
++    case 66329:
+         result = Swig_1_3_25::createSWIGPointerObj_T(TypeName, Pointer, &proxy, own);
+         break;
+-    case 33:
++    case 66337:
+         result = Swig_1_3_33::createSWIGPointerObj_T(TypeName, Pointer, &proxy, own);
+         break;
+-    case 36:
++    case 66340:
+         result = Swig_1_3_36::createSWIGPointerObj_T(TypeName, Pointer, &proxy, own);
+         break;
+-    case 38:
++    case 66342:
+         result = Swig_1_3_38::createSWIGPointerObj_T(TypeName, Pointer, &proxy, own);
+         break;
+-    case 40:
++    case 66344:
+         result = Swig_1_3_40::createSWIGPointerObj_T(TypeName, Pointer, &proxy, own);
+         break;
+     default:
+@@ -566,19 +566,19 @@
+     int version = getSWIGVersionFromModule(Module);
+     switch (version&0xff)
+     {
+-    case 25:
++    case 66329:
+         result = Swig_1_3_25::convertSWIGPointerObj_T(TypeName, obj, ptr, flags);
+         break;
+-    case 33:
++    case 66337:
+         result = Swig_1_3_33::convertSWIGPointerObj_T(TypeName, obj, ptr, flags);
+         break;
+-    case 36:
++    case 66340:
+         result = Swig_1_3_36::convertSWIGPointerObj_T(TypeName, obj, ptr, flags);
+         break;
+-    case 38:
++    case 66342:
+         result = Swig_1_3_38::convertSWIGPointerObj_T(TypeName, obj, ptr, flags);
+         break;
+-    case 40:
++    case 66344:
+         result = Swig_1_3_40::convertSWIGPointerObj_T(TypeName, obj, ptr, flags);
+         break;
+     default:
diff --git a/debian/patches/series b/debian/patches/series
index 440a258..0a50ba3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ disable_memory_check.patch
 fix_armel_FTBFS.patch
 fix_FTBFS_on_precise.patch
 fix_FTBFS_with_oce-0.9.1.patch
+fix_draft_line.patch

-- 
FreeCAD packaging