rev 5389 - trunk/packages/kdeedu/debian

[Sune Vuorela]

Author: pusling-guest
Date: 2007-01-20 17:13:46 +0100 (Sat, 20 Jan 2007)
New Revision: 5389

Modified:
   trunk/packages/kdeedu/debian/changelog
   trunk/packages/kdeedu/debian/rules
Log:
changelog: stuff documented
rules:
 - generate kig apidocs
 - don't relibtoolize on the fly

TODO: buildprep



Modified: trunk/packages/kdeedu/debian/changelog
===================================================================
--- trunk/packages/kdeedu/debian/changelog	2007-01-20 16:12:42 UTC (rev 5388)
+++ trunk/packages/kdeedu/debian/changelog	2007-01-20 16:13:46 UTC (rev 5389)
@@ -1,18 +1,22 @@
-kdeedu (4:3.5.5-2) UNRELEASED; urgency=low
+kdeedu (4:3.5.6-1) UNRELEASED; urgency=low
 
-  * Add patch 13_hercules_clines:
-    typo in constellation line definition for Hercules causing the message:
-    kstars: WARNING: No star named alp2Her found.
-    Fixes the definition so the lines reflect the version at:
-    http://en.wikipedia.org/wiki/Hercules_(constellation)
-    Thanks to Jindrich Makovicka. (Closes: #395849)
+  * New upstream version
+    - fixes typo in Hercules constellation
+      in hercules (Closes: #395849)
   * Make kdeedu-dbg depend on kdelibs-dbg to get useful backtraces when
     debugging.
 
   +++ Changes by Sune Vuorela:
   * Update kfreebsd install files (Closes: 399235)
+  * Remove patch 12_fr_keyboard (applied upstream)
+  * enable more keyboardlayouts in ktouch (Closes: #398735)
+  * Install kwordquiz menu entry in Edutainment/Languages instead. 
+    (Closes: 309065)
+  * Don't relibtoolize on-the-fly, but use buildprep instead
+  * Okay. Yann Dirson wins. Let us try to ship the kig python
+    script api docs (Closes: #394517)
 
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 21 Dec 2006 19:34:51 +0100
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 20 Jan 2007 16:55:45 +0100
 
 kdeedu (4:3.5.5-1) unstable; urgency=low
 

Modified: trunk/packages/kdeedu/debian/rules
===================================================================
--- trunk/packages/kdeedu/debian/rules	2007-01-20 16:12:42 UTC (rev 5388)
+++ trunk/packages/kdeedu/debian/rules	2007-01-20 16:13:46 UTC (rev 5389)
@@ -1,15 +1,10 @@
 #! /usr/bin/make -f
 
-DEB_TAR_SRCDIR := $(shell basename $(wildcard *.tar.bz2) .tar.bz2)
-
-include /usr/share/cdbs/1/rules/tarball.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 include debian/cdbs/debian-qt-kde.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include /usr/share/cdbs/1/rules/utils.mk
 
-DEB_KDE_CVS_MAKE := yes
-
 DEB_DH_INSTALL_SOURCEDIR := $(DEB_DESTDIR)
 
 # Ensure that kig's python scripting built successfully.
@@ -20,30 +15,26 @@
 # this by copying from srcdir to builddir
 common-configure-impl:: debian/stamp-solver-copy
 
+common-install-prehook-arch::
+	cp -f debian/indi.install.kfreebsd-i386 debian/indi.install.kfreebsd-amd64
+
+build/kig::
+	cp $(DEB_SRCDIR)/doc/kig/scripting-api/*.png $(DEB_BUILDDIR)/doc/kig/scripting-api/
+	cd $(DEB_BUILDDIR)/doc/kig/scripting-api && doxygen Doxyfile.scripting-api
+	install -d -m 755 $(DEB_BUILDDIR)/doc/kig/scripting-api/build/html/ debian/tmp/usr/share/doc/kde/HTML/en/kig/scripting-api/
+	install -m644  $(DEB_BUILDDIR)/doc/kig/scripting-api/build/html/* debian/tmp/usr/share/doc/kde/HTML/en/kig/scripting-api/
+
+
+
 debian/stamp-solver-copy:
 	rm -rf $(DEB_BUILDDIR)/kalzium/src/solver/
 	mkdir -p $(DEB_BUILDDIR)/kalzium/src
 	cp -a $(DEB_SRCDIR)/kalzium/src/solver/ $(DEB_BUILDDIR)/kalzium/src/solver
 	touch $@
 
-post-patches:: debian/stamp-libtool-update
-
-debian/stamp-libtool-update:
-	cp -f /usr/share/libtool/libtool.m4 $(DEB_SRCDIR)/admin/libtool.m4.in
-	cp -f /usr/share/libtool/ltmain.sh $(DEB_SRCDIR)/admin/ltmain.sh
-	for f in /usr/share/automake-1.9/*; do \
-		if test -f $$f && ! test -L $$f && \
-			test -f $(DEB_SRCDIR)/admin/`basename $$f`; then \
-			cp -f $$f $(DEB_SRCDIR)/admin/; \
-		fi; \
-	done
-	touch debian/stamp-libtool-update
-
 clean::
-	rm -f debian/stamp-libtool-update
+	rm -f debian/indi.install.kfreebsd-amd64
 	rm -f debian/stamp-solver-copy
-	rm -f debian/patches/common/02_autotools_update.diff \
-		debian/patches/common/03_libtool_update.diff
 	rm -f $(DEB_TAR_SRCDIR).tar.bz2.cdbs-config_list
 
 DEB_INSTALL_DOCS_ALL :=