[Pkg-vsquare-changes] r50 - umview/trunk/debian

[Ludovico Gardenghi]

Author: garden-guest
Date: 2007-01-18 18:41:44 +0100 (Thu, 18 Jan 2007)
New Revision: 50

Added:
   umview/trunk/debian/umview.docs
Removed:
   umview/trunk/debian/docs
Modified:
   umview/trunk/debian/control
   umview/trunk/debian/rules
Log:
It's beginning to work (maybe)


Modified: umview/trunk/debian/control
===================================================================
--- umview/trunk/debian/control	2007-01-18 16:18:24 UTC (rev 49)
+++ umview/trunk/debian/control	2007-01-18 17:41:44 UTC (rev 50)
@@ -34,7 +34,7 @@
 
 Package: umview-dev
 Architecture: i386 amd64 powerpc ppc64
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, umview
 Description: UMView: View-OS in user space - Development files
  View-OS is a novel approach to the process/kernel interface.  The semantics of
  each system call can be assigned process by process giving the user the right
@@ -59,7 +59,7 @@
 
 Package: umview-mod-umlwip
 Architecture: i386 amd64 powerpc ppc64
-Depends: umview, ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: UMView: View-OS in user space - LWIPv6 gateway module
  View-OS is a novel approach to the process/kernel interface.  The semantics of
  each system call can be assigned process by process giving the user the right
@@ -84,7 +84,7 @@
 
 Package: umview-mod-umdevtap
 Architecture: i386 amd64 powerpc ppc64
-Depends: umview, ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: UMView: View-OS in user space - Virtual TUN/TAP module
  View-OS is a novel approach to the process/kernel interface.  The semantics of
  each system call can be assigned process by process giving the user the right
@@ -109,7 +109,7 @@
 
 Package: kernel-patch-umview
 Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${kpatch:Depends}
 Enhances: umview
 Description: UMView: View-OS in user space - Kernel patch for better performances
  View-OS is a novel approach to the process/kernel interface.  The semantics of

Deleted: umview/trunk/debian/docs
===================================================================
--- umview/trunk/debian/docs	2007-01-18 16:18:24 UTC (rev 49)
+++ umview/trunk/debian/docs	2007-01-18 17:41:44 UTC (rev 50)
@@ -1,5 +0,0 @@
-README
-amd64_porting.txt
-README.viewfs
-simple_tutorial
-umfuse-howto

Modified: umview/trunk/debian/rules
===================================================================
--- umview/trunk/debian/rules	2007-01-18 16:18:24 UTC (rev 49)
+++ umview/trunk/debian/rules	2007-01-18 17:41:44 UTC (rev 50)
@@ -22,7 +22,6 @@
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
 
-CFLAGS = -Wall -g
 
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
 	CFLAGS += -O0
@@ -33,7 +32,7 @@
 config.status: configure
 	dh_testdir
 	# Add here commands to configure the package.
-	./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --libexecdir=\$${prefix}/lib/umview --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs"
+	./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --libexecdir=\$${prefix}/lib/umview --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info
 
 
 #Architecture 
@@ -88,12 +87,14 @@
 	dh_testroot
 	dh_clean -k -s 
 	dh_installdirs -s
+	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
+	dh_install --sourcedir=debian/tmp -s
+	for package in $(CURDIR)/debian/umview-mod-*.install; do \
+		cat $$package | while read file; do \
+			rm -f $(CURDIR)/debian/umview/$$file; \
+		done; \
+    done
 
-	# Add here commands to install the arch part of the package into 
-	# debian/tmp.
-	$(MAKE) install DESTDIR=$(CURDIR)/debian/umview
-
-	dh_install -s
 # Must not depend on anything. This is to be called by
 # binary-arch/binary-indep
 # in another 'make' thread.
@@ -103,28 +104,19 @@
 	dh_installchangelogs 
 	dh_installdocs
 	dh_installexamples
-#	dh_installmenu
-#	dh_installdebconf	
-#	dh_installlogrotate	
-#	dh_installemacsen
-#	dh_installpam
-#	dh_installmime
-#	dh_python
-#	dh_installinit
-#	dh_installcron
-#	dh_installinfo
 	dh_installman
+	dh_installkpatches
 	dh_link
 	dh_strip
 	dh_compress 
 	dh_fixperms
-#	dh_perl
 	dh_makeshlibs
 	dh_installdeb
 	dh_shlibdeps
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb
+
 # Build architecture independant packages using the common target.
 binary-indep: build-indep install-indep
 	$(MAKE) -f debian/rules DH_OPTIONS=-i binary-common

Copied: umview/trunk/debian/umview.docs (from rev 49, umview/trunk/debian/docs)
===================================================================
--- umview/trunk/debian/docs	2007-01-18 16:18:24 UTC (rev 49)
+++ umview/trunk/debian/umview.docs	2007-01-18 17:41:44 UTC (rev 50)
@@ -0,0 +1,5 @@
+README
+doc/amd64_porting.txt
+doc/README.viewfs
+doc/simple_tutorial
+doc/umfuse-howto