KDE_3_3_BRANCH: kdeedu/debian

[Ben Burton <bab@debian.org>]

CVS commit by benb: 

Re-enable boost.python scripting under arm.


  M +3 -1      changelog   1.16.2.14
  M +1 -1      control   1.20.2.8
  M +10 -8     rules   1.14.2.7


--- kdeedu/debian/changelog  #1.16.2.13:1.16.2.14
@@ -4,6 +4,8 @@
   * The moon images are now licensed under the GPL (closes: #266404).
   * Built against boost 1.32.0.
+  * Re-enabled boost.python scripting on arm, since it now seems to be
+    compiling with boost 1.32.0.
   * Added a test in debian/rules to make the build fail if the boost libraries
-    were not built.
+    are not built.
 
  -- Ben Burton <bab@debian.org>  Sun, 16 Jan 2005 20:45:11 +1100

--- kdeedu/debian/control  #1.20.2.7:1.20.2.8
@@ -3,5 +3,5 @@
 Priority: optional
 Maintainer: Ben Burton <bab@debian.org>
-Build-Depends: automake1.7, debhelper (>> 4.0.0), kdelibs4-dev (>> 4:3.2.92), libboost-python-dev (>= 1.31.0) [!arm]
+Build-Depends: automake1.7, debhelper (>> 4.0.0), kdelibs4-dev (>> 4:3.2.92), libboost-python-dev (>= 1.32.0)
 Build-Conflicts: autoconf2.13
 Standards-Version: 3.6.1

--- kdeedu/debian/rules  #1.14.2.6:1.14.2.7
@@ -44,12 +44,14 @@
 endif
 
-ifeq ($(DEB_BUILD_GNU_TYPE),arm-linux)
-  # Required since boost.python is broken on arm (#245893).
-  BOOST_FLAGS=--disable-kig-python-scripting
-  BOOST_TEST=true
-else
-  USING_BOOST=1
-  BOOST_TEST=-e $(objdir)/kig/scripting/libscripting.la
-endif
+# ifeq ($(DEB_BUILD_GNU_TYPE),arm-linux)
+#   # Required since boost.python is broken on arm (#245893).
+#   BOOST_FLAGS=--disable-kig-python-scripting
+#   BOOST_TEST=true
+# else
+#   BOOST_TEST=-e $(objdir)/kig/scripting/libscripting.la
+# endif
+
+# We now have boost.python working on all platforms (as of 1.32.0).
+BOOST_TEST=-e $(objdir)/kig/scripting/libscripting.la
 
 -include debian/debiandirs