[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

CVS:oo-deb/debian rules,1.214.2.7,1.214.2.8



Update of /cvs/debian-openoffice/oo-deb/debian
In directory gluck:/tmp/cvs-serv8337

Modified Files:
      Tag: OPENOFFICE_ORG_1_1_2
	rules 
Log Message:
we don't need the version check for libdb in the Java case anymore

Index: rules
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/rules,v
retrieving revision 1.214.2.7
retrieving revision 1.214.2.8
diff -u -d -r1.214.2.7 -r1.214.2.8
--- rules	16 Jun 2004 15:50:25 -0000	1.214.2.7
+++ rules	16 Jun 2004 18:19:30 -0000	1.214.2.8
@@ -632,16 +632,9 @@
 endif
 
 ifeq "$(USE_SYSTEM_DB)" "y"
-	if [ "`echo $(D) | cut -d'.' -f1`" = "3" ] \
-	  || [ "`echo $(D) | cut -d'.' -f1`" = "4" -a \
-		"`echo $(D) | cut -d'.' -f2`" = "0" ]; then \
-	  echo "You need at least libdb 4.1 for Java builds since only there"; \
-	  echo "the db Java bindings are packaged."; \
-	  echo "You then need the libdbX.Y-java pkg."; \
-	  exit 1; \
-	else \
-	  test -r $(LIBDB_JAR); \
-	fi
+	# We need the db java bindings for Java builds.
+	# If this test fails you need to install libdb$(D)-java
+	test -r $(LIBDB_JAR)
 endif
 
 ifeq "$(ARCH)" "powerpc"



Reply to: