[Oval-commits] r197 - in trunk/oval-agent: . debian ovalHttpClient
Pavel Vinogradov
blaze-guest at alioth.debian.org
Thu Aug 23 14:57:54 UTC 2007
Author: blaze-guest
Date: 2007-08-23 14:57:53 +0000 (Thu, 23 Aug 2007)
New Revision: 197
Added:
trunk/oval-agent/README
trunk/oval-agent/debian/oval-agent.default
trunk/oval-agent/setup.py
Removed:
trunk/oval-agent/debian/README
trunk/oval-agent/debian/README.Debian
trunk/oval-agent/debian/oval-agent-default.ex
trunk/oval-agent/debian/oval-agent.doc-base.EX
Modified:
trunk/oval-agent/debian/rules
trunk/oval-agent/ovalHttpClient/__init__.py
Log:
Work on Debian stuff
Added: trunk/oval-agent/README
===================================================================
--- trunk/oval-agent/README (rev 0)
+++ trunk/oval-agent/README 2007-08-23 14:57:53 UTC (rev 197)
@@ -0,0 +1 @@
+Currently None
Deleted: trunk/oval-agent/debian/README
===================================================================
--- trunk/oval-agent/debian/README 2007-08-23 13:52:23 UTC (rev 196)
+++ trunk/oval-agent/debian/README 2007-08-23 14:57:53 UTC (rev 197)
@@ -1,6 +0,0 @@
-The Debian Package oval-agent
-----------------------------
-
-Comments regarding the Package
-
- -- Pavel Vinogradov <Pavel.Vinogradov at nixdev.net> Thu, 23 Aug 2007 17:37:09 +0500
Deleted: trunk/oval-agent/debian/README.Debian
===================================================================
--- trunk/oval-agent/debian/README.Debian 2007-08-23 13:52:23 UTC (rev 196)
+++ trunk/oval-agent/debian/README.Debian 2007-08-23 14:57:53 UTC (rev 197)
@@ -1,6 +0,0 @@
-oval-agent for Debian
----------------------
-
-<possible notes regarding this package - if none, delete this file>
-
- -- Pavel Vinogradov <Pavel.Vinogradov at nixdev.net> Thu, 23 Aug 2007 17:37:09 +0500
Deleted: trunk/oval-agent/debian/oval-agent-default.ex
===================================================================
--- trunk/oval-agent/debian/oval-agent-default.ex 2007-08-23 13:52:23 UTC (rev 196)
+++ trunk/oval-agent/debian/oval-agent-default.ex 2007-08-23 14:57:53 UTC (rev 197)
@@ -1,25 +0,0 @@
-# Defaults for oval-agent initscript
-# sourced by /etc/init.d/oval-agent
-# installed at /etc/default/oval-agent by the maintainer scripts
-
-#
-# This is a POSIX shell fragment
-#
-
-# Additional options that are passed to the Daemon.
-DAEMON_OPTS=""
-
-# Enable
-#
-# Whether to start the oval-agent in daemon mode from the init.d script.
-# The only allowed values are "true" and "false".
-#
-
-DEBTORRENT_ENABLE=true
-
-# Configuration File
-#
-# The configuration file to use.
-#
-
-DEBTORRENT_CONFIG_FILE=/etc/oval/oval-agent.conf
Copied: trunk/oval-agent/debian/oval-agent.default (from rev 196, trunk/oval-agent/debian/oval-agent-default.ex)
===================================================================
--- trunk/oval-agent/debian/oval-agent.default (rev 0)
+++ trunk/oval-agent/debian/oval-agent.default 2007-08-23 14:57:53 UTC (rev 197)
@@ -0,0 +1,25 @@
+# Defaults for oval-agent initscript
+# sourced by /etc/init.d/oval-agent
+# installed at /etc/default/oval-agent by the maintainer scripts
+
+#
+# This is a POSIX shell fragment
+#
+
+# Additional options that are passed to the Daemon.
+DAEMON_OPTS=""
+
+# Enable
+#
+# Whether to start the oval-agent in daemon mode from the init.d script.
+# The only allowed values are "true" and "false".
+#
+
+DEBTORRENT_ENABLE=true
+
+# Configuration File
+#
+# The configuration file to use.
+#
+
+DEBTORRENT_CONFIG_FILE=/etc/oval/oval-agent.conf
Deleted: trunk/oval-agent/debian/oval-agent.doc-base.EX
===================================================================
--- trunk/oval-agent/debian/oval-agent.doc-base.EX 2007-08-23 13:52:23 UTC (rev 196)
+++ trunk/oval-agent/debian/oval-agent.doc-base.EX 2007-08-23 14:57:53 UTC (rev 197)
@@ -1,22 +0,0 @@
-Document: oval-agent
-Title: Debian oval-agent Manual
-Author: <insert document author here>
-Abstract: This manual describes what oval-agent is
- and how it can be used to
- manage online manuals on Debian systems.
-Section: unknown
-
-Format: debiandoc-sgml
-Files: /usr/share/doc/oval-agent/oval-agent.sgml.gz
-
-Format: postscript
-Files: /usr/share/doc/oval-agent/oval-agent.ps.gz
-
-Format: text
-Files: /usr/share/doc/oval-agent/oval-agent.text.gz
-
-Format: HTML
-Index: /usr/share/doc/oval-agent/html/index.html
-Files: /usr/share/doc/oval-agent/html/*.html
-
-
Modified: trunk/oval-agent/debian/rules
===================================================================
--- trunk/oval-agent/debian/rules 2007-08-23 13:52:23 UTC (rev 196)
+++ trunk/oval-agent/debian/rules 2007-08-23 14:57:53 UTC (rev 197)
@@ -9,44 +9,24 @@
# 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+)*/')
-
-
-CFLAGS = -Wall -g
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
- CFLAGS += -O0
-else
- CFLAGS += -O2
-endif
-
-configure: configure-stamp
-configure-stamp:
- dh_testdir
- # Add here commands to configure the package.
-
- touch configure-stamp
-
-
build: build-stamp
-build-stamp: configure-stamp
+build-stamp:
dh_testdir
+ touch build_stamp
# Add here commands to compile the package.
- $(MAKE)
#docbook-to-man debian/oval-agent.sgml > oval-agent.1
- touch $@
+ #touch $@
clean:
dh_testdir
dh_testroot
- rm -f build-stamp configure-stamp
-
- # Add here commands to clean up after the build process.
- -$(MAKE) clean
-
+ rm -f build/ ovalHttpClient/*.pyc *.pyc
+ rm -f build-stamp
dh_clean
install: build
@@ -55,22 +35,19 @@
dh_clean -k
dh_installdirs
- # Add here commands to install the package into debian/oval-agent.
- $(MAKE) DESTDIR=$(CURDIR)/debian/oval-agent install
+ ./setup.py install --prefix=$(CURDIR)/debian/oval-agent/usr --install-lib=$(CURDIR)/debian/oval-agent/usr/share/python-support/oval-agent
+ # Remove the generated .pyc files
+ ( cd debian/oval-agent/usr/share/python-support/oval-agent && \
+ rm -rf *.pyc )
# Build architecture-independent files here.
binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
dh_testdir
dh_testroot
- dh_installchangelogs
dh_installdocs
dh_installexamples
-# dh_install
+ dh_installman
# dh_installmenu
# dh_installdebconf
# dh_installlogrotate
@@ -78,10 +55,14 @@
# dh_installpam
# dh_installmime
# dh_python
-# dh_installinit
# dh_installcron
# dh_installinfo
- dh_installman
+
+ for i in oval-agent; \
+ do mv debian/oval-agent/usr/bin/$$i.py debian/oval-agent/usr/bin/$$i; done
+ dh_installchangelogs --name=oval-agent
+ dh_installinit
+ dh_install
dh_link
dh_strip
dh_compress
@@ -94,5 +75,8 @@
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 configure
+.PHONY: build clean binary-indep binary-arch binary install
Modified: trunk/oval-agent/ovalHttpClient/__init__.py
===================================================================
--- trunk/oval-agent/ovalHttpClient/__init__.py 2007-08-23 13:52:23 UTC (rev 196)
+++ trunk/oval-agent/ovalHttpClient/__init__.py 2007-08-23 14:57:53 UTC (rev 197)
@@ -10,3 +10,4 @@
__all__ = ['ovalHttpClient']
__version__ = 0.5
+version = 0.2
Added: trunk/oval-agent/setup.py
===================================================================
--- trunk/oval-agent/setup.py (rev 0)
+++ trunk/oval-agent/setup.py 2007-08-23 14:57:53 UTC (rev 197)
@@ -0,0 +1,30 @@
+#!/usr/bin/env python
+#
+# Written by Pavel VInogradov
+# see LICENSE.txt for license information
+#
+
+"""The oval-agent program for interact with oval-server daemon.
+
+This program used to interact with oval-server deamon, download OVAL
+definitions, quering it and send reports back to server.
+
+"""
+
+import sys
+assert sys.version >= '2', "Install Python 2.0 or greater"
+from distutils.core import setup, Extension
+import ovalHttpClient
+
+setup(
+ name = "ovalHttpCLientt",
+ version = ovalHttpCLient.version,
+ author = "Pavel Vinogradov",
+ author_email = "<oval-devel at lists.alioth.debian.org>",
+ url = "http://oval.alioth.debian.org",
+ license = "GPL",
+
+ packages = ["ovalHttpClient", ],
+
+ scripts = ["oval-agent.py", ]
+ )
Property changes on: trunk/oval-agent/setup.py
___________________________________________________________________
Name: svn:executable
+ *
More information about the Oval-commits
mailing list