summaryrefslogtreecommitdiffstats
path: root/debian
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-08-13 12:20:58 -0500
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-08-13 12:20:58 -0500
commit131df957b41b4683571b1e36e6fed9d614d32356 (patch)
treeb95c095939a3b862ec5801722aa716a98bcccb44 /debian
parentd280eef1122a1108c734f6530744533d64129343 (diff)
downloadtde-packaging-131df957b41b4683571b1e36e6fed9d614d32356.tar.gz
tde-packaging-131df957b41b4683571b1e36e6fed9d614d32356.zip
Fix kdeartwork fur Debian/Ubuntu
Diffstat (limited to 'debian')
-rw-r--r--debian/lenny/kdeartwork/debian/patches/common/04_am_maintainer_mode.diff11
-rw-r--r--debian/lenny/kdeartwork/debian/patches/common/05_pedantic-errors.diff12
-rw-r--r--debian/lenny/kdeartwork/debian/patches/common/06_disable_no_undefined.diff18
-rw-r--r--debian/lenny/kdeartwork/debian/patches/common/kubuntu_01_kdepot.diff26
-rw-r--r--debian/squeeze/kdeartwork/debian/patches/common/04_am_maintainer_mode.diff11
-rw-r--r--debian/squeeze/kdeartwork/debian/patches/common/05_pedantic-errors.diff12
-rw-r--r--debian/squeeze/kdeartwork/debian/patches/common/06_disable_no_undefined.diff18
-rw-r--r--debian/squeeze/kdeartwork/debian/patches/common/kubuntu_01_kdepot.diff26
8 files changed, 0 insertions, 134 deletions
diff --git a/debian/lenny/kdeartwork/debian/patches/common/04_am_maintainer_mode.diff b/debian/lenny/kdeartwork/debian/patches/common/04_am_maintainer_mode.diff
deleted file mode 100644
index 391a80285..000000000
--- a/debian/lenny/kdeartwork/debian/patches/common/04_am_maintainer_mode.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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/debian/lenny/kdeartwork/debian/patches/common/05_pedantic-errors.diff b/debian/lenny/kdeartwork/debian/patches/common/05_pedantic-errors.diff
deleted file mode 100644
index ce2883918..000000000
--- a/debian/lenny/kdeartwork/debian/patches/common/05_pedantic-errors.diff
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/admin/acinclude.m4.in
-+++ b/admin/acinclude.m4.in
-@@ -2144,9 +2144,6 @@
- save_CXXFLAGS="$CXXFLAGS"
- kde_safe_LIBS="$LIBS"
- LIBS="$LIBS $X_EXTRA_LIBS"
--if test "$GXX" = "yes"; then
--CXXFLAGS="$CXXFLAGS -pedantic-errors"
--fi
- AC_TRY_COMPILE([
- $2
- ],
diff --git a/debian/lenny/kdeartwork/debian/patches/common/06_disable_no_undefined.diff b/debian/lenny/kdeartwork/debian/patches/common/06_disable_no_undefined.diff
deleted file mode 100644
index 05c932c3c..000000000
--- a/debian/lenny/kdeartwork/debian/patches/common/06_disable_no_undefined.diff
+++ /dev/null
@@ -1,18 +0,0 @@
---- 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/debian/lenny/kdeartwork/debian/patches/common/kubuntu_01_kdepot.diff b/debian/lenny/kdeartwork/debian/patches/common/kubuntu_01_kdepot.diff
deleted file mode 100644
index 0caf5361a..000000000
--- a/debian/lenny/kdeartwork/debian/patches/common/kubuntu_01_kdepot.diff
+++ /dev/null
@@ -1,26 +0,0 @@
---- 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/kde/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:-`kde-config --expandvars --install include`}/kde.pot
-- if ! test -f $kdepotpath; then
-- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot
-- fi
-+# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot
-+# if ! test -f $kdepotpath; then
-+# kdepotpath=`kde-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
diff --git a/debian/squeeze/kdeartwork/debian/patches/common/04_am_maintainer_mode.diff b/debian/squeeze/kdeartwork/debian/patches/common/04_am_maintainer_mode.diff
deleted file mode 100644
index 391a80285..000000000
--- a/debian/squeeze/kdeartwork/debian/patches/common/04_am_maintainer_mode.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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/debian/squeeze/kdeartwork/debian/patches/common/05_pedantic-errors.diff b/debian/squeeze/kdeartwork/debian/patches/common/05_pedantic-errors.diff
deleted file mode 100644
index ce2883918..000000000
--- a/debian/squeeze/kdeartwork/debian/patches/common/05_pedantic-errors.diff
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/admin/acinclude.m4.in
-+++ b/admin/acinclude.m4.in
-@@ -2144,9 +2144,6 @@
- save_CXXFLAGS="$CXXFLAGS"
- kde_safe_LIBS="$LIBS"
- LIBS="$LIBS $X_EXTRA_LIBS"
--if test "$GXX" = "yes"; then
--CXXFLAGS="$CXXFLAGS -pedantic-errors"
--fi
- AC_TRY_COMPILE([
- $2
- ],
diff --git a/debian/squeeze/kdeartwork/debian/patches/common/06_disable_no_undefined.diff b/debian/squeeze/kdeartwork/debian/patches/common/06_disable_no_undefined.diff
deleted file mode 100644
index 05c932c3c..000000000
--- a/debian/squeeze/kdeartwork/debian/patches/common/06_disable_no_undefined.diff
+++ /dev/null
@@ -1,18 +0,0 @@
---- 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/debian/squeeze/kdeartwork/debian/patches/common/kubuntu_01_kdepot.diff b/debian/squeeze/kdeartwork/debian/patches/common/kubuntu_01_kdepot.diff
deleted file mode 100644
index 0caf5361a..000000000
--- a/debian/squeeze/kdeartwork/debian/patches/common/kubuntu_01_kdepot.diff
+++ /dev/null
@@ -1,26 +0,0 @@
---- 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/kde/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:-`kde-config --expandvars --install include`}/kde.pot
-- if ! test -f $kdepotpath; then
-- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot
-- fi
-+# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot
-+# if ! test -f $kdepotpath; then
-+# kdepotpath=`kde-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