DEB: adjusted to new 'core' folder for main packages.

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

5 files changed, 121 insertions, 0 deletions

diff --git a/dilos/core/tdeadmin/debian/patches/common/04_am_maintainer_mode.diff b/dilos/core/tdeadmin/debian/patches/common/04_am_maintainer_mode.diff
new file mode 100644
index 000000000..391a80285
--- /dev/null
+++ b/dilos/core/tdeadmin/debian/patches/common/04_am_maintainer_mode.diff
@@ -0,0 +1,11 @@
+--- a/admin/configure.in.min
++++ b/admin/configure.in.min
+@@ -38,6 +38,8 @@
+ dnl Automake doc recommends to do this only here. (Janos)
+ AM_INIT_AUTOMAKE(@MODULENAME@, @VERSION@) dnl searches for some needed programs
+ 
++AM_MAINTAINER_MODE
++
+ KDE_SET_PREFIX
+ 
+ dnl generate the config header
diff --git a/dilos/core/tdeadmin/debian/patches/common/06_disable_no_undefined.diff b/dilos/core/tdeadmin/debian/patches/common/06_disable_no_undefined.diff
new file mode 100644
index 000000000..05c932c3c
--- /dev/null
+++ b/dilos/core/tdeadmin/debian/patches/common/06_disable_no_undefined.diff
@@ -0,0 +1,18 @@
+--- a/admin/acinclude.m4.in
++++ b/admin/acinclude.m4.in
+@@ -1689,15 +1689,6 @@
+        KDE_USE_CLOSURE_TRUE="#"
+        KDE_USE_CLOSURE_FALSE=""
+        KDE_NO_UNDEFINED=""
+-       case $host in 
+-         *-*-linux-gnu)
+-           KDE_CHECK_COMPILER_FLAG([Wl,--no-undefined],
+-                [KDE_CHECK_COMPILER_FLAG([Wl,--allow-shlib-undefined],
+-		[KDE_NO_UNDEFINED="-Wl,--no-undefined -Wl,--allow-shlib-undefined"],
+-		[KDE_NO_UNDEFINED=""])],
+-	    [KDE_NO_UNDEFINED=""])
+-           ;;
+-       esac
+   fi
+   AC_SUBST(KDE_USE_CLOSURE_TRUE)
+   AC_SUBST(KDE_USE_CLOSURE_FALSE)
diff --git a/dilos/core/tdeadmin/debian/patches/common/kubuntu_01_kdepot.diff b/dilos/core/tdeadmin/debian/patches/common/kubuntu_01_kdepot.diff
new file mode 100644
index 000000000..28c95742b
--- /dev/null
+++ b/dilos/core/tdeadmin/debian/patches/common/kubuntu_01_kdepot.diff
@@ -0,0 +1,26 @@
+--- kde/admin/cvs.sh	2005-11-26 02:42:02.000000000 +0000
++++ kde/admin/cvs.sh	2005-11-26 02:42:26.000000000 +0000
+@@ -537,6 +537,8 @@
+ if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi
+ export EXTRACTRC PREPARETIPS
+ 
++kdepotpath=/usr/include/tde/tde.pot
++
+ for subdir in $dirs; do
+   test -z "$VERBOSE" || echo "Making messages in $subdir"
+   (cd $subdir
+@@ -554,10 +556,10 @@
+    fi
+    perl -e '$mes=0; while (<STDIN>) { next if (/^(if\s|else\s|endif)/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\\(XGETTEXT\)/ && / -o/) { s/ -o \$\(podir\)/ _translatorinfo.cpp -o \$\(podir\)/ } print $_; } else { print $_; } }' < Makefile.am | egrep -v '^include ' > _transMakefile
+ 
+-   kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
+-   if ! test -f $kdepotpath; then
+-	kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
+-   fi
++#   kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
++#   if ! test -f $kdepotpath; then
++#	kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
++#   fi
+ 
+    $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \
+ 	XGETTEXT="${XGETTEXT:-xgettext} --foreign-user -C -ci18n -ki18n -ktr2i18n -kI18N_NOOP -kI18N_NOOP2 -kaliasLocale -x $kdepotpath" messages
diff --git a/dilos/core/tdeadmin/debian/patches/dilos.patch b/dilos/core/tdeadmin/debian/patches/dilos.patch
new file mode 100644
index 000000000..aa71af2d1
--- /dev/null
+++ b/dilos/core/tdeadmin/debian/patches/dilos.patch
@@ -0,0 +1,62 @@
+Index: tdeadmin/kdat/ConfigureChecks.cmake
+===================================================================
+--- tdeadmin.orig/kdat/ConfigureChecks.cmake
++++ tdeadmin/kdat/ConfigureChecks.cmake
+@@ -10,7 +10,7 @@ check_cxx_source_compiles("
+     #include <sys/mtio.h>
+     int main() {
+       struct mtget tapeStatus;
+-      return GMT_EOF ( tapeStatus.mt_gstat );
++      return GMT_EOF ( tapeStatus.mt_dsreg );
+     }"
+     HAVE_MTGET_GSTAT
+ )
+Index: tdeadmin/lilo-config/common/String.cc
+===================================================================
+--- tdeadmin.orig/lilo-config/common/String.cc
++++ tdeadmin/lilo-config/common/String.cc
+@@ -27,7 +27,9 @@
+ ** Bug reports and questions can be sent to kde-devel@kde.org
+ */
+ #define _GNU_SOURCE 1
++#ifndef	__dilos__
+ #include <features.h>
++#endif	/* __dilos__ */
+ #include <string.h>
+ #include <string>
+ #include "String.h"
+Index: tdeadmin/lilo-config/common/Files.cc
+===================================================================
+--- tdeadmin.orig/lilo-config/common/Files.cc
++++ tdeadmin/lilo-config/common/Files.cc
+@@ -35,8 +35,10 @@ StringList &Files::glob(String name, enu
+ 	glob_t gl;
+ 	int flags=0;
+ 	StringList *result;
++#ifndef	__dilos__
+ 	if(dotfiles)
+ 		flags |= GLOB_PERIOD;
++#endif	/* __dilos__ */
+ 	if(braces)
+ 		flags |= GLOB_BRACE;
+ 	::glob(name, flags, NULL, &gl);
+Index: tdeadmin/lilo-config/common/lilo.cc
+===================================================================
+--- tdeadmin.orig/lilo-config/common/lilo.cc
++++ tdeadmin/lilo-config/common/lilo.cc
+@@ -317,10 +317,15 @@ bool liloconf::probe()
+ 				char *tmp=tmpnam(NULL);
+ 				tmp=tmpnam(NULL);
+ 				mkdir(tmp, 0700);
++#ifdef	__dilos__
++				if(!mount(*it, tmp, MS_RDONLY|MS_NOSUID, "pcfs", NULL))
++					mp=tmp;
++#else	/* !__dilos__ */
+ 				if(!mount(*it, tmp, "msdos", MS_MGC_VAL|MS_RDONLY|MS_NOSUID|MS_NODEV|MS_NOEXEC, NULL))
+ 					mp=tmp;
+ 				else if(!mount(*it, mp, "vfat", MS_MGC_VAL|MS_RDONLY|MS_NOSUID|MS_NODEV|MS_NOEXEC, NULL))
+ 					mp=tmp;
++#endif	/* __dilos__ */
+ 			}
+ 			if(!mp.empty()) {
+ 				struct stat s;
diff --git a/dilos/core/tdeadmin/debian/patches/series b/dilos/core/tdeadmin/debian/patches/series
new file mode 100644
index 000000000..8e96568f3
--- /dev/null
+++ b/dilos/core/tdeadmin/debian/patches/series
@@ -0,0 +1,4 @@
+common/04_am_maintainer_mode.diff
+common/06_disable_no_undefined.diff
+common/kubuntu_01_kdepot.diff
+dilos.patch