[Oval-commits] r351 - trunk/ovaldi/debian/patches

[Pavel Vinogradov]

Author: blaze-guest
Date: 2008-04-20 15:55:28 +0000 (Sun, 20 Apr 2008)
New Revision: 351

Modified:
   trunk/ovaldi/debian/patches/debian.makefile.patch
Log:
Update debian.makefile.patch

Modified: trunk/ovaldi/debian/patches/debian.makefile.patch
===================================================================
--- trunk/ovaldi/debian/patches/debian.makefile.patch	2008-04-20 15:43:44 UTC (rev 350)
+++ trunk/ovaldi/debian/patches/debian.makefile.patch	2008-04-20 15:55:28 UTC (rev 351)
@@ -1,51 +1,51 @@
-diff -urN ovaldi.mitre/project/linux/Makefile ovaldi.debian/project/linux/Makefile
---- ovaldi.mitre/project/linux/Makefile	2008-04-20 20:16:34.000000000 +0500
-+++ ovaldi.debian/project/linux/Makefile	2008-04-20 20:33:39.000000000 +0500
-@@ -64,13 +64,13 @@
+diff -urN ovaldi-mitre/project/linux/Makefile ovaldi-debian/project/linux/Makefile
+--- ovaldi-mitre/project/linux/Makefile	2008-04-20 19:12:24.000000000 +0500
++++ ovaldi-debian/project/linux/Makefile	2008-04-20 20:55:50.000000000 +0500
+@@ -64,13 +64,14 @@
  PACKAGE_DPKG = $(shell /usr/bin/env dpkg --version 2>/dev/null)
  PACKAGE_MANAGERS = 
  
--ifneq (${PACKAGE_RPM}, )
--	LIBS += -lrpm -lrpmdb -lrpmio
--	PACKAGE_MANAGERS += -DPACKAGE_RPM
--endif
- ifneq (${PACKAGE_DPKG}, )
- 	LIBS += -lapt-pkg
- 	PACKAGE_MANAGERS += -DPACKAGE_DPKG
++ifneq (${PACKAGE_DPKG}, )
++	LIBS += -lapt-pkg
++	PACKAGE_MANAGERS += -DPACKAGE_DPKG
 +else
-+ifneq (${PACKAGE_RPM}, )
-+	LIBS += -lrpm -lrpmdb -lrpmio
-+	PACKAGE_MANAGERS += -DPACKAGE_RPM
+ ifneq (${PACKAGE_RPM}, )
+ 	LIBS += -lrpm -lrpmdb -lrpmio
+ 	PACKAGE_MANAGERS += -DPACKAGE_RPM
  endif
+-ifneq (${PACKAGE_DPKG}, )
+-	LIBS += -lapt-pkg
+-	PACKAGE_MANAGERS += -DPACKAGE_DPKG
+ endif
  
  # What object code are we expecting?
-@@ -155,11 +155,11 @@
+@@ -155,11 +156,12 @@
  	FileHashProbe.obj \
  	VariableProbe.obj \
  
--ifneq (${PACKAGE_RPM}, )
--	OBJS += RPMInfoProbe.obj
--endif
- ifneq (${PACKAGE_DPKG}, )
- 	OBJS += DPKGInfoProbe.obj
++ifneq (${PACKAGE_DPKG}, )
++	OBJS += DPKGInfoProbe.obj
 +else
-+ifneq (${PACKAGE_RPM}, )
-+	OBJS += RPMInfoProbe.obj
+ ifneq (${PACKAGE_RPM}, )
+ 	OBJS += RPMInfoProbe.obj
  endif
+-ifneq (${PACKAGE_DPKG}, )
+-	OBJS += DPKGInfoProbe.obj
+ endif
  
  REL_OBJS = \
-@@ -243,11 +243,11 @@
+@@ -243,11 +245,12 @@
  	$(BUILDDIR)/FileHashProbe.obj \
  	$(BUILDDIR)/VariableProbe.obj \
  
--ifneq (${PACKAGE_RPM}, )
--	REL_OBJS += $(BUILDDIR)/RPMInfoProbe.obj
--endif
- ifneq (${PACKAGE_DPKG}, )
- 	REL_OBJS += $(BUILDDIR)/DPKGInfoProbe.obj
++ifneq (${PACKAGE_DPKG}, )
++	REL_OBJS += $(BUILDDIR)/DPKGInfoProbe.obj
 +else
-+ifneq (${PACKAGE_RPM}, )
-+	REL_OBJS += $(BUILDDIR)/RPMInfoProbe.obj
+ ifneq (${PACKAGE_RPM}, )
+ 	REL_OBJS += $(BUILDDIR)/RPMInfoProbe.obj
  endif
+-ifneq (${PACKAGE_DPKG}, )
+-	REL_OBJS += $(BUILDDIR)/DPKGInfoProbe.obj
+ endif
  
  # Search the output directory for object files