[systemimager-commits] r4107 - in branches/3.9.x: . doc/man patches

[<ar...@sy...>]

Author: arighi
Date: 2007-08-04 05:55:03 -0500 (Sat, 04 Aug 2007)
New Revision: 4107

Added:
   branches/3.9.x/debian/
   branches/3.9.x/patches/reiserfsprogs.10fix-include.patch
Modified:
   branches/3.9.x/CREDITS
   branches/3.9.x/Makefile
   branches/3.9.x/VERSION
   branches/3.9.x/doc/man/Makefile
   branches/3.9.x/systemimager.spec
Log:
This commit is a merge from trunk -> 3.9.x:
   svn merge -r 4095:4100 svn://svn.systemimager.org/var/lib/svn/systemimager/trunk .

Added deb packaging rules and "make deb" target.


Modified: branches/3.9.x/CREDITS
===================================================================
--- branches/3.9.x/CREDITS	2007-08-04 10:51:05 UTC (rev 4106)
+++ branches/3.9.x/CREDITS	2007-08-04 10:55:03 UTC (rev 4107)
@@ -41,6 +41,10 @@
 D: bug fix to use 'type -p' instead of 'which' in the 95all.monitord_rebooted
 D: post-install script
 
+N: Andrea Capriotti
+E: a.c...@ci...
+D: Help for the Debian/Ubuntu support
+
 N: Joshua Cope
 E: Jos...@hp...
 D: bug fix for ssh (libnss_files dependency)
@@ -150,6 +154,10 @@
 E: ost...@te...
 D: PPC Porting related stuff
 
+N: Geoffroy Vallée
+E: geo...@fr...
+D: A lot of improvements for the Debian support
+
 N: Denise Walters
 E: den...@hp...
 D: Put the documentation into a much more professional format

Modified: branches/3.9.x/Makefile
===================================================================
--- branches/3.9.x/Makefile	2007-08-04 10:51:05 UTC (rev 4106)
+++ branches/3.9.x/Makefile	2007-08-04 10:55:03 UTC (rev 4107)
@@ -552,6 +552,24 @@
 rpm: $(TOPDIR)/tmp/systemimager-$(VERSION).tar.bz2
 	rpmbuild -tb $(TOPDIR)/tmp/systemimager-$(VERSION).tar.bz2
 
+# make the debs for systemimager
+.PHONY: deb
+deb: $(TOPDIR)/tmp/systemimager-$(VERSION).tar.bz2
+	# Check package version.
+	@(if [ ! "`dpkg-parsechangelog | grep ^Version: | cut -d ' ' -f 2`" = $(VERSION) ]; then \
+		echo "ERROR: versions in debian/changelog doesn't match with version specified into the file VERSION"; \
+		echo "Please fix it."; \
+		exit 1; \
+	else \
+		exit 0; \
+	fi)
+	@cd $(TOPDIR)/tmp && tar xvjf systemimager-$(VERSION).tar.bz2
+	@cd $(TOPDIR)/tmp/systemimager-$(VERSION) && make -f debian/rules debian/control
+	@PATH=/sbin:/usr/sbin:$(PATH) cd $(TOPDIR)/tmp/systemimager-$(VERSION) && fakeroot dpkg-buildpackage -uc -us
+	@echo "=== deb packages for systemimager ==="
+	@ls -l $(TOPDIR)/tmp/*.deb
+	@echo "====================================="
+
 # removes object files, docs, editor backup files, etc.
 .PHONY:	clean
 clean:	$(subst .rul,_clean,$(shell cd $(TOPDIR)/make.d && ls *.rul)) initrd_clean
@@ -619,6 +637,9 @@
 	@echo "srpm"
 	@echo "    Build yourself a source RPM."
 	@echo ""
+	@echo "deb"
+	@echo "    Build all of the debs that can be build on your platform."
+	@echo ""
 	@echo "show_all_targets"
 	@echo "    Show all available targets."
 	@echo

Modified: branches/3.9.x/VERSION
===================================================================
--- branches/3.9.x/VERSION	2007-08-04 10:51:05 UTC (rev 4106)
+++ branches/3.9.x/VERSION	2007-08-04 10:55:03 UTC (rev 4107)
@@ -1 +1 @@
-3.9.0
+3.9.2

Copied: branches/3.9.x/debian (from rev 4106, trunk/debian)

Modified: branches/3.9.x/doc/man/Makefile
===================================================================
--- branches/3.9.x/doc/man/Makefile	2007-08-04 10:51:05 UTC (rev 4106)
+++ branches/3.9.x/doc/man/Makefile	2007-08-04 10:55:03 UTC (rev 4107)
@@ -14,7 +14,7 @@
 
 SYSTEMIMAGER_VERSION = $(shell cat ../../VERSION)
 
-MANPAGES = $(SERVER_MAN) $(CLIENT_MAN) $(COMMON_MAN)
+MANPAGES = $(SERVER_MAN) $(SERVER_POD_MAN) $(CLIENT_MAN) $(COMMON_MAN)
 
 SERVER_MAN = si_addclients.8 				\
 			si_getimage.8					\
@@ -32,8 +32,15 @@
 			si_mkrsyncd_conf.8				\
 			si_pushupdate.8				\
 			si_mkclientnetboot.8				\
-			si_mkbootpackage.8		
-#			si_imagemanip.8
+			si_mkbootpackage.8		\
+			\
+			si_installbtimage.8		\
+			si_monitor.8			\
+			si_monitortk.8			\
+			si_pcp.8			\
+			si_psh.8			\
+			si_pushinstall.8		\
+			si_pushoverrides.8
 
 CLIENT_MAN = si_prepareclient.8 si_updateclient.8
 
@@ -55,6 +62,27 @@
 si_imagemanip.8:	$(TOPDIR)/sbin/si_imagemanip
 	pod2man --release=$(SYSTEMIMAGER_VERSION) -s 8 -c "SystemImager" $< $@
 
+si_installbtimage.8: $(TOPDIR)/sbin/si_installbtimage
+	pod2man --release=$(SYSTEMIMAGER_VERSION) -s 8 -c "SystemImager" $< $@
+
+si_monitor.8: $(TOPDIR)/sbin/si_monitor
+	pod2man --release=$(SYSTEMIMAGER_VERSION) -s 8 -c "SystemImager" $< $@
+
+si_monitortk.8: $(TOPDIR)/sbin/si_monitortk
+	pod2man --release=$(SYSTEMIMAGER_VERSION) -s 8 -c "SystemImager" $< $@
+
+si_pcp.8: $(TOPDIR)/sbin/si_pcp
+	pod2man --release=$(SYSTEMIMAGER_VERSION) -s 8 -c "SystemImager" $< $@
+
+si_psh.8: $(TOPDIR)/sbin/si_psh
+	pod2man --release=$(SYSTEMIMAGER_VERSION) -s 8 -c "SystemImager" $< $@
+
+si_pushinstall.8: $(TOPDIR)/sbin/si_pushinstall
+	pod2man --release=$(SYSTEMIMAGER_VERSION) -s 8 -c "SystemImager" $< $@
+
+si_pushoverrides.8: $(TOPDIR)/sbin/si_pushoverrides
+	pod2man --release=$(SYSTEMIMAGER_VERSION) -s 8 -c "SystemImager" $< $@
+
 %.5 %.8:	%.sgml %.content.sgml
 	docbook2man $<
 	mv $(shell echo $@ | tr '[:lower:]' '[:upper:]') $@

Copied: branches/3.9.x/patches/reiserfsprogs.10fix-include.patch (from rev 4106, trunk/patches/reiserfsprogs.10fix-include.patch)
===================================================================
--- branches/3.9.x/patches/reiserfsprogs.10fix-include.patch	                        (rev 0)
+++ branches/3.9.x/patches/reiserfsprogs.10fix-include.patch	2007-08-04 10:55:03 UTC (rev 4107)
@@ -0,0 +1,19 @@
+--- reiserfsprogs-3.6.19/include/reiserfs_fs.h	2004-09-16 09:49:05.000000000 +0200
++++ reiserfsprogs-3.6.19-systemimager/include/reiserfs_fs.h	2007-08-02 16:33:50.000000000 +0200
+@@ -38,14 +38,9 @@
+ # define extern_inline
+ #endif
+ 
+-#include <asm/unaligned.h>
+-
+ #ifndef get_unaligned
+-#if defined(__ppc__) || defined(ppc) || defined(__ppc) || \
+-    defined(__PPC) || defined(powerpc) || defined(__powerpc__)
+-#	define get_unaligned(ptr)	(*(ptr))
+-#	define put_unaligned(val,ptr)	((void)(*(ptr) = (val)))
+-#endif
++#define get_unaligned(ptr)	(*(ptr))
++#define put_unaligned(val,ptr)	((void)(*(ptr) = (val)))
+ #endif
+ 
+ #define get_leXX(xx,p,field)	(le##xx##_to_cpu ((p)->field))

Modified: branches/3.9.x/systemimager.spec
===================================================================
--- branches/3.9.x/systemimager.spec	2007-08-04 10:51:05 UTC (rev 4106)
+++ branches/3.9.x/systemimager.spec	2007-08-04 10:55:03 UTC (rev 4107)
@@ -334,6 +334,9 @@
 http://developer.osdl.org/kees/software/imagemanip/
 
 %changelog
+* Fri Aug 03 2007 Andrea Righi <a....@ci...>
+- Include missing manpages in the server package
+
 * Wed Aug 01 2007 Bernard Li <be...@va...>
 - Add support for ppc64-ps3/kboot
 - Include dir /etc/systemimager/kboot.cfg
@@ -911,13 +914,7 @@
 %prefix/lib/systemimager/perl/confedit
 %prefix/lib/systemimager/perl/BootMedia/*
 %prefix/share/man/man5/systemimager*
-%prefix/share/man/man8/si_addclients*
-%prefix/share/man/man8/si_cpimage*
-%prefix/share/man/man8/si_getimage*
-%prefix/share/man/man8/si_mk*
-%prefix/share/man/man8/si_mvimage*
-%prefix/share/man/man8/si_rmimage*
-%prefix/share/man/man8/si_pushupdate*
+%prefix/share/man/man8/si_*
 %prefix/share/systemimager/icons/*
 
 %files client