rev 2957 - kde-extras/codeine/trunk/debian

[Achim Bohnet]

Author: ach-guest
Date: 2006-01-19 00:53:54 +0000 (Thu, 19 Jan 2006)
New Revision: 2957

Modified:
   kde-extras/codeine/trunk/debian/TODO
   kde-extras/codeine/trunk/debian/rules
Log:
codeine:
    rules:
	o get compile time prefix versus installations time
	  DESTDIR right
	o fix last typo ;)
    TODO:
	more items

Modified: kde-extras/codeine/trunk/debian/TODO
===================================================================
--- kde-extras/codeine/trunk/debian/TODO	2006-01-19 00:22:44 UTC (rev 2956)
+++ kde-extras/codeine/trunk/debian/TODO	2006-01-19 00:53:54 UTC (rev 2957)
@@ -1,9 +1,19 @@
-o DONE: add kaffeine 'Media Player' translations
 o check kpart can/is used
 o think about priority in desktop file.  Need to be
   discussed with kubuntu people what they want as default
 o add konq service menu
 o comment out some code that writes the output stdout
 o rosettafication
+o rules: split generic scons part out in scons.mk
+o current template rules.mk on KubuntuPackagingGuide gets
+  compile time prefix and installtime DESTDIR wrong:
+  Use during compile time
+	SCONS_PREFIX=/usr
+  and to install
+	DESTDIR=$(DEB_DESTDIR) $(SCONS_CMD) install
+
+------------
+
 o DONE: more meat in the manpage
-o DONE cleanup rules file: try with cdbs, much cleaner ;)
+o DONE: cleanup rules file: try with cdbs, much cleaner ;)
+o DONE: add kaffeine 'Media Player' translations

Modified: kde-extras/codeine/trunk/debian/rules
===================================================================
--- kde-extras/codeine/trunk/debian/rules	2006-01-19 00:22:44 UTC (rev 2956)
+++ kde-extras/codeine/trunk/debian/rules	2006-01-19 00:53:54 UTC (rev 2957)
@@ -7,12 +7,12 @@
 DEB_SCONS_PREFIX=/usr
 
 CONFIG_STATUS=$(DEB_BUILDDIR)/config.status
-SCONS_CMD=`which scons`
+SCONS_CMD=scons
 
 common-configure-arch common-configure-indep:: common-configure-impl
 common-configure-impl:: $(CONFIG_STATUS)
 $(CONFIG_STATUS):
-	$(SCONS_CMD) configure prefix=$(DEB_DESTDIR)$(DEB_SCONS_PREFIX)
+	$(SCONS_CMD) configure prefix=$(DEB_SCONS_PREFIX)
 	touch $(CONFIG_STATUS)
 
 common-build-arch common-build-indep:: common-build-impl
@@ -21,10 +21,13 @@
 
 common-install-arch common-install-indep:: common-install-impl
 common-install-impl::
-	$(SCONS_CMD) install
+	DESTDIR=$(DEB_DESTDIR) $(SCONS_CMD) install
 
+build/codeine::
+	docbook2x-man debian/codeine.1.docbook
+
 install/codeine::
-	mv debian/codeine/usr/share/applications/codeine_part.desktop \
+	mv debian/codeine/usr/share/applications/kde/codeine_part.desktop \
 	   debian/codeine/usr/share/services/
 
 clean::
@@ -37,8 +40,5 @@
 	rm -f scons/*.pyc scons/signatures.dblite
 	rm -f codeine.1
 
-build/codeine::
-	docbook2x-man debian/codeine.1.docbook
-
 DEB_INSTALL_MANPAGES_codeine = codeine.1