r3105 - packages/trunk/boson/debian

[Gonéri Le Bouder]

Author: goneri-guest
Date: 2007-06-28 22:24:01 +0000 (Thu, 28 Jun 2007)
New Revision: 3105

Modified:
   packages/trunk/boson/debian/changelog
   packages/trunk/boson/debian/rules
Log:
some minor changes


Modified: packages/trunk/boson/debian/changelog
===================================================================
--- packages/trunk/boson/debian/changelog	2007-06-28 17:07:19 UTC (rev 3104)
+++ packages/trunk/boson/debian/changelog	2007-06-28 22:24:01 UTC (rev 3105)
@@ -6,7 +6,9 @@
   * include linux/utsrelease.h to read UTS_RELEASE (Closes: #427271)
     - add linux-kernel-headers in build dependency for compatibility with old
     kernel
-  * debian/rules: call cmake during the configure step
+  * debian/rules:
+    - call cmake during the configure step
+    - other minor changes
 
  -- Gonéri Le Bouder <goneri at rulezlan.org>  Thu, 28 Jun 2007 19:11:17 +0200 
 

Modified: packages/trunk/boson/debian/rules
===================================================================
--- packages/trunk/boson/debian/rules	2007-06-28 17:07:19 UTC (rev 3104)
+++ packages/trunk/boson/debian/rules	2007-06-28 22:24:01 UTC (rev 3105)
@@ -24,10 +24,9 @@
 
 build-stamp:
 	dh_testdir
-
+	cd debian/build-area && make
 	#fix path errors with CMake and kde
-	cp debian/build-area/boson/data/install_icons.cmake debian/build-area/boson/data/install_icons.cmake.bak
-	sed "s:\ /usr:\ ../../debian/tmp/usr:" debian/build-area/boson/data/install_icons.cmake.bak > debian/build-area/boson/data/install_icons.cmake
+	sed -i "s:\ /usr:\ ../../debian/tmp/usr:" debian/build-area/boson/data/install_icons.cmake
 	# generate manpages
 	for i in debian/*.sgml; do \
 		docbook-to-man $$i > `dirname $$i`/`basename $$i .sgml`.6 ;\
@@ -39,18 +38,17 @@
 clean:
 	dh_testdir
 	dh_testroot
-	rm -f build-stamp
-	rm -Rf CMakeFiles \
-	CMakeCache.txt \
-	debian/stamp-cmake-build \
-	debian/build-area \
-	debian/tmp
-	rm -f debian/files debian/boson.substvars \
-	debian/boson.manpages
+	rm -rf debian/build-area
 	for i in debian/*.sgml; do \
 		rm -f `echo $$i| sed 's/sgml/6/'` ;\
 	done
-	dh_clean
+	dh_clean build-stamp \
+	configure-stamp \
+	debian/boson.substvars \
+	debian/boson.manpages \
+	debian/stamp-cmake-build \
+	CMakeFiles \
+	CMakeCache.txt
 	QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2
 
 install: build
@@ -70,7 +68,6 @@
 	dh_install
 	dh_installchangelogs ChangeLog
 	dh_installdocs
-	dh_installexamples
 	dh_installman
 	dh_installmenu
 	dh_link