[Pkg-xen-changes] r30 - trunk/debian

[Ralph Passgang]

Author: tha-guest
Date: 2006-02-20 13:35:36 +0000 (Mon, 20 Feb 2006)
New Revision: 30

Modified:
   trunk/debian/control
   trunk/debian/rules
Log:
- removed useless build-depends: libncurses5-dev from control
- removed not needed variables from the beginning of our rules file
- moved all make calls that actually build something to the build section
  (I know this also installs the files, but this is better then the old
  solution we used till now. But probably there is another & better solution)
- fixed the last "chown"-line and removed old lines that were commented out


Modified: trunk/debian/control
===================================================================
--- trunk/debian/control	2006-02-20 12:36:03 UTC (rev 29)
+++ trunk/debian/control	2006-02-20 13:35:36 UTC (rev 30)
@@ -4,7 +4,7 @@
 Section: misc
 Priority: extra
 Standards-Version: 3.6.1.0
-Build-Depends: tetex-bin, tetex-extra, gs-common, debhelper (>= 4), libcurl3-dev | libcurl-dev, dh-kpatches, python-dev, python (>= 2.2), transfig, libncurses5-dev, libsdl1.2-dev, libvncserver-dev, libjpeg-dev, bzip2, hotplug, bcc, dpatch
+Build-Depends: tetex-bin, tetex-extra, gs-common, debhelper (>= 4), libcurl3-dev | libcurl-dev, dh-kpatches, python-dev, python (>= 2.2), transfig, libsdl1.2-dev, libvncserver-dev, libjpeg-dev, bzip2, hotplug, bcc, dpatch
 
 Package: xen
 Section: misc

Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules	2006-02-20 12:36:03 UTC (rev 29)
+++ trunk/debian/rules	2006-02-20 13:35:36 UTC (rev 30)
@@ -1,19 +1,16 @@
 #!/usr/bin/make -f
 
 CC		:= gcc
-KERNELS		:=
-LINUX_VERSIONS	:= 2.6.12
-ALLSPARSETREES	:= $(patsubst %,linux-%,$(LINUX_VERSIONS))
 #DH_VERBOSE	:= -v
 
-export KERNELS ALLSPARSETREES DH_VERBOSE
-export CC
-
 DEB_VERSION	:= $(shell dpkg-parsechangelog | sed -n 's/^Version: //p')
 DEB_REVISION	:= $(shell echo "$(DEB_VERSION)" | sed 's/.*-//')
 UP_VERSION	:= $(shell echo "$(DEB_VERSION)" | sed 's/-[^-]*$$//')
 DEB_BUILD_ARCH  := $(shell dpkg-architecture -qDEB_BUILD_ARCH)
 
+export DH_VERBOSE
+export CC
+
 include /usr/share/dpatch/dpatch.make
 
 clean: really-clean unpatch
@@ -28,30 +25,25 @@
 debian/stamps/build:
 	mkdir -p $(@D)
 	rm -rf debian/install
-	$(MAKE) all DESTDIR=$(CURDIR)/debian/install KERNELS= GCC=$(CC) CC=$(CC) HOSTCC=$(CC)
-	touch $@
-
-install: debian/stamps/build
-	rm -rf debian/install
 	$(MAKE) dist DESTDIR=$(CURDIR)/debian/install KERNELS= XEN_PYTHON_NATIVE_INSTALL=1 CC=$(CC) GCC=$(CC) HOSTCC=$(CC)
 ifeq ($(DEB_BUILD_ARCH),i386)
 	$(MAKE) mrproper
 	$(MAKE) xen DESTDIR=$(CURDIR)/debian/install KERNELS= GCC=$(CC) CC=$(CC) HOSTCC=$(CC) XEN_TARGET_X86_PAE=y TARGET=$(CURDIR)/xen/xen_pae
 endif
+	touch $@
+
+install: debian/stamps/build
 	$(MAKE) -C tools/examples install-udev DESTDIR=$(CURDIR)/debian/install
 	find $(CURDIR)/debian/install -name '*.pyc' | xargs rm
-	mkdir -p debian/install/etc/xen/sv debian/install/etc/xen/xend/server
+	mkdir -p debian/install/etc/xen/xend/server
 	mv debian/install/usr/lib/python2.3/site-packages/xen/xend/server/params.py debian/install/etc/xen/xend/params.py
 	ln -s /etc/xen/xend/params.py debian/install/usr/lib/python2.3/site-packages/xen/xend/server/params.py
-#	mv debian/install/usr/lib/python2.3/site-packages/xen/sv/params.py  debian/install/etc/xen/sv/params.py
-#	ln -s /etc/xen/sv/params.py debian/install/usr/lib/python2.3/site-packages/xen/sv/params.py
 	mkdir -p debian/install/usr/share/doc/xen/examples
 	mv debian/install/etc/xen/xmexample* debian/install/usr/share/doc/xen/examples
 	chmod +x \
 		debian/install/usr/lib/python2.3/site-packages/xen/xend/XendClient.py \
 		debian/install/usr/lib/python2.3/site-packages/xen/xend/server/SrvServer.py \
-		debian/install/usr/lib/python2.3/site-packages/xen/xend/sxp.py \
-#		debian/install/usr/lib/python2.3/site-packages/xen/util/console_client.py
+		debian/install/usr/lib/python2.3/site-packages/xen/xend/sxp.py
 
 binary: install
 	@echo "DEB_VERSION='$(DEB_VERSION)' DEB_REVISION='$(DEB_REVISION)' UP_VERSION='$(UP_VERSION)' DEB_BUILD_ARCH='$(DEB_BUILD_ARCH)'"