[Oval-commits] r388 - in trunk/oval-infrastructure: debian debian.agent

[Pavel Vinogradov]

Author: blaze-guest
Date: 2008-10-02 18:33:54 +0000 (Thu, 02 Oct 2008)
New Revision: 388

Added:
   trunk/oval-infrastructure/debian/rules
Removed:
   trunk/oval-infrastructure/debian.agent/rules
Log:
Try to merge rules files

Copied: trunk/oval-infrastructure/debian/rules (from rev 383, trunk/oval-infrastructure/debian.agent/rules)
===================================================================
--- trunk/oval-infrastructure/debian/rules	                        (rev 0)
+++ trunk/oval-infrastructure/debian/rules	2008-10-02 18:33:54 UTC (rev 388)
@@ -0,0 +1,80 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+# Sample debian/rules that uses debhelper.
+# This file was originally written by Joey Hess and Craig Small.
+# As a special exception, when this file is copied by dh-make into a
+# dh-make output file, you may use that output file without restriction.
+# This special exception was added by Craig Small in version 0.37 of dh-make.
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+PYTHON_VERSION=$(shell /usr/bin/python -V 2>&1 | /usr/bin/perl -le 'print "$$1.$$2" if <> =~m/^Python\s+(\d+)\.(\d+)(\.\d+)*/')
+
+PREFIX := debian/oval-agent/usr
+
+build: build-stamp
+
+build-stamp:  
+	dh_testdir
+	touch build_stamp
+
+	# Add here commands to compile the package.
+	#docbook-to-man debian/oval-agent.sgml > oval-agent.1
+
+	#touch $@
+
+clean:
+	dh_testdir
+	dh_testroot
+	rm -rf build/ ovalClient/*.pyc *.pyc oval/*.pyc oval/dba/*.pyc oval/dsa2oval/*.pyc oval/dsa2oval/definition/*.pyc \
+		oval/dsa2oval/parser/*.pyc oval/dsaSync/*.pyc oval/server/*.pyc *.pyc
+	rm -f build_stamp
+	dh_clean 
+
+install: build
+	dh_testdir
+	dh_testroot
+	dh_clean -k 
+	dh_installdirs
+
+	./setup.py install --no-compile \
+	    --prefix=$(PREFIX) \
+	    --install-lib=$(PREFIX)/share/oval-agent
+
+# Build architecture-independent files here.
+binary-indep: build install
+	dh_testdir
+	dh_testroot
+	dh_installdocs
+	dh_installexamples
+	dh_installman debian/oval-agent.1 debian/oval-server.1 debian/oval-monitor.1 debian/dsa2oval.1
+#	dh_installmenu
+#	dh_installdebconf	
+#	dh_installlogrotate
+	dh_pysupport
+	dh_python
+#	dh_installcron
+#	dh_installinfo
+	
+	for i in oval-agent oval-server dsa2oval oval-monitor; \
+		do mv debian/oval-agent/usr/bin/$$i.py debian/oval-agent/usr/bin/$$i; done
+	dh_installchangelogs 
+	dh_install
+	dh_link
+#	dh_strip
+	dh_compress
+	dh_fixperms
+	dh_installinit --name=oval-agent 
+#	dh_makeshlibs
+	dh_installdeb
+	dh_shlibdeps
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
+# Build architecture-dependent files here.
+binary-arch: build install
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install


Property changes on: trunk/oval-infrastructure/debian/rules
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:mergeinfo
   + 

Deleted: trunk/oval-infrastructure/debian.agent/rules
===================================================================
--- trunk/oval-infrastructure/debian.agent/rules	2008-10-02 18:27:15 UTC (rev 387)
+++ trunk/oval-infrastructure/debian.agent/rules	2008-10-02 18:33:54 UTC (rev 388)
@@ -1,79 +0,0 @@
-#!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-PYTHON_VERSION=$(shell /usr/bin/python -V 2>&1 | /usr/bin/perl -le 'print "$$1.$$2" if <> =~m/^Python\s+(\d+)\.(\d+)(\.\d+)*/')
-
-PREFIX := debian/oval-agent/usr
-
-build: build-stamp
-
-build-stamp:  
-	dh_testdir
-	touch build_stamp
-
-	# Add here commands to compile the package.
-	#docbook-to-man debian/oval-agent.sgml > oval-agent.1
-
-	#touch $@
-
-clean:
-	dh_testdir
-	dh_testroot
-	rm -rf build/ ovalClient/*.pyc *.pyc
-	rm -f build_stamp
-	dh_clean 
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k 
-	dh_installdirs
-
-	./setup.py install --no-compile \
-	    --prefix=$(PREFIX) \
-	    --install-lib=$(PREFIX)/share/oval-agent
-
-# Build architecture-independent files here.
-binary-indep: build install
-	dh_testdir
-	dh_testroot
-	dh_installdocs
-	dh_installexamples
-	dh_installman oval-agent.1
-#	dh_installmenu
-#	dh_installdebconf	
-#	dh_installlogrotate
-	dh_pysupport
-#	dh_python
-#	dh_installcron
-#	dh_installinfo
-	
-	for i in oval-agent; \
-		do mv debian/oval-agent/usr/bin/$$i.py debian/oval-agent/usr/bin/$$i; done
-	dh_installchangelogs 
-	dh_install
-	dh_link
-#	dh_strip
-	dh_compress
-	dh_fixperms
-	dh_installinit --name=oval-agent
-#	dh_makeshlibs
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-# Build architecture-dependent files here.
-binary-arch: build install
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install