CVS commit by benb:
Sync from BRANCH.
M +12 -5 README.Packaging 1.3
M +69 -0 celestrongps.1 1.2
M +31 -0 changelog 1.15
M +19 -0 clean-sources 1.2
M +2 -5 control 1.19
M +111 -0 indiserver.1 1.2
M +0 -2 kbruch.install 1.3
M +0 -2 kig.install 1.4
M +7 -0 kstars.manpages 1.2
M +69 -0 lx200_16.1 1.2
M +69 -0 lx200autostar.1 1.2
M +69 -0 lx200classic.1 1.2
M +69 -0 lx200generic.1 1.2
M +69 -0 lx200gps.1 1.2
M +8 -1 rules 1.14
M +2 -0 source.lintian-overrides 1.2
--- kdeedu/debian/changelog #1.14:1.15
@@ -1,2 +1,33 @@
+kdeedu (4:3.2.3-2) unstable; urgency=low
+
+ * Disable kig scripting on arm while boost.python remains broken on
+ that architecture.
+
+ -- Ben Burton <[EMAIL PROTECTED]> Sat, 17 Jul 2004 11:19:00 +1000
+
+kdeedu (4:3.2.3-1) unstable; urgency=low
+
+ * New upstream bugfix release.
+ * Added manpages for KStars INDI server and device drivers.
+ * Suggests (konqueror | www-browser) for kdeedu-doc-html instead of
+ just www-browser.
+ * Added debian/clean-sources to simplify removal of non-DFSG-free material.
+
+ -- Ben Burton <[EMAIL PROTECTED]> Sun, 20 Jun 2004 09:48:28 +1000
+
+kdeedu (4:3.2.2-1) unstable; urgency=low
+
+ * New upstream bugfix release.
+ * Built against Boost.Python 1.31.0, which in turn is built against
+ Python 2.3 (closes: #243079, #245135).
+
+ -- Ben Burton <[EMAIL PROTECTED]> Thu, 22 Apr 2004 18:15:48 +1000
+
+kdeedu (4:3.2.1-2) unstable; urgency=low
+
+ * Don't use Conflicts/Replaces where we should just use Replaces.
+
+ -- Ben Burton <[EMAIL PROTECTED]> Tue, 16 Mar 2004 09:15:01 +1100
+
kdeedu (4:3.2.1-1) unstable; urgency=low
--- kdeedu/debian/control #1.18:1.19
@@ -3,6 +3,5 @@
Priority: optional
Maintainer: Ben Burton <[EMAIL PROTECTED]>
-Build-Depends: automake1.7, debhelper (>> 4.0.0), kdelibs4-dev (>> 4:3.2.0),
libboost-python-dev, python2.2-dev
-Build-Conflicts: python2.3-dev
+Build-Depends: automake1.7, debhelper (>> 4.0.0), kdelibs4-dev (>> 4:3.2.0),
libboost-python-dev (>= 1.31.0) [!arm]
Standards-Version: 3.6.1
@@ -29,5 +28,5 @@
Architecture: all
Section: doc
-Suggests: www-browser, kdeedu
+Suggests: konqueror | www-browser, kdeedu
Description: KDE edutainment documentation in HTML format
By default the educational applications provided with KDE (the K Desktop
@@ -191,5 +190,4 @@
Section: kde
Recommends: klettres (= ${Source-Version})
-Conflicts: klettres (<< 4:3.2.0.1)
Replaces: klettres (<< 4:3.2.0.1)
Description: data files for KLettres foreign alphabet tutor
@@ -278,5 +276,4 @@
Section: science
Recommends: kstars (= ${Source-Version})
-Conflicts: kstars (<< 4:3.2.0.1)
Replaces: kstars (<< 4:3.2.0.1)
Description: data files for KStars desktop planetarium
--- kdeedu/debian/kbruch.install #1.2:1.3
@@ -8,5 +8,3 @@
usr/share/icons/crystalsvg/16x16/apps/kbruch.png
usr/share/icons/crystalsvg/32x32/apps/kbruch.png
-usr/share/icons/locolor/16x16/apps/kbruch.png
-usr/share/icons/locolor/32x32/apps/kbruch.png
../kbruch.xpm usr/share/pixmaps
--- kdeedu/debian/kig.install #1.3:1.4
@@ -13,6 +13,4 @@
usr/share/icons/crystalsvg/48x48/apps/kig.png
usr/share/icons/crystalsvg/128x128/apps/kig.png
-usr/share/icons/locolor/16x16/apps/kig.png
-usr/share/icons/locolor/32x32/apps/kig.png
usr/share/mimelnk/application/x-kig.desktop
usr/share/mimelnk/application/x-kgeo.desktop
--- kdeedu/debian/kstars.manpages #1.1:1.2
@@ -1 +1,8 @@
+debian/celestrongps.1
+debian/indiserver.1
debian/kstars.1
+debian/lx200_16.1
+debian/lx200autostar.1
+debian/lx200classic.1
+debian/lx200generic.1
+debian/lx200gps.1
--- kdeedu/debian/rules #1.13:1.14
@@ -42,4 +42,11 @@
endif
+ifeq ($(DEB_BUILD_GNU_TYPE),arm-linux)
+ # Required since boost.python is broken on arm (#245893).
+ BOOST_FLAGS=--disable-kig-python-scripting
+else
+ BOOST_FLAGS=
+endif
+
-include debian/debiandirs
@@ -74,5 +81,5 @@
# run configure with build tree $(objdir)
cd $(objdir) && \
- ../configure $(configkde)
+ ../configure $(configkde) $(BOOST_FLAGS)
touch configure-stamp
