'[klik-devel] [klikclient commit] r1129 - in trunk/client/trunk: .'

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

List:       klik-devel
Subject:    [klik-devel] [klikclient commit] r1129 - in trunk/client/trunk: .
From:       codesite-noreply () google ! com
Date:       2008-02-13 23:20:17
Message-ID: 000e0cd228240446126a81aa5a56a038 () google ! com
[Download RAW message or body]

Author: niallw
Date: Wed Feb 13 15:19:59 2008
New Revision: 1129

Removed:
   trunk/client/trunk/debian/cmg_kfile.rules
   trunk/client/trunk/debian/cmg_kthumbnail.rules
   trunk/client/trunk/debian/cmginfo.rules
   trunk/client/trunk/debian/fakechroot.rules
   trunk/client/trunk/debian/klikd.rules
Modified:
   trunk/client/trunk/Makefile
   trunk/client/trunk/debian/changelog
   trunk/client/trunk/debian/control
   trunk/client/trunk/debian/install
   trunk/client/trunk/debian/rules

Log:
klikclient: switched debian packaging to main Makefile

Modified: trunk/client/trunk/Makefile
==============================================================================

--- trunk/client/trunk/Makefile	(original)
+++ trunk/client/trunk/Makefile	Wed Feb 13 15:19:59 2008
@@ -1,36 +1,48 @@
 #!/usr/bin/make -f

-STAMP = $(shell date +%Y%m%d%H%M)
+VERSION = $(shell awk '{print $$2; exit}' debian/changelog | sed 's|(| 
|;s|)||')

-build: distclean source daemon chroot cmginfo cmg_kde copy output
+# just create all the binaries and copy everything to release/
+build: daemon chroot cmginfo cmg_kde copy

+# do a complete clean and build
+cleanbuild: distclean source daemon chroot cmginfo cmg_kde copy output
+
+# wipe for a fresh build
 distclean:
 	-rm -f fakechroot/build-stamp
 	[ ! -f fakechroot/trunk/Makefile ] || make -C fakechroot distclean
+#	-rm -f fakechroot/config.sub fakechroot/config.guess
 	make -C CIsofsUtl clean
 	[ ! -f klikd/trunk/Makefile ] || make -C klikd/trunk distclean
 	[ ! -f cmg_kfile/Makefile ] || make -C cmg_kfile distclean
 	-rm -f cmg_kfile/po/*.mo
+#	-rm -f cmg_kfile/admin/config.guess cmg_kfile/admin/config.sub
 	[ ! -f cmg_kthumbnail/Makefile ] || make -C cmg_kthumbnail distclean
 	-rm cmg_kthumbnail/doc/*/Makefile
+#	-rm -f cmg_kthumbnail/admin/config.guess cmg_kthumbnail/admin/config.sub
 	-rm -rf release
-	-rm -rf klik-svn????????????
+	-rm -rf klik-$(VERSION)

+# trivially tar up the source
 source:
-	tar -czf ../klik-svn$(STAMP).src.tar.gz .
-	exit
+	tar -czf ../klik_$(VERSION).orig.tar.gz .

+# compile klikd
 daemon:
 	cd klikd/trunk && ./autogen.sh && ./configure
 	$(MAKE) -C klikd/trunk

+# compile fakechroot
 chroot:
  	cd fakechroot && ./autogen.sh && ./configure --prefix=/usr 
--mandir=/usr/share/man --infodir=/usr/share/info
 	$(MAKE) -C fakechroot

+# compile cmginfo
 cmginfo:
 	$(MAKE) -C CIsofsUtl

+# compile kde thumbnailing
 cmg_kde:
 	cd cmg_kfile && ./configure --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info
 	$(MAKE) -C cmg_kfile
@@ -39,6 +51,7 @@
  	cd cmg_kthumbnail && ./configure --prefix=/usr 
--mandir=/usr/share/man --infodir=/usr/share/info
 	$(MAKE) -C cmg_kthumbnail

+# stage all non klikclient (python) parts in release/
 copy:
 	mkdir -p release/usr/bin
 	cp klikd/trunk/src/klikd release/usr/bin/
@@ -55,9 +68,11 @@
 	mkdir -p release/usr/share/services
 	cp cmg_kthumbnail/src/isofsthumbnail.desktop release/usr/share/services/

+# create a klik binary tar for install.py using release for binaryparts
 output:
-	mkdir -p klik-svn$(STAMP)/binaryparts
-	cp -a release/* klik-svn$(STAMP)/binaryparts
-	mkdir -p klik-svn$(STAMP)/client
-	cp -a klikclient install install.py uninstall.py README 
README.kde-thumbnailer klik-svn$(STAMP)/client
-	tar -czf ../klik-svn$(STAMP).tar.gz klik-svn$(STAMP)
+	mkdir -p klik-$(VERSION)/binaryparts
+	cp -a release/* klik-$(VERSION)/binaryparts
+	mkdir -p klik-$(VERSION)/client
+	cp -a klikclient install install.py uninstall.py README 
README.kde-thumbnailer klik-$(VERSION)/client
+	tar -czf ../klik-$(VERSION).tar.gz klik-$(REVISION)
+

Modified: trunk/client/trunk/debian/changelog
==============================================================================
--- trunk/client/trunk/debian/changelog	(original)
+++ trunk/client/trunk/debian/changelog	Wed Feb 13 15:19:59 2008
@@ -1,4 +1,4 @@
-klik (1.9.2.1046) UNRElEASED; urgency=low
+klik (1.9.2) UNRElEASED; urgency=low

   * Build cmginfo as part of client
   * Stop depending on cmginfo
@@ -14,8 +14,10 @@
   * Add klikd (automake, autoconf, autogen, libc6-dev in b-deps)
   * Start to build up the debian/copyright info
   * Depend on fusioniso rather then fuseiso
+  * Use main Makefile and hence simplify/remove debian/*rules
+  * Add libtool to build-deps for fakechroot

- -- Niall Walsh <niallwalsh@users.berlios.de>  Tue, 05 Feb 2008 
23:03:01 +0000
+ -- Niall Walsh <niallwalsh@users.berlios.de>  Wed, 13 Feb 2008 
19:36:39 +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	Wed Feb 13 15:19:59 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, autoconf, automake, autogen, libc6-dev
+Build-Depends: cdbs, debhelper (>= 5), autotools-dev, zlib1g-dev, 
libattr1-dev, kdelibs-dev, gettext, autoconf, automake, autogen, 
libc6-dev, libtool
 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/install
==============================================================================
--- trunk/client/trunk/debian/install	(original)
+++ trunk/client/trunk/debian/install	Wed Feb 13 15:19:59 2008
@@ -45,6 +45,7 @@
 klikclient/share/klik/settings.xml                     usr/share/klik/
 klikclient/share/klik/klik-site.desktop			usr/share/klik/
 klikclient/share/klik/klik-site.desktop			usr/share/applnk/
+klikclient/share/klik/svnversion			usr/share/klik/
 install/cmg-mimetype.xml					usr/share/klik/
 klikclient/share/klik/mimelnk.cmg.desktop		usr/share/mimelnk/application/
 install/application-x-extension-cmg.png			usr/share/klik/

Modified: trunk/client/trunk/debian/rules
==============================================================================
--- trunk/client/trunk/debian/rules	(original)
+++ trunk/client/trunk/debian/rules	Wed Feb 13 15:19:59 2008
@@ -2,20 +2,13 @@
 include /usr/share/cdbs/1/rules/debhelper.mk

 clean::
-	make -C fakechroot -f ../debian/fakechroot.rules clean
-	make -C CIsofsUtl clean
-	[ ! -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
-	rm cmg_kthumbnail/doc/en/Makefile || true
-	rm -rf binaryparts
+	${MAKE} distclean

 build/klik::
-	mkdir -p binaryparts
-	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
-	make -C cmg_kthumbnail -f ../debian/cmg_kthumbnail.rules install
+	${MAKE} daemon
+	${MAKE} chroot
+	${MAKE} cmginfo
+	${MAKE} cmg_kde
+	${MAKE} copy
+	cp -a release/* $(CURDIR)/debian/klik/

_______________________________________________
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] 
