This commit was manufactured by cvs2git to create branch 'unlabeled-1.35.2'.

Sprout from master 2004-11-10 10:11:42 UTC ankry <ankry@pld-linux.org> '- remove bogus locale, rel. 3'
Delete:
    amarok-sqlite3.patch
    kde-common-PLD.patch

diff --git a/amarok-sqlite3.patch b/amarok-sqlite3.patch
deleted file mode 100644 (file)
index 13345ed..0000000
--- a/amarok-sqlite3.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- amarok-1.1.1.orig/configure.in     2004-10-09 14:52:14.000000000 +0200
-+++ amarok-1.1.1/configure.in  2004-11-01 23:05:13.732752488 +0100
-@@ -441,7 +441,7 @@
- 
- if test x$included_sqlite = xno; then
-     if test x$PKGCONFIGFOUND = xyes; then
--        KDE_PKG_CHECK_MODULES(SQLITE, sqlite >= 2.8, have_sqlite=yes,have_sqlite=no)
-+        KDE_PKG_CHECK_MODULES(SQLITE, sqlite3 >= 3.0, have_sqlite=yes,have_sqlite=no)
- 
-         if test x$have_sqlite = xyes; then
-             ## AC_DEFINE(HAVE_SQLITE, 1, [have SQLite database library])
---- amarok-1.1.1.orig/amarok/configure.in.in   2004-10-09 14:52:09.000000000 +0200
-+++ amarok-1.1.1/amarok/configure.in.in        2004-11-01 23:50:27.301227376 +0100
-@@ -368,7 +368,7 @@
- 
- if test x$included_sqlite = xno; then
-     if test x$PKGCONFIGFOUND = xyes; then
--        KDE_PKG_CHECK_MODULES(SQLITE, sqlite >= 2.8, have_sqlite=yes,have_sqlite=no)
-+        KDE_PKG_CHECK_MODULES(SQLITE, sqlite3 >= 3.0, have_sqlite=yes,have_sqlite=no)
- 
-         if test x$have_sqlite = xyes; then
-             ## AC_DEFINE(HAVE_SQLITE, 1, [have SQLite database library])

diff --git a/kde-common-PLD.patch b/kde-common-PLD.patch
deleted file mode 100644 (file)
index 94a2df1..0000000
--- a/kde-common-PLD.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-Index: kde-common/admin/acinclude.m4.in
-===================================================================
-RCS file: /home/kde/kde-common/admin/acinclude.m4.in,v
-retrieving revision 2.455
-diff -u -p -r2.455 acinclude.m4.in
---- kde-common/admin/acinclude.m4.in   12 May 2004 08:09:31 -0000      2.455
-+++ kde-common/admin/acinclude.m4.in   3 Jun 2004 10:52:36 -0000
-@@ -428,7 +428,7 @@ AC_DEFUN([KDE_SET_DEFAULT_PATHS],
- if test "$1" = "default"; then
- 
-   if test -z "$kde_htmldir"; then
--    kde_htmldir='\${datadir}/doc/HTML'
-+    kde_htmldir='/usr/share/doc/kde/HTML'
-   fi
-   if test -z "$kde_appsdir"; then
-     kde_appsdir='\${datadir}/applnk'
-@@ -4276,32 +4276,11 @@ AC_DEFUN([AC_CHECK_UTMP_FILE],
- [
-     AC_MSG_CHECKING([for utmp file])
- 
--    AC_CACHE_VAL(kde_cv_utmp_file,
--    [
--    kde_cv_utmp_file=no
--
--    for ac_file in    \
--                      \
--      /var/run/utmp \
--      /var/adm/utmp \
--      /etc/utmp     \
--     ; \
--    do
--     if test -r "$ac_file"; then
--       kde_cv_utmp_file=$ac_file
--       break
--     fi
--    done
--    ])
-+    AC_CACHE_VAL(kde_cv_utmp_file, [kde_cv_utmp_file=/var/run/utmpx])
- 
--    if test "$kde_cv_utmp_file" != "no"; then
--      AC_DEFINE_UNQUOTED(UTMP, "$kde_cv_utmp_file", [Define the file for utmp entries])
--      $1
--      AC_MSG_RESULT($kde_cv_utmp_file)
--    else
--      $2
--      AC_MSG_RESULT([non found])
--    fi
-+    AC_DEFINE_UNQUOTED(UTMP, "$kde_cv_utmp_file", [Define the file for utmp entries])
-+    $1
-+    AC_MSG_RESULT(We are using $kde_cv_utmp_file in PLD instead.)
- ])
- 
- 
-@@ -5078,7 +5057,7 @@ if test "${with_qt_dir+set}" = set; then
-   kde_qtdir="$with_qt_dir"
- fi
- 
--AC_FIND_FILE(qsql.html, [ $kde_qtdir/doc/html $QTDIR/doc/html /usr/share/doc/packages/qt3/html /usr/lib/qt/doc /usr/lib/qt3/doc /usr/lib/qt3/doc/html /usr/doc/qt3/html /usr/doc/qt3 /usr/share/doc/qt3-doc /usr/share/qt3/doc/html /usr/X11R6/share/doc/qt/html ], QTDOCDIR)
-+AC_FIND_FILE(qsql.html, [ /usr/share/doc/qt-doc/html ], QTDOCDIR)
- AC_MSG_RESULT($QTDOCDIR)
- 
- AC_SUBST(QTDOCDIR)