From 162a15bf2dd73d3d33a57708f863a71a0c6d9e99 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Wed, 29 Jul 2020 15:27:15 +0900 Subject: [PATCH] DEB keep: updated after dropping automake files Signed-off-by: Michele Calgaro (cherry picked from commit e31c699a7325ee1eb04a0ae997c02decdd52f34c) --- .../debian/patches/kubuntu_01_kdepot.diff | 20 ------------------- .../applications/keep/debian/patches/series | 1 - .../debian/patches/kubuntu_01_kdepot.diff | 20 ------------------- .../applications/keep/debian/patches/series | 1 - 4 files changed, 42 deletions(-) delete mode 100644 debian/_base/applications/keep/debian/patches/kubuntu_01_kdepot.diff delete mode 100644 ubuntu/_base/applications/keep/debian/patches/kubuntu_01_kdepot.diff diff --git a/debian/_base/applications/keep/debian/patches/kubuntu_01_kdepot.diff b/debian/_base/applications/keep/debian/patches/kubuntu_01_kdepot.diff deleted file mode 100644 index 696f9093c..000000000 --- a/debian/_base/applications/keep/debian/patches/kubuntu_01_kdepot.diff +++ /dev/null @@ -1,20 +0,0 @@ -diff -Nur keep-0.4.0/admin/cvs.sh keep-0.4.0.new/admin/cvs.sh ---- keep-0.4.0/admin/cvs.sh 2006-09-23 01:51:35.000000000 +0200 -+++ keep-0.4.0.new/admin/cvs.sh 2006-12-05 16:29:23.000000000 +0100 -@@ -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,7 +556,6 @@ - fi - perl -e '$mes=0; while () { 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 diff --git a/debian/_base/applications/keep/debian/patches/series b/debian/_base/applications/keep/debian/patches/series index 9ccf4a125..e69de29bb 100644 --- a/debian/_base/applications/keep/debian/patches/series +++ b/debian/_base/applications/keep/debian/patches/series @@ -1 +0,0 @@ -kubuntu_01_kdepot.diff diff --git a/ubuntu/_base/applications/keep/debian/patches/kubuntu_01_kdepot.diff b/ubuntu/_base/applications/keep/debian/patches/kubuntu_01_kdepot.diff deleted file mode 100644 index 696f9093c..000000000 --- a/ubuntu/_base/applications/keep/debian/patches/kubuntu_01_kdepot.diff +++ /dev/null @@ -1,20 +0,0 @@ -diff -Nur keep-0.4.0/admin/cvs.sh keep-0.4.0.new/admin/cvs.sh ---- keep-0.4.0/admin/cvs.sh 2006-09-23 01:51:35.000000000 +0200 -+++ keep-0.4.0.new/admin/cvs.sh 2006-12-05 16:29:23.000000000 +0100 -@@ -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,7 +556,6 @@ - fi - perl -e '$mes=0; while () { 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 diff --git a/ubuntu/_base/applications/keep/debian/patches/series b/ubuntu/_base/applications/keep/debian/patches/series index 9ccf4a125..e69de29bb 100644 --- a/ubuntu/_base/applications/keep/debian/patches/series +++ b/ubuntu/_base/applications/keep/debian/patches/series @@ -1 +0,0 @@ -kubuntu_01_kdepot.diff