This patch contains all the Debian-specific
changes mixed together. To review them
separately, please inspect the git history
at http://gitorious.org/openscad/
--- openscad-2013.01+dfsg.orig/openscad.qrc
+++ openscad-2013.01+dfsg/openscad.qrc
@@ -4,7 +4,6 @@
     <file>icons/prefsAdvanced.png</file>
     <file>icons/prefs3DView.png</file>
     <file>icons/prefsEditor.png</file>
-    <file>icons/flattr.png</file>
     <file>src/AboutDialog.html</file>
   </qresource>
 </RCC>
--- openscad-2013.01+dfsg.orig/eigen.pri
+++ openscad-2013.01+dfsg/eigen.pri
@@ -59,6 +59,11 @@ isEmpty(EIGEN_INCLUDEPATH) {
   }
 }
 
+!exists($$EIGEN_INCLUDEPATH/Eigen/Core) {
+  EIGEN_CFLAGS = $$system("pkg-config --cflags eigen2")
+  EIGEN_INCLUDEPATH = $$replace(EIGEN_CFLAGS,"-I","")
+}
+
 # disable Eigen SIMD optimizations for platforms where it breaks compilation
 !macx {
   !freebsd-g++ {
--- openscad-2013.01+dfsg.orig/src/AboutDialog.h
+++ openscad-2013.01+dfsg/src/AboutDialog.h
@@ -14,8 +14,6 @@ public:
 		setupUi(this);
 		this->setWindowTitle( QString("About OpenSCAD ") + QString(TOSTRING( OPENSCAD_VERSION)) );
 		this->aboutText->setOpenExternalLinks(true);
-		QUrl flattr_qurl(":icons/flattr.png" );
-		this->aboutText->loadResource( QTextDocument::ImageResource, flattr_qurl );
 		QString tmp = this->aboutText->toHtml();
 		tmp.replace("__VERSION__",QString(TOSTRING(OPENSCAD_VERSION)));
 		this->aboutText->setHtml(tmp);
--- openscad-2013.01+dfsg.orig/src/AboutDialog.html
+++ openscad-2013.01+dfsg/src/AboutDialog.html
@@ -14,7 +14,7 @@
 <body style="font-family:'Arial'; font-size:13pt;">
 
 <p>
-<a align=right href="https://flattr.com/submit/auto?user_id=openscad&amp;url=http://openscad.org&amp;title=OpenSCAD&amp;language=&amp;tags=github&amp;category=software"><img align=right src=":icons/flattr.png" /></a>
+<a align=right href="https://flattr.com/submit/auto?user_id=openscad&amp;url=http://openscad.org&amp;title=OpenSCAD&amp;language=&amp;tags=github&amp;category=software">Flattr this!</a>
 </p>
 
 <p>
--- openscad-2013.01+dfsg.orig/tests/CMakeLists.txt
+++ openscad-2013.01+dfsg/tests/CMakeLists.txt
@@ -314,7 +314,7 @@ inclusion(GLEW_DIR GLEW_INCLUDE_DIR)
 # Flex/Bison
 find_package(BISON REQUIRED)
 
-if(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
+if(${CMAKE_SYSTEM_NAME} MATCHES "^FreeBSD")
   # FreeBSD has an old flex in /usr/bin and a new flex in /usr/local/bin
   set(FLEX_EXECUTABLE /usr/local/bin/flex)
 endif()
