From 02dc85a95b228b7242b0d11ea35619faad96db03 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Mon, 10 Sep 2012 16:16:32 -0500
Subject: Split precise from maverick

---
 .../patches/common/04_am_maintainer_mode.diff      | 11 +++++++++
 .../patches/common/06_disable_no_undefined.diff    | 18 +++++++++++++++
 .../debian/patches/common/kubuntu_01_kdepot.diff   | 26 ++++++++++++++++++++++
 3 files changed, 55 insertions(+)
 create mode 100644 ubuntu/precise/tdetoys/debian/patches/common/04_am_maintainer_mode.diff
 create mode 100644 ubuntu/precise/tdetoys/debian/patches/common/06_disable_no_undefined.diff
 create mode 100644 ubuntu/precise/tdetoys/debian/patches/common/kubuntu_01_kdepot.diff

(limited to 'ubuntu/precise/tdetoys/debian/patches')

diff --git a/ubuntu/precise/tdetoys/debian/patches/common/04_am_maintainer_mode.diff b/ubuntu/precise/tdetoys/debian/patches/common/04_am_maintainer_mode.diff
new file mode 100644
index 000000000..391a80285
--- /dev/null
+++ b/ubuntu/precise/tdetoys/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/ubuntu/precise/tdetoys/debian/patches/common/06_disable_no_undefined.diff b/ubuntu/precise/tdetoys/debian/patches/common/06_disable_no_undefined.diff
new file mode 100644
index 000000000..05c932c3c
--- /dev/null
+++ b/ubuntu/precise/tdetoys/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/ubuntu/precise/tdetoys/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/precise/tdetoys/debian/patches/common/kubuntu_01_kdepot.diff
new file mode 100644
index 000000000..20ad1b0b7
--- /dev/null
+++ b/ubuntu/precise/tdetoys/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=/opt/trinity/include/tde/kde.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`}/kde.pot
+-   if ! test -f $kdepotpath; then
+-	kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot
+-   fi
++#   kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot
++#   if ! test -f $kdepotpath; then
++#	kdepotpath=`tde-config --expandvars --prefix`/include/kde.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
-- 
cgit v1.2.3