[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 0a118627c2d38d14bc865fed141dd4f6cfbd8a2f
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Apr 3 22:17:32 2002 +0000

    	* acconfig.h: Remove a bunch of unused stuff.
    	* configure.in: Remove a bunch of unused stuff. Pass "" for the
    	strip flags rather than "-x" for debug case so we don't do
    	any stripping at all and have symbols.
    
    WebCore:
    
    	* src/Makefile.am: Don't strip at all if STRIP_FLAGS are empty.
    	* src/kwq/qt/qtextcodec.h: Remove stray undef.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@957 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 40cc354..1770ade 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,8 @@
+2002-04-03  Darin Adler  <darin at apple.com>
+
+	* src/Makefile.am: Don't strip at all if STRIP_FLAGS are empty.
+	* src/kwq/qt/qtextcodec.h: Remove stray undef.
+
 2002-04-03  Kenneth Kocienda  <kocienda at apple.com>
 
         Updated debugging log messages to use new varargs macros.
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 40cc354..1770ade 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,8 @@
+2002-04-03  Darin Adler  <darin at apple.com>
+
+	* src/Makefile.am: Don't strip at all if STRIP_FLAGS are empty.
+	* src/kwq/qt/qtextcodec.h: Remove stray undef.
+
 2002-04-03  Kenneth Kocienda  <kocienda at apple.com>
 
         Updated debugging log messages to use new varargs macros.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 40cc354..1770ade 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,8 @@
+2002-04-03  Darin Adler  <darin at apple.com>
+
+	* src/Makefile.am: Don't strip at all if STRIP_FLAGS are empty.
+	* src/kwq/qt/qtextcodec.h: Remove stray undef.
+
 2002-04-03  Kenneth Kocienda  <kocienda at apple.com>
 
         Updated debugging log messages to use new varargs macros.
diff --git a/WebCore/kwq/KWQTextCodec.h b/WebCore/kwq/KWQTextCodec.h
index e01edac..3eff4d9 100644
--- a/WebCore/kwq/KWQTextCodec.h
+++ b/WebCore/kwq/KWQTextCodec.h
@@ -33,7 +33,6 @@
 // USING_BORROWED_QSTRING ======================================================
 #ifdef USING_BORROWED_QSTRING
 
-#undef QT_NO_TEXTCODEC
 #include <_qtextcodec.h>
 
 #else
diff --git a/WebCore/kwq/qt/qtextcodec.h b/WebCore/kwq/qt/qtextcodec.h
index e01edac..3eff4d9 100644
--- a/WebCore/kwq/qt/qtextcodec.h
+++ b/WebCore/kwq/qt/qtextcodec.h
@@ -33,7 +33,6 @@
 // USING_BORROWED_QSTRING ======================================================
 #ifdef USING_BORROWED_QSTRING
 
-#undef QT_NO_TEXTCODEC
 #include <_qtextcodec.h>
 
 #else
diff --git a/WebCore/src/Makefile.am b/WebCore/src/Makefile.am
index d0aa79c..a79b4d4 100644
--- a/WebCore/src/Makefile.am
+++ b/WebCore/src/Makefile.am
@@ -32,7 +32,11 @@ libwebcorenmedited.dylib: libwebcoreunstripped.dylib libwebcore.exp
 	nmedit -s $(srcdir)/libwebcore.exp -o $@ - $<
 
 libwebcore.dylib: libwebcorenmedited.dylib
-	strip $(STRIP_FLAGS) -o $@ - $< 
+	if test -z "$(STRIP_FLAGS)"; then \
+	    ln -f $< $@; \
+	else \
+	    strip $(STRIP_FLAGS) -o $@ - $<; \
+	fi
 
 embed:
 	@if test -f "$(DYLIB_NAME)"; then \
diff --git a/WebCore/src/kwq/qt/qtextcodec.h b/WebCore/src/kwq/qt/qtextcodec.h
index e01edac..3eff4d9 100644
--- a/WebCore/src/kwq/qt/qtextcodec.h
+++ b/WebCore/src/kwq/qt/qtextcodec.h
@@ -33,7 +33,6 @@
 // USING_BORROWED_QSTRING ======================================================
 #ifdef USING_BORROWED_QSTRING
 
-#undef QT_NO_TEXTCODEC
 #include <_qtextcodec.h>
 
 #else

-- 
WebKit Debian packaging