summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--debian/_base/applications/internet/kvirc/debian/kvirc-data-trinity.install2
-rw-r--r--debian/_base/applications/multimedia/k3b/debian/patches/111_advice_kubuntu_restricted_extras.diff2
-rw-r--r--debian/_base/core/tdeutils/debian/patches/01-klaptopdaemon-setuphandler.diff4
-rw-r--r--debian/_base/libraries/pytdeextensions/debian/patches/11_fix_get_libdir_name.diff2
-rw-r--r--dilos/core/tdeutils/debian/patches/01-klaptopdaemon-setuphandler.diff4
-rw-r--r--dilos/libraries/pytdeextensions/debian/patches/11_fix_get_libdir_name.diff2
-rw-r--r--ubuntu/_base/applications/internet/kvirc/debian/kvirc-data-trinity.install2
-rw-r--r--ubuntu/_base/applications/multimedia/k3b/debian/patches/111_advice_kubuntu_restricted_extras.diff2
-rw-r--r--ubuntu/_base/core/tdeutils/debian/patches/01-klaptopdaemon-setuphandler.diff4
-rw-r--r--ubuntu/_base/libraries/pytdeextensions/debian/patches/11_fix_get_libdir_name.diff2
10 files changed, 13 insertions, 13 deletions
diff --git a/debian/_base/applications/internet/kvirc/debian/kvirc-data-trinity.install b/debian/_base/applications/internet/kvirc/debian/kvirc-data-trinity.install
index 4144f9f74..7ab7fc5bc 100644
--- a/debian/_base/applications/internet/kvirc/debian/kvirc-data-trinity.install
+++ b/debian/_base/applications/internet/kvirc/debian/kvirc-data-trinity.install
@@ -7,11 +7,11 @@ debian/tmp/opt/trinity/share/apps/kvirc/config/
debian/tmp/opt/trinity/share/apps/kvirc/defscript/
debian/tmp/opt/trinity/share/apps/kvirc/help/
debian/tmp/opt/trinity/share/apps/kvirc/license/
-debian/tmp/opt/trinity/share/apps/kvirc/locale/
debian/tmp/opt/trinity/share/apps/kvirc/msgcolors/
debian/tmp/opt/trinity/share/apps/kvirc/pics/
#debian/tmp/opt/trinity/share/apps/kvirc/services/
debian/tmp/opt/trinity/share/apps/kvirc/themes/
debian/tmp/opt/trinity/share/icons/hicolor/
+debian/tmp/opt/trinity/share/locale/
debian/tmp/opt/trinity/share/mimelnk/text/*.desktop
debian/tmp/opt/trinity/share/man/man1/kvirc.1
diff --git a/debian/_base/applications/multimedia/k3b/debian/patches/111_advice_kubuntu_restricted_extras.diff b/debian/_base/applications/multimedia/k3b/debian/patches/111_advice_kubuntu_restricted_extras.diff
index dc44bfdb8..d6839878e 100644
--- a/debian/_base/applications/multimedia/k3b/debian/patches/111_advice_kubuntu_restricted_extras.diff
+++ b/debian/_base/applications/multimedia/k3b/debian/patches/111_advice_kubuntu_restricted_extras.diff
@@ -1,7 +1,7 @@
diff -Nur k3b-1.0.2/src/k3bsystemproblemdialog.cpp k3b-1.0.2.new/src/k3bsystemproblemdialog.cpp
--- k3b-1.0.2/src/k3bsystemproblemdialog.cpp 2007-07-12 11:47:03.000000000 +0200
+++ k3b-1.0.2.new/src/k3bsystemproblemdialog.cpp 2007-07-12 11:48:00.000000000 +0200
-@@ -518,8 +518,8 @@
+@@ -520,8 +520,8 @@
"include Mp3 support for legal reasons."),
i18n("To enable Mp3 support, please install the MAD Mp3 decoding library as well as the "
"K3b MAD Mp3 decoder plugin (the latter may already be installed but not functional "
diff --git a/debian/_base/core/tdeutils/debian/patches/01-klaptopdaemon-setuphandler.diff b/debian/_base/core/tdeutils/debian/patches/01-klaptopdaemon-setuphandler.diff
index 3837407f6..625fa8e32 100644
--- a/debian/_base/core/tdeutils/debian/patches/01-klaptopdaemon-setuphandler.diff
+++ b/debian/_base/core/tdeutils/debian/patches/01-klaptopdaemon-setuphandler.diff
@@ -2,7 +2,7 @@ diff --git a/klaptopdaemon/acpi.cpp b/klaptopdaemon/acpi.cpp
index 4dfb247..cd8f4b0 100644
--- a/klaptopdaemon/acpi.cpp
+++ b/klaptopdaemon/acpi.cpp
-@@ -178,7 +178,7 @@ void AcpiConfig::setupHelper()
+@@ -189,7 +189,7 @@ void AcpiConfig::setupHelper()
proc << tdesu;
proc << "-u";
proc << "root";
@@ -24,7 +24,7 @@ index 9de0c85..e348943 100644
proc.start(TDEProcess::Block); // run it sync so has_apm below sees the results
}
} else {
-@@ -200,7 +200,7 @@ void ApmConfig::setupHelper2() // we use the acpi helper to do software suspend
+@@ -211,7 +211,7 @@ void ApmConfig::setupHelper2() // we use the acpi helper to do software suspend
proc << tdesu;
proc << "-u";
proc << "root";
diff --git a/debian/_base/libraries/pytdeextensions/debian/patches/11_fix_get_libdir_name.diff b/debian/_base/libraries/pytdeextensions/debian/patches/11_fix_get_libdir_name.diff
index 281d388c7..5565cf56b 100644
--- a/debian/_base/libraries/pytdeextensions/debian/patches/11_fix_get_libdir_name.diff
+++ b/debian/_base/libraries/pytdeextensions/debian/patches/11_fix_get_libdir_name.diff
@@ -2,7 +2,7 @@ Index: b/src/tdedistutils.py
===================================================================
--- a/src/tdedistutils.py
+++ b/src/tdedistutils.py
-@@ -2272,7 +2272,7 @@
+@@ -2259,7 +2259,7 @@
###########################################################################
def get_libdir_name():
diff --git a/dilos/core/tdeutils/debian/patches/01-klaptopdaemon-setuphandler.diff b/dilos/core/tdeutils/debian/patches/01-klaptopdaemon-setuphandler.diff
index 3837407f6..625fa8e32 100644
--- a/dilos/core/tdeutils/debian/patches/01-klaptopdaemon-setuphandler.diff
+++ b/dilos/core/tdeutils/debian/patches/01-klaptopdaemon-setuphandler.diff
@@ -2,7 +2,7 @@ diff --git a/klaptopdaemon/acpi.cpp b/klaptopdaemon/acpi.cpp
index 4dfb247..cd8f4b0 100644
--- a/klaptopdaemon/acpi.cpp
+++ b/klaptopdaemon/acpi.cpp
-@@ -178,7 +178,7 @@ void AcpiConfig::setupHelper()
+@@ -189,7 +189,7 @@ void AcpiConfig::setupHelper()
proc << tdesu;
proc << "-u";
proc << "root";
@@ -24,7 +24,7 @@ index 9de0c85..e348943 100644
proc.start(TDEProcess::Block); // run it sync so has_apm below sees the results
}
} else {
-@@ -200,7 +200,7 @@ void ApmConfig::setupHelper2() // we use the acpi helper to do software suspend
+@@ -211,7 +211,7 @@ void ApmConfig::setupHelper2() // we use the acpi helper to do software suspend
proc << tdesu;
proc << "-u";
proc << "root";
diff --git a/dilos/libraries/pytdeextensions/debian/patches/11_fix_get_libdir_name.diff b/dilos/libraries/pytdeextensions/debian/patches/11_fix_get_libdir_name.diff
index 281d388c7..5565cf56b 100644
--- a/dilos/libraries/pytdeextensions/debian/patches/11_fix_get_libdir_name.diff
+++ b/dilos/libraries/pytdeextensions/debian/patches/11_fix_get_libdir_name.diff
@@ -2,7 +2,7 @@ Index: b/src/tdedistutils.py
===================================================================
--- a/src/tdedistutils.py
+++ b/src/tdedistutils.py
-@@ -2272,7 +2272,7 @@
+@@ -2259,7 +2259,7 @@
###########################################################################
def get_libdir_name():
diff --git a/ubuntu/_base/applications/internet/kvirc/debian/kvirc-data-trinity.install b/ubuntu/_base/applications/internet/kvirc/debian/kvirc-data-trinity.install
index 4144f9f74..7ab7fc5bc 100644
--- a/ubuntu/_base/applications/internet/kvirc/debian/kvirc-data-trinity.install
+++ b/ubuntu/_base/applications/internet/kvirc/debian/kvirc-data-trinity.install
@@ -7,11 +7,11 @@ debian/tmp/opt/trinity/share/apps/kvirc/config/
debian/tmp/opt/trinity/share/apps/kvirc/defscript/
debian/tmp/opt/trinity/share/apps/kvirc/help/
debian/tmp/opt/trinity/share/apps/kvirc/license/
-debian/tmp/opt/trinity/share/apps/kvirc/locale/
debian/tmp/opt/trinity/share/apps/kvirc/msgcolors/
debian/tmp/opt/trinity/share/apps/kvirc/pics/
#debian/tmp/opt/trinity/share/apps/kvirc/services/
debian/tmp/opt/trinity/share/apps/kvirc/themes/
debian/tmp/opt/trinity/share/icons/hicolor/
+debian/tmp/opt/trinity/share/locale/
debian/tmp/opt/trinity/share/mimelnk/text/*.desktop
debian/tmp/opt/trinity/share/man/man1/kvirc.1
diff --git a/ubuntu/_base/applications/multimedia/k3b/debian/patches/111_advice_kubuntu_restricted_extras.diff b/ubuntu/_base/applications/multimedia/k3b/debian/patches/111_advice_kubuntu_restricted_extras.diff
index dc44bfdb8..d6839878e 100644
--- a/ubuntu/_base/applications/multimedia/k3b/debian/patches/111_advice_kubuntu_restricted_extras.diff
+++ b/ubuntu/_base/applications/multimedia/k3b/debian/patches/111_advice_kubuntu_restricted_extras.diff
@@ -1,7 +1,7 @@
diff -Nur k3b-1.0.2/src/k3bsystemproblemdialog.cpp k3b-1.0.2.new/src/k3bsystemproblemdialog.cpp
--- k3b-1.0.2/src/k3bsystemproblemdialog.cpp 2007-07-12 11:47:03.000000000 +0200
+++ k3b-1.0.2.new/src/k3bsystemproblemdialog.cpp 2007-07-12 11:48:00.000000000 +0200
-@@ -518,8 +518,8 @@
+@@ -520,8 +520,8 @@
"include Mp3 support for legal reasons."),
i18n("To enable Mp3 support, please install the MAD Mp3 decoding library as well as the "
"K3b MAD Mp3 decoder plugin (the latter may already be installed but not functional "
diff --git a/ubuntu/_base/core/tdeutils/debian/patches/01-klaptopdaemon-setuphandler.diff b/ubuntu/_base/core/tdeutils/debian/patches/01-klaptopdaemon-setuphandler.diff
index 3837407f6..625fa8e32 100644
--- a/ubuntu/_base/core/tdeutils/debian/patches/01-klaptopdaemon-setuphandler.diff
+++ b/ubuntu/_base/core/tdeutils/debian/patches/01-klaptopdaemon-setuphandler.diff
@@ -2,7 +2,7 @@ diff --git a/klaptopdaemon/acpi.cpp b/klaptopdaemon/acpi.cpp
index 4dfb247..cd8f4b0 100644
--- a/klaptopdaemon/acpi.cpp
+++ b/klaptopdaemon/acpi.cpp
-@@ -178,7 +178,7 @@ void AcpiConfig::setupHelper()
+@@ -189,7 +189,7 @@ void AcpiConfig::setupHelper()
proc << tdesu;
proc << "-u";
proc << "root";
@@ -24,7 +24,7 @@ index 9de0c85..e348943 100644
proc.start(TDEProcess::Block); // run it sync so has_apm below sees the results
}
} else {
-@@ -200,7 +200,7 @@ void ApmConfig::setupHelper2() // we use the acpi helper to do software suspend
+@@ -211,7 +211,7 @@ void ApmConfig::setupHelper2() // we use the acpi helper to do software suspend
proc << tdesu;
proc << "-u";
proc << "root";
diff --git a/ubuntu/_base/libraries/pytdeextensions/debian/patches/11_fix_get_libdir_name.diff b/ubuntu/_base/libraries/pytdeextensions/debian/patches/11_fix_get_libdir_name.diff
index 281d388c7..5565cf56b 100644
--- a/ubuntu/_base/libraries/pytdeextensions/debian/patches/11_fix_get_libdir_name.diff
+++ b/ubuntu/_base/libraries/pytdeextensions/debian/patches/11_fix_get_libdir_name.diff
@@ -2,7 +2,7 @@ Index: b/src/tdedistutils.py
===================================================================
--- a/src/tdedistutils.py
+++ b/src/tdedistutils.py
-@@ -2272,7 +2272,7 @@
+@@ -2259,7 +2259,7 @@
###########################################################################
def get_libdir_name():