[prev in list] [next in list] [prev in thread] [next in thread] 

List:       klik-devel
Subject:    [klik-devel] [klikclient commit] r974 - trunk/client/trunk/debian
From:       codesite-noreply () google ! com
Date:       2008-01-31 15:23:09
Message-ID: 000e0cd213de0445063c3b8bfd131d18 () google ! com
[Download RAW message or body]

Author: niallw
Date: Thu Jan 31 07:22:30 2008
New Revision: 974

Modified:
   trunk/client/trunk/debian/changelog
   trunk/client/trunk/debian/control
   trunk/client/trunk/debian/klikd.rules
   trunk/client/trunk/debian/rules

Log:
fixup klikd though the *rules changes should revert when/if we move 
klikd/trunk/ to klikd

Modified: trunk/client/trunk/debian/changelog
==============================================================================
--- trunk/client/trunk/debian/changelog	(original)
+++ trunk/client/trunk/debian/changelog	Thu Jan 31 07:22:30 2008
@@ -1,4 +1,4 @@
-klik (1.9.2.970) UNRElEASED; urgency=low
+klik (1.9.2.974) UNRElEASED; urgency=low

   * Build cmginfo as part of client
   * Stop depending on cmginfo
@@ -13,7 +13,7 @@
   * Fix [ -x `which foo` ] stupidity
   * Add klikd

- -- Niall Walsh <niallwalsh@users.berlios.de>  Wed, 23 Jan 2008 
21:24:54 +0000
+ -- Niall Walsh <niallwalsh@users.berlios.de>  Thu, 31 Jan 2008 
15:20:14 +0000

 klik (0.0.866-1) UNRElEASED; urgency=low


Modified: trunk/client/trunk/debian/control
==============================================================================
--- trunk/client/trunk/debian/control	(original)
+++ trunk/client/trunk/debian/control	Thu Jan 31 07:22:30 2008
@@ -2,7 +2,7 @@
 Section: web
 Priority: optional
 Maintainer: Niall Walsh <niallwalsh@users.berlios.de>
-Build-Depends: cdbs, debhelper (>= 5), autotools-dev, zlib1g-dev, 
libattr1-dev, kdelibs-dev, gettext
+Build-Depends: cdbs, debhelper (>= 5), autotools-dev, zlib1g-dev, 
libattr1-dev, kdelibs-dev, gettext, autogen
 Standards-Version: 3.7.3
 Vcs-Svn: https://klikclient.googlecode.com/svn/trunk/client/trunk/
 Vcs-Browser: http://klikclient.googlecode.com/svn/trunk/client/trunk/

Modified: trunk/client/trunk/debian/klikd.rules
==============================================================================
--- trunk/client/trunk/debian/klikd.rules	(original)
+++ trunk/client/trunk/debian/klikd.rules	Thu Jan 31 07:22:30 2008
@@ -11,8 +11,8 @@
 install: build

 	# Add here commands to install the package into debian/
-	mkdir -p $(CURDIR)/../debian/klik/usr/bin/
-	mkdir -p $(CURDIR)/../binaryparts/usr/bin/
-	cp $(CURDIR)/src/klikd $(CURDIR)/../binaryparts/usr/bin/
-	cp $(CURDIR)/src/klikd $(CURDIR)/../debian/klik/usr/bin/
+	mkdir -p $(CURDIR)/../../debian/klik/usr/bin/
+	mkdir -p $(CURDIR)/../../binaryparts/usr/bin/
+	cp $(CURDIR)/src/klikd $(CURDIR)/../../binaryparts/usr/bin/
+	cp $(CURDIR)/src/klikd $(CURDIR)/../../debian/klik/usr/bin/


Modified: trunk/client/trunk/debian/rules
==============================================================================
--- trunk/client/trunk/debian/rules	(original)
+++ trunk/client/trunk/debian/rules	Thu Jan 31 07:22:30 2008
@@ -4,7 +4,7 @@
 clean::
 	make -C fakechroot -f ../debian/fakechroot.rules clean
 	make -C CIsofsUtl clean
-	[ ! -f klikd/Makefile ] || make -C klikd distclean
+	[ ! -f klikd/trunk/Makefile ] || make -C klikd/trunk distclean
 	[ ! -f cmg_kfile/Makefile ] || make -C cmg_kfile distclean
 	rm cmg_kfile/po/*.mo || true
 	[ ! -f cmg_kthumbnail/Makefile ] || make -C cmg_kthumbnail distclean
@@ -13,7 +13,7 @@

 build/klik::
 	mkdir -p binaryparts
-	make -C klikd -f ../debian/klikd.rules install
+	make -C klikd/trunk -f ../debian/klikd.rules install
 	make -C fakechroot -f ../debian/fakechroot.rules install
 	make -C CIsofsUtl -f ../debian/cmginfo.rules install
 	make -C cmg_kfile -f ../debian/cmg_kfile.rules install
_______________________________________________
klik-devel mailing list
klik-devel@kde.org
https://mail.kde.org/mailman/listinfo/klik-devel
[prev in list] [next in list] [prev in thread] [next in thread]