[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[darin]

The following commit has been merged in the debian/unstable branch:
commit c10c2f296a7e9fff14c6d9296631d3634ca9b39e
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Mar 23 00:31:57 2002 +0000

            * src/kdelibs/khtml/java/Makefile.am:
            * src/kdelibs/khtml/java/tests/.cvsignore:
            * src/kdelibs/khtml/java/tests/Makefile.am:
            Remove empty test subdirectory.
    
            * src/kdelibs/kjs/.cvsignore: Ignore kjs-test output.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@820 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 3368f17..d0512c5 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,12 @@
+2002-03-22  Darin Adler  <darin at apple.com>
+
+	* src/kdelibs/khtml/java/Makefile.am:
+	* src/kdelibs/khtml/java/tests/.cvsignore:
+	* src/kdelibs/khtml/java/tests/Makefile.am:
+	Remove empty test subdirectory.
+
+	* src/kdelibs/kjs/.cvsignore: Ignore kjs-test output.
+
 2002-03-22  Maciej Stachowiak  <mjs at apple.com>
 
 	Fix some things that were making automake complain.
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 3368f17..d0512c5 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,12 @@
+2002-03-22  Darin Adler  <darin at apple.com>
+
+	* src/kdelibs/khtml/java/Makefile.am:
+	* src/kdelibs/khtml/java/tests/.cvsignore:
+	* src/kdelibs/khtml/java/tests/Makefile.am:
+	Remove empty test subdirectory.
+
+	* src/kdelibs/kjs/.cvsignore: Ignore kjs-test output.
+
 2002-03-22  Maciej Stachowiak  <mjs at apple.com>
 
 	Fix some things that were making automake complain.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 3368f17..d0512c5 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,12 @@
+2002-03-22  Darin Adler  <darin at apple.com>
+
+	* src/kdelibs/khtml/java/Makefile.am:
+	* src/kdelibs/khtml/java/tests/.cvsignore:
+	* src/kdelibs/khtml/java/tests/Makefile.am:
+	Remove empty test subdirectory.
+
+	* src/kdelibs/kjs/.cvsignore: Ignore kjs-test output.
+
 2002-03-22  Maciej Stachowiak  <mjs at apple.com>
 
 	Fix some things that were making automake complain.
diff --git a/WebCore/khtml/java/Makefile.am b/WebCore/khtml/java/Makefile.am
index 4e0a9f8..d7e2979 100644
--- a/WebCore/khtml/java/Makefile.am
+++ b/WebCore/khtml/java/Makefile.am
@@ -1,7 +1,5 @@
 NULL = 
 
-SUBDIRS = . tests
-
 noinst_LIBRARIES = libkhtmljava.o
 LDFLAGS = -Wl,-r -nostdlib
 libkhtmljava_o_AR = $(OBJCXXLD) $(AM_OBJCXXFLAGS) $(OBJCXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o
diff --git a/WebCore/khtml/java/tests/.cvsignore b/WebCore/khtml/java/tests/.cvsignore
deleted file mode 100644
index a1e3c6f..0000000
--- a/WebCore/khtml/java/tests/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-Makefile.in
-Makefile
-testserver
-testprocess
diff --git a/WebCore/khtml/java/tests/Makefile.am b/WebCore/khtml/java/tests/Makefile.am
deleted file mode 100644
index b31453e..0000000
--- a/WebCore/khtml/java/tests/Makefile.am
+++ /dev/null
@@ -1,13 +0,0 @@
-
-# FIXME: currently commented out because this would require kwq
-
-# INCLUDES = -I$(top_srcdir)/khtml/java/ $(all_includes)
-# LDADD = $(LIB_QT) $(LIB_KDECORE) ../libkjava.la 
-#
-# check_PROGRAMS = testserver 
-#
-# testserver_SOURCES = testkjavaappletserver.cpp
-#
-# METASOURCES = AUTO
-
-
diff --git a/WebCore/src/kdelibs/khtml/java/Makefile.am b/WebCore/src/kdelibs/khtml/java/Makefile.am
index 4e0a9f8..d7e2979 100644
--- a/WebCore/src/kdelibs/khtml/java/Makefile.am
+++ b/WebCore/src/kdelibs/khtml/java/Makefile.am
@@ -1,7 +1,5 @@
 NULL = 
 
-SUBDIRS = . tests
-
 noinst_LIBRARIES = libkhtmljava.o
 LDFLAGS = -Wl,-r -nostdlib
 libkhtmljava_o_AR = $(OBJCXXLD) $(AM_OBJCXXFLAGS) $(OBJCXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o
diff --git a/WebCore/src/kdelibs/khtml/java/tests/.cvsignore b/WebCore/src/kdelibs/khtml/java/tests/.cvsignore
deleted file mode 100644
index a1e3c6f..0000000
--- a/WebCore/src/kdelibs/khtml/java/tests/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-Makefile.in
-Makefile
-testserver
-testprocess
diff --git a/WebCore/src/kdelibs/khtml/java/tests/Makefile.am b/WebCore/src/kdelibs/khtml/java/tests/Makefile.am
deleted file mode 100644
index b31453e..0000000
--- a/WebCore/src/kdelibs/khtml/java/tests/Makefile.am
+++ /dev/null
@@ -1,13 +0,0 @@
-
-# FIXME: currently commented out because this would require kwq
-
-# INCLUDES = -I$(top_srcdir)/khtml/java/ $(all_includes)
-# LDADD = $(LIB_QT) $(LIB_KDECORE) ../libkjava.la 
-#
-# check_PROGRAMS = testserver 
-#
-# testserver_SOURCES = testkjavaappletserver.cpp
-#
-# METASOURCES = AUTO
-
-
diff --git a/WebCore/src/kdelibs/kjs/.cvsignore b/WebCore/src/kdelibs/kjs/.cvsignore
index 21d3f4c..218f94f 100644
--- a/WebCore/src/kdelibs/kjs/.cvsignore
+++ b/WebCore/src/kdelibs/kjs/.cvsignore
@@ -10,3 +10,5 @@ grammar.h
 *.la
 .libs
 *.lut.h
+kjs-test.diff
+kjs-test.out

-- 
WebKit Debian packaging