[Oval-commits] r315 - trunk/ovalint/debian/patches

[Pavel Vinogradov]

Author: blaze-guest
Date: 2008-01-23 19:40:03 +0000 (Wed, 23 Jan 2008)
New Revision: 315

Removed:
   trunk/ovalint/debian/patches/debian.makefile.patch
Modified:
   trunk/ovalint/debian/patches/series
Log:
Remove makefile patch. Now integrated upstream

Deleted: trunk/ovalint/debian/patches/debian.makefile.patch
===================================================================
--- trunk/ovalint/debian/patches/debian.makefile.patch	2008-01-23 19:34:25 UTC (rev 314)
+++ trunk/ovalint/debian/patches/debian.makefile.patch	2008-01-23 19:40:03 UTC (rev 315)
@@ -1,97 +0,0 @@
-diff -urN oval-ref/project/linux/Makefile oval-debian/project/linux/Makefile
---- oval-ref/project/linux/Makefile	2007-08-07 23:08:09.000000000 +0200
-+++ oval-deb/project/linux/Makefile	2007-08-07 23:15:47.000000000 +0200
-@@ -54,10 +54,26 @@
- LIBDIR = -L/usr/lib
- 
- # What libraries do we need?
--LIBS = -lxerces-c -lxalan-c -lpcre -lrpm -lrpmdb -lrpmio -lpopt -lapt-pkg
-+LIBS = -lxerces-c -lxalan-c -lpcre -lpopt
- 
- # Determine what platform the source is being build on
- PLATFORM = $(shell uname)
-+# Determine which distribution we are in
-+# NOTE: could be abstracted to dpkg vs. rpm binaries being
-+# available, as the DPKG or RPM probes could be used for
-+# other distributions (RPM for SuSE or Mandrake, DPKG for
-+# Ubuntu)
-+DISTRIBUTION = $(shell if test  -e /etc/debian_version ; then echo DEBIAN; elif test -e /etc/redhat_release ; then echo REDHAT; else echo NO_DISTRIBUTION; fi)
-+# Alternative (binary-based), note that both DPKG and RPM are 
-+# mutually exclusive here:
-+#PACKAGE_FORMAT = $(shell if test  -e /usr/bin/dpkg ; then echo DPKG; elif test -e /usr/bin/rpm ; then echo RPM; else echo NO_LINUX_PACKAGE; fi)
-+
-+ifeq ($(DISTRIBUTION), REDHAT)
-+	LIBS += -lrpm -lrpmdb -lrpmio 
-+endif
-+ifeq ($(DISTRIBUTION), DEBIAN)
-+	LIBS += -lapt-pkg
-+endif
- 
- # What object code are we expecting?
- OBJS = \
-@@ -131,8 +148,6 @@
- 	FileProbe.obj \
- 	InetListeningServersProbe.obj \
- 	ProcessProbe.obj \
--	RPMInfoProbe.obj \
--	DPKGInfoProbe.obj \
- 	UnameProbe.obj \
- 	TextFileContentProbe.obj \
- 	XmlFileContentProbe.obj \
-@@ -142,6 +157,13 @@
- 	FileHashProbe.obj \
- 	VariableProbe.obj \
- 
-+ifeq ($(DISTRIBUTION), REDHAT)
-+	OBJS += RPMInfoProbe.obj
-+endif
-+ifeq ($(DISTRIBUTION), DEBIAN)
-+	OBJS += DPKGInfoProbe.obj
-+endif
-+
- REL_OBJS = \
- 	$(BUILDDIR)/Main.obj \
- 	$(BUILDDIR)/AbsComponent.obj \
-@@ -213,8 +235,6 @@
- 	$(BUILDDIR)/FileProbe.obj \
- 	$(BUILDDIR)/InetListeningServersProbe.obj \
- 	$(BUILDDIR)/ProcessProbe.obj \
--	$(BUILDDIR)/RPMInfoProbe.obj \
--	$(BUILDDIR)/DPKGInfoProbe.obj \
- 	$(BUILDDIR)/UnameProbe.obj \
- 	$(BUILDDIR)/TextFileContentProbe.obj \
- 	$(BUILDDIR)/XmlFileContentProbe.obj \
-@@ -224,6 +244,13 @@
- 	$(BUILDDIR)/FileHashProbe.obj \
- 	$(BUILDDIR)/VariableProbe.obj \
- 
-+ifeq ($(DISTRIBUTION), REDHAT)
-+	REL_OBJS += $(BUILDDIR)/RPMInfoProbe.obj
-+endif
-+ifeq ($(DISTRIBUTION), DEBIAN)
-+	REL_OBJS += $(BUILDDIR)/DPKGInfoProbe.obj
-+endif
-+
- # Search the output directory for object files
- vpath %.obj $(BUILDDIR)
- vpath %.cpp $(SRCDIR)
-@@ -241,7 +268,7 @@
- .SUFFIXES: .cpp .obj
- 
- .cpp.obj:
--	$(CXX) -c $(CPPFLAGS) -D$(PLATFORM) $(INCDIRS) -o $(BUILDDIR)/$@ $^
-+	$(CXX) -c $(CPPFLAGS) -D$(PLATFORM) -D$(DISTRIBUTION) $(INCDIRS) -o $(BUILDDIR)/$@ $^
- 
- # *******************************************************************
- #                            Rules
-@@ -251,6 +278,10 @@
- 
- set-platform:
- 	@if [ $(PLATFORM) = Linux ]; then \
-+		if [ $(DISTRIBUTION) = NO_DISTRIBUTION ]; then \
-+			echo "Unknown distribution. Exiting"; \
-+			exit 1; \
-+		fi; \
- 		make linux; \
- 	fi;
- 
\ No newline at end of file

Modified: trunk/ovalint/debian/patches/series
===================================================================
--- trunk/ovalint/debian/patches/series	2008-01-23 19:34:25 UTC (rev 314)
+++ trunk/ovalint/debian/patches/series	2008-01-23 19:40:03 UTC (rev 315)
@@ -4,4 +4,3 @@
 oval.probefactory.patch
 debian.manpage.patch
 debian.xsddir.patch
-debian.makefile.patch