François Andriot
11 years ago
parent
fd19f6bf3d
commit
7d2530b3a0
@ -1,3 +0,0 @@
|
||||
[Dolphin]
|
||||
Sorting=6
|
||||
Timestamp=2008,11,20,16,19,31
|
||||
@ -1,3 +0,0 @@
|
||||
[Dolphin]
|
||||
Sorting=6
|
||||
Timestamp=2008,11,20,16,19,31
|
||||
@ -1,3 +0,0 @@
|
||||
[Dolphin]
|
||||
Sorting=6
|
||||
Timestamp=2008,11,20,16,19,31
|
||||
@ -1,69 +0,0 @@
|
||||
--- kcmautostart/src/autostart.desktop.ORI 2012-05-10 11:47:47.743164035 +0200
|
||||
+++ kcmautostart/src/autostart.desktop 2012-05-10 11:49:15.127289325 +0200
|
||||
@@ -14,8 +14,10 @@
|
||||
Comment=A KControl tool for managing what programs start up with TDE.
|
||||
Comment[ca]=Panell de control per a gestionar els programes que s'inicien amb la sessió de TDE.
|
||||
Comment[es]=Panel de control para gestionar los programas que se inician con la sesión de TDE.
|
||||
+Comment[fr]=Paneau de contrôle pour gérer le démarrage des programmes à l'ouverture de session TDE.
|
||||
Keywords=autostart manager
|
||||
Name=Autostart Manager
|
||||
Name[ca]=Autoengega
|
||||
Name[es]=Arranque automático
|
||||
+Name[fr]=Démarrage automatique
|
||||
Categories=Qt;KDE;X-KDE-settings-components;
|
||||
diff -Nuar kcmautostart/po.ori//fr.po kcmautostart/po/fr.po
|
||||
--- kcmautostart/po.ori//fr.po 1970-01-01 01:00:00.000000000 +0100
|
||||
+++ kcmautostart/po/fr.po 2012-05-10 19:27:38.107215981 +0200
|
||||
@@ -0,0 +1,52 @@
|
||||
+msgid ""
|
||||
+msgstr ""
|
||||
+"Content-Type: text/plain; charset=UTF-8\n"
|
||||
+"Content-Transfer-Encoding: 8bit\n"
|
||||
+"PO-Revision-Date: 2012-05-10 12:01+0100\n"
|
||||
+"Project-Id-Version: autostart_ca\n"
|
||||
+"Language-Team: <ca@li.org>\n"
|
||||
+"X-Generator: KBabel 1.11.4\n"
|
||||
+"MIME-Version: 1.0\n"
|
||||
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
|
||||
+"Last-Translator: Josep Febrer <josep@extens.info>\n"
|
||||
+
|
||||
+#: ../src/autostart.cpp:61
|
||||
+msgid "Startup"
|
||||
+msgstr "Démarrage"
|
||||
+
|
||||
+#: ../src/autostart.cpp:62
|
||||
+msgid "Shutdown"
|
||||
+msgstr "Arrêt"
|
||||
+
|
||||
+#: ../src/autostart.cpp:63
|
||||
+msgid "ENV"
|
||||
+msgstr "ENV"
|
||||
+
|
||||
+#: ../src/autostart.cpp:102
|
||||
+msgid "Name"
|
||||
+msgstr "Nom"
|
||||
+
|
||||
+#: ../src/autostart.cpp:103
|
||||
+msgid "Command"
|
||||
+msgstr "Commande"
|
||||
+
|
||||
+#: ../src/autostart.cpp:104
|
||||
+msgid "Run on"
|
||||
+msgstr "Executer"
|
||||
+
|
||||
+#: ../src/autostart.cpp:129
|
||||
+msgid "&Add"
|
||||
+msgstr "&Ajouter"
|
||||
+
|
||||
+#: ../src/autostart.cpp:131
|
||||
+msgid "&Remove"
|
||||
+msgstr "&Supprimer"
|
||||
+
|
||||
+#: ../src/autostart.cpp:133
|
||||
+msgid "&Properties"
|
||||
+msgstr "&Propiétés"
|
||||
+
|
||||
+#: ../src/autostart.cpp:317
|
||||
+msgid "This module helps you configure which applications KDE runs When starting up and shutting down."
|
||||
+msgstr "Ce module vous aide à configurer quelles applications sont exécutées à l'ouverture et à la fermeture de session de TDE."
|
||||
+
|
||||
@ -1,27 +0,0 @@
|
||||
--- kcmautostart.ORI/src/autostart.cpp 2012-05-10 11:36:44.887288951 +0200
|
||||
+++ kcmautostart.P/src/autostart.cpp 2012-05-10 11:37:16.701639283 +0200
|
||||
@@ -88,10 +88,10 @@
|
||||
path = kgs->autostartPath()+"/";
|
||||
break;
|
||||
case Shutdown:
|
||||
- path = ksd->localtdedir()+"shutdown/";
|
||||
+ path = ksd->localkdedir()+"shutdown/";
|
||||
break;
|
||||
case ENV:
|
||||
- path = ksd->localtdedir()+"env/";
|
||||
+ path = ksd->localkdedir()+"env/";
|
||||
break;
|
||||
}
|
||||
KIO::file_move(fileName, KURL( path + fileName.fileName() ));
|
||||
@@ -190,9 +190,9 @@
|
||||
if (x==0)
|
||||
path = kgs->autostartPath();
|
||||
else if (x==1)
|
||||
- path = ksd->localtdedir() + "/shutdown";
|
||||
+ path = ksd->localkdedir() + "/shutdown";
|
||||
else if (x==2)
|
||||
- path = ksd->localtdedir() + "/env";
|
||||
+ path = ksd->localkdedir() + "/env";
|
||||
|
||||
if (! KStandardDirs::exists(path))
|
||||
KStandardDirs::makeDir(path);
|
||||
@ -1,52 +0,0 @@
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"PO-Revision-Date: 2012-05-10 12:01+0100\n"
|
||||
"Project-Id-Version: autostart_ca\n"
|
||||
"Language-Team: <ca@li.org>\n"
|
||||
"X-Generator: KBabel 1.11.4\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
|
||||
"Last-Translator: Josep Febrer <josep@extens.info>\n"
|
||||
|
||||
#: ../src/autostart.cpp:61
|
||||
msgid "Startup"
|
||||
msgstr "Démarrage"
|
||||
|
||||
#: ../src/autostart.cpp:62
|
||||
msgid "Shutdown"
|
||||
msgstr "Arrêt"
|
||||
|
||||
#: ../src/autostart.cpp:63
|
||||
msgid "ENV"
|
||||
msgstr "ENV"
|
||||
|
||||
#: ../src/autostart.cpp:102
|
||||
msgid "Name"
|
||||
msgstr "Nom"
|
||||
|
||||
#: ../src/autostart.cpp:103
|
||||
msgid "Command"
|
||||
msgstr "Comande"
|
||||
|
||||
#: ../src/autostart.cpp:104
|
||||
msgid "Run on"
|
||||
msgstr "Executer"
|
||||
|
||||
#: ../src/autostart.cpp:129
|
||||
msgid "&Add"
|
||||
msgstr "&Ajouter"
|
||||
|
||||
#: ../src/autostart.cpp:131
|
||||
msgid "&Remove"
|
||||
msgstr "&Supprimer"
|
||||
|
||||
#: ../src/autostart.cpp:133
|
||||
msgid "&Properties"
|
||||
msgstr "&Propiétés"
|
||||
|
||||
#: ../src/autostart.cpp:317
|
||||
msgid "This module helps you configure which applications KDE runs When starting up and shutting down."
|
||||
msgstr "Ce module vous aide à configurer quelles applications sont exécutées à l'ouverture et à la fermeture de session de TDE."
|
||||
|
||||
@ -1,13 +0,0 @@
|
||||
[Desktop Entry]
|
||||
Encoding=UTF-8
|
||||
Name=Laptops & Power
|
||||
Name[br]=Gremm
|
||||
Name[el]=Ισχύς
|
||||
Name[it]=Energia
|
||||
Name[mt]=Elettriku
|
||||
Name[nl]=Energie
|
||||
Name[pa]=ਊਰਜਾ(power)
|
||||
Name[pt_BR]=Energia
|
||||
Name[ru]=Управление питанием
|
||||
Name[sv]=Effekt
|
||||
Icon=energy
|
||||
@ -1,74 +0,0 @@
|
||||
diff -Nuar tqca-tls.ORI//configure tqca-tls.P//configure
|
||||
--- tqca-tls.ORI//configure 2012-02-18 11:09:57.695893820 +0100
|
||||
+++ tqca-tls.P//configure 2012-02-18 11:28:09.442846406 +0100
|
||||
@@ -60,7 +60,7 @@
|
||||
if [ "$QC_DEBUG" = "Y" ]; then
|
||||
echo \$QTDIR not set... trying to find Qt manually
|
||||
fi
|
||||
- for p in /usr/lib/tqt /usr/share/tqt /usr/share/tqt3 /usr/local/lib/tqt /usr/local/share/tqt /usr/lib/tqt3 /usr/local/lib/tqt3 /usr/lib/qt /usr/share/qt /usr/share/qt3 /usr/local/lib/qt /usr/local/share/qt /usr/lib/qt3 /usr/local/lib/qt3 /usr/X11R6/share/qt /usr/qt/3 ; do
|
||||
+ for p in /usr/lib64/tqt /usr/lib/tqt /usr/share/tqt /usr/share/tqt3 /usr/local/lib64/tqt /usr/local/lib/tqt /usr/local/share/tqt /usr/lib64/tqt3 /usr/lib/tqt3 /usr/local/lib64/tqt3 /usr/local/lib/tqt3 /usr/lib64/qt /usr/lib/qt /usr/share/qt /usr/share/qt3 /usr/local/lib64/qt /usr/local/lib/qt /usr/local/share/qt /usr/lib64/qt3 /usr/lib/qt3 /usr/local/lib64/qt3 /usr/local/lib/qt3 /usr/X11R6/share/qt /usr/qt/3 ; do
|
||||
if [ -d "$p/mkspecs" ]; then
|
||||
QTDIR=$p
|
||||
break;
|
||||
@@ -79,15 +79,15 @@
|
||||
fi
|
||||
fi
|
||||
|
||||
-if [ ! -x "$QTDIR/bin/qmake" ]; then
|
||||
+if [ ! -x "$QTDIR/bin/qmake-tqt3" ]; then
|
||||
if [ "$QC_DEBUG" = "Y" ]; then
|
||||
- echo Warning: qmake not in \$QTDIR/bin/qmake
|
||||
+ echo Warning: qmake-tqt3 not in \$QTDIR/bin/qmake-tqt3
|
||||
echo trying to find it in \$PATH
|
||||
fi
|
||||
- qm=`type -p qmake`
|
||||
+ qm=`type -p qmake-tqt3`
|
||||
if [ -x "$qm" ]; then
|
||||
if [ "$QC_DEBUG" = "Y" ]; then
|
||||
- echo qmake found in $qm
|
||||
+ echo qmake-tqt3 found in $qm
|
||||
fi
|
||||
else
|
||||
echo fail
|
||||
@@ -96,12 +96,12 @@
|
||||
echo or I missdetected \$QTDIR=$QTDIR
|
||||
echo
|
||||
echo Please set \$QTDIR manually and make sure that
|
||||
- echo \$QTDIR/bin/qmake exists.
|
||||
+ echo \$QTDIR/bin/qmake-tqt3 exists.
|
||||
echo
|
||||
exit 1;
|
||||
fi
|
||||
else
|
||||
- qm=$QTDIR/bin/qmake
|
||||
+ qm=$QTDIR/bin/qmake-tqt3
|
||||
fi
|
||||
|
||||
gen_files() {
|
||||
@@ -185,6 +185,8 @@
|
||||
|
||||
// Make sure tqtinterface can be found
|
||||
conf->addIncludePath("/usr/include/tqt");
|
||||
+ // Make sure tqt3 can be found
|
||||
+ conf->addIncludePath("/usr/include/tqt3");
|
||||
|
||||
return true;
|
||||
}
|
||||
@@ -507,7 +509,7 @@
|
||||
TEMPLATE = app
|
||||
CONFIG += qt x11 thread console
|
||||
TARGET = conf
|
||||
-INCLUDEPATH += '/usr/include/tqt'
|
||||
+INCLUDEPATH += '/usr/include/tqt' '/usr/include/tqt3'
|
||||
|
||||
DEFINES += X11_INC='"\$\$QMAKE_INCDIR_X11"'
|
||||
DEFINES += X11_LIBDIR='"\$\$QMAKE_LIBDIR_X11"'
|
||||
@@ -533,7 +535,7 @@
|
||||
)
|
||||
|
||||
if [ "$?" != "0" ]; then
|
||||
- rm -rf .qconftemp
|
||||
+# rm -rf .qconftemp
|
||||
echo fail
|
||||
echo
|
||||
echo "There was an error compiling 'conf'. Be sure you have a proper"
|
||||
@ -1,95 +0,0 @@
|
||||
diff -Nuar tqca.ORI/configure tqca.P/configure
|
||||
--- tqca.ORI/configure 2012-04-24 17:24:02.762426535 -0400
|
||||
+++ tqca.P/configure 2012-04-24 17:41:57.164913623 -0400
|
||||
@@ -8,7 +8,7 @@
|
||||
|
||||
Main options:
|
||||
--prefix=[path] Base path for build/install. Default: /usr/local
|
||||
- --qtdir=[path] Directory where Qt is installed.
|
||||
+ --qtdir=[path] Directory where [T]Qt is installed.
|
||||
--help This help text.
|
||||
|
||||
EOT
|
||||
@@ -37,7 +37,7 @@
|
||||
|
||||
PREFIX=${PREFIX:-/usr/local}
|
||||
|
||||
-echo "Configuring TQt Cryptographic Architecture (QCA) ..."
|
||||
+echo "Configuring TQt Cryptographic Architecture (TQCA) ..."
|
||||
|
||||
if [ "$QC_DEBUG" = "Y" ]; then
|
||||
echo
|
||||
@@ -52,7 +52,7 @@
|
||||
if [ "$QC_DEBUG" = "Y" ]; then
|
||||
echo \$QTDIR not set... trying to find Qt manually
|
||||
fi
|
||||
- for p in /usr/lib/tqt /usr/share/tqt /usr/share/tqt3 /usr/local/lib/tqt /usr/local/share/tqt /usr/lib/tqt3 /usr/local/lib/tqt3 /usr/lib/qt /usr/share/qt /usr/share/qt3 /usr/local/lib/qt /usr/local/share/qt /usr/lib/qt3 /usr/local/lib/qt3 /usr/X11R6/share/qt /usr/qt/3 ; do
|
||||
+ for p in /usr/lib64/tqt /usr/lib/tqt /usr/share/tqt /usr/share/tqt3 /usr/local/lib64/tqt /usr/local/lib/tqt /usr/local/share/tqt /usr/lib64/tqt3 /usr/lib/tqt3 /usr/local/lib64/tqt3 /usr/local/lib/tqt3 /usr/lib64/qt /usr/lib/qt /usr/share/qt /usr/share/qt3 /usr/local/lib64/qt /usr/local/lib/qt /usr/local/share/qt /usr/lib64/qt3 /usr/lib/qt3 /usr/local/lib64/qt3 /usr/local/lib/qt3 /usr/X11R6/share/qt /usr/qt/3 ; do
|
||||
if [ -d "$p/mkspecs" ]; then
|
||||
QTDIR=$p
|
||||
break;
|
||||
@@ -62,7 +62,7 @@
|
||||
echo fail
|
||||
echo
|
||||
echo Unable to find Qt 'mkspecs'. Please set QTDIR
|
||||
- echo manually. Perhaps you need to install Qt 3
|
||||
+ echo manually. Perhaps you need to install [T]Qt 3
|
||||
echo development utilities. You may download them either
|
||||
echo from the vendor of your operating system or from
|
||||
echo www.trolltech.com
|
||||
@@ -71,12 +71,12 @@
|
||||
fi
|
||||
fi
|
||||
|
||||
-if [ ! -x "$QTDIR/bin/qmake" ]; then
|
||||
+if [ ! -x "$QTDIR/bin/qmake-tqt3" ] && [ ! -x "$QTDIR/bin/qmake" ]; then
|
||||
if [ "$QC_DEBUG" = "Y" ]; then
|
||||
echo Warning: qmake not in \$QTDIR/bin/qmake
|
||||
echo trying to find it in \$PATH
|
||||
fi
|
||||
- qm=`type -p qmake`
|
||||
+ qm=`type -p qmake-tqt3 || type -p qmake`
|
||||
if [ -x "$qm" ]; then
|
||||
if [ "$QC_DEBUG" = "Y" ]; then
|
||||
echo qmake found in $qm
|
||||
@@ -93,7 +93,11 @@
|
||||
exit 1;
|
||||
fi
|
||||
else
|
||||
- qm=$QTDIR/bin/qmake
|
||||
+ if [ -x $QTDIR/bin/qmake-tqt3 ]; then
|
||||
+ qm=$QTDIR/bin/qmake-tqt3
|
||||
+ else
|
||||
+ qm=$QTDIR/bin/qmake
|
||||
+ fi
|
||||
fi
|
||||
|
||||
gen_files() {
|
||||
@@ -414,6 +418,7 @@
|
||||
CONFIG += qt x11 thread console
|
||||
TARGET = conf
|
||||
INCLUDEPATH += '/usr/include/tqt'
|
||||
+INCLUDEPATH += '/usr/include/tqt3'
|
||||
|
||||
DEFINES += X11_INC='"\$\$QMAKE_INCDIR_X11"'
|
||||
DEFINES += X11_LIBDIR='"\$\$QMAKE_LIBDIR_X11"'
|
||||
@@ -438,7 +443,7 @@
|
||||
)
|
||||
|
||||
if [ "$?" != "0" ]; then
|
||||
- rm -rf .qconftemp
|
||||
+# rm -rf .qconftemp
|
||||
echo fail
|
||||
echo
|
||||
echo "There was an error compiling 'conf'. Be sure you have a proper"
|
||||
diff -Nuar tqca.ORI/qca.pro tqca.P/qca.pro
|
||||
--- tqca.ORI/qca.pro 2012-04-24 17:24:02.760426575 -0400
|
||||
+++ tqca.P/qca.pro 2012-04-24 17:39:36.323825994 -0400
|
||||
@@ -21,6 +21,7 @@
|
||||
QCA_CPP = src
|
||||
INCLUDEPATH += $$QCA_CPP
|
||||
INCLUDEPATH += /usr/include/tqt
|
||||
+INCLUDEPATH += /usr/include/tqt3
|
||||
|
||||
HEADERS += \
|
||||
$$QCA_CPP/qca.h \
|
||||
@ -1,11 +1,40 @@
|
||||
--- kickoff-i18n-1.0/admin/cvs.sh.ORI 2012-08-03 21:16:36.104888893 +0200
|
||||
+++ kickoff-i18n-1.0/admin/cvs.sh 2012-08-03 21:16:54.488505909 +0200
|
||||
--- kickoff-i18n-1.0/admin/configure.in.min.ORI 2013-06-04 21:34:45.145197643 +0200
|
||||
+++ kickoff-i18n-1.0/admin/configure.in.min 2013-06-04 21:34:54.004020422 +0200
|
||||
@@ -41,7 +41,7 @@
|
||||
KDE_SET_PREFIX
|
||||
|
||||
dnl generate the config header
|
||||
-AM_CONFIG_HEADER(config.h) dnl at the distribution this done
|
||||
+AC_CONFIG_HEADER(config.h) dnl at the distribution this done
|
||||
|
||||
dnl Checks for programs.
|
||||
AC_CHECK_COMPILERS
|
||||
--- kickoff-i18n-1.0/admin/cvs.sh.automake 2007-01-15 10:06:45.000000000 +0100
|
||||
+++ kickoff-i18n-1.0/admin/cvs.sh 2013-06-04 21:34:39.471311140 +0200
|
||||
@@ -68,7 +68,7 @@
|
||||
echo "*** KDE requires automake $required_automake_version"
|
||||
exit 1
|
||||
;;
|
||||
- automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.10*)
|
||||
+ automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.1[012]*)
|
||||
+ automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.1[0-9]*)
|
||||
echo "*** $AUTOMAKE_STRING found."
|
||||
UNSERMAKE=no
|
||||
;;
|
||||
@@ -128,7 +128,7 @@
|
||||
echo "*** Creating configure"
|
||||
call_and_fix_autoconf
|
||||
|
||||
-if egrep "^AM_CONFIG_HEADER" configure.in >/dev/null 2>&1; then
|
||||
+if egrep "^A[CM]_CONFIG_HEADER" configure.in >/dev/null 2>&1; then
|
||||
echo "*** Creating config.h template"
|
||||
$AUTOHEADER || exit 1
|
||||
touch config.h.in
|
||||
@@ -184,7 +184,7 @@
|
||||
fi
|
||||
fi
|
||||
$ACLOCAL $ACLOCALFLAGS
|
||||
-if egrep "^AM_CONFIG_HEADER" configure.in >/dev/null 2>&1; then
|
||||
+if egrep "^A[CM]_CONFIG_HEADER" configure.in >/dev/null 2>&1; then
|
||||
echo "*** Creating config.h template"
|
||||
$AUTOHEADER || exit 1
|
||||
touch config.h.in
|
||||
|
||||
@ -1,11 +1,31 @@
|
||||
--- ksensors-0.7.3/admin/cvs.sh.ORI 2012-10-07 11:06:41.616636004 +0200
|
||||
+++ ksensors-0.7.3/admin/cvs.sh 2012-10-07 11:07:55.975129334 +0200
|
||||
--- ksensors-0.7.3/admin/cvs.sh.autotools 2013-06-04 21:59:18.325691011 +0200
|
||||
+++ ksensors-0.7.3/admin/cvs.sh 2013-06-04 21:58:49.715264098 +0200
|
||||
@@ -64,7 +64,7 @@
|
||||
echo "*** KDE requires automake 1.6.1 or newer"
|
||||
exit 1
|
||||
;;
|
||||
- automake*1.6.* | automake*1.7* ) : ;;
|
||||
+ automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.1[012]* ) : ;;
|
||||
+ automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.1[0-9]* ) : ;;
|
||||
"" )
|
||||
echo "*** AUTOMAKE NOT FOUND!."
|
||||
echo "*** KDE requires automake 1.6.1 or newer"
|
||||
@@ -123,7 +123,7 @@
|
||||
echo "*** Creating configure"
|
||||
call_and_fix_autoconf
|
||||
|
||||
-if egrep "^AM_CONFIG_HEADER" configure.in >/dev/null 2>&1; then
|
||||
+if egrep "^A[CM]_CONFIG_HEADER" configure.in >/dev/null 2>&1; then
|
||||
echo "*** Creating config.h template"
|
||||
$AUTOHEADER || exit 1
|
||||
fi
|
||||
--- ksensors-0.7.3/admin/configure.in.min.ORI 2013-06-04 21:59:24.783561656 +0200
|
||||
+++ ksensors-0.7.3/admin/configure.in.min 2013-06-04 21:59:33.526386508 +0200
|
||||
@@ -41,7 +41,7 @@
|
||||
KDE_SET_PREFIX
|
||||
|
||||
dnl generate the config header
|
||||
-AM_CONFIG_HEADER(config.h) dnl at the distribution this done
|
||||
+AC_CONFIG_HEADER(config.h) dnl at the distribution this done
|
||||
|
||||
dnl Checks for programs.
|
||||
AC_CHECK_COMPILERS
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
<configuration>
|
||||
<dllmap dll="karma" target="libkarma.so.0" />
|
||||
</configuration>
|
||||
@ -1,85 +0,0 @@
|
||||
--- libkarma-0.1.2/karma-sharp/karma-sharp.pc.in.ORI 2012-08-03 13:00:49.786984296 +0200
|
||||
+++ libkarma-0.1.2/karma-sharp/karma-sharp.pc.in 2012-08-03 13:02:39.714283226 +0200
|
||||
@@ -1,8 +1,8 @@
|
||||
prefix=@prefix@
|
||||
-exec_prefix=${prefix}
|
||||
-libdir=${prefix}/lib
|
||||
-includedir=${prefix}/include
|
||||
-Libraries=${prefix}/lib/karma-sharp/karma-sharp.dll
|
||||
+exec_prefix=@prefix@
|
||||
+libdir=@libdir@
|
||||
+includedir=@includedir@
|
||||
+Libraries=${libdir}/karma-sharp/karma-sharp.dll
|
||||
|
||||
Name: karma-sharp
|
||||
Description: karma-sharp - Library for interfacing with Rio Karma devices
|
||||
--- libkarma-0.1.2/src/Makefile.ORI 2012-08-03 13:14:57.231632405 +0200
|
||||
+++ libkarma-0.1.2/src/Makefile 2012-08-03 13:16:05.653554314 +0200
|
||||
@@ -7,6 +7,7 @@
|
||||
INST_HEADERS=lkarma.h utf8.h
|
||||
|
||||
LIBDIR=../lib
|
||||
+LIB=lib
|
||||
|
||||
CC?=gcc
|
||||
AR?=ar
|
||||
@@ -37,19 +38,19 @@
|
||||
default: all
|
||||
|
||||
install: shared-lib-stamp static-lib-stamp
|
||||
- ../install-sh -m 0755 -d $(DESTDIR)$(PREFIX)/lib
|
||||
+ ../install-sh -m 0755 -d $(DESTDIR)$(PREFIX)/$(LIB)
|
||||
../install-sh -m 0755 -d $(DESTDIR)$(PREFIX)/include
|
||||
../install-sh -m 0755 -d $(DESTDIR)$(PREFIX)/include/libkarma
|
||||
- ../install-sh -m 0644 -t $(DESTDIR)$(PREFIX)/lib/ $(LIBDIR)/$(TARGET).a
|
||||
- ../install-sh -m 0755 -t $(DESTDIR)$(PREFIX)/lib/ $(LIBDIR)/$(OUT_VERSION)
|
||||
- $(RM) $(DESTDIR)$(PREFIX)/lib/$(OUT_MAJOR)
|
||||
- $(RM) $(DESTDIR)$(PREFIX)/lib/$(OUT_BASE)
|
||||
- $(LN_S) $(OUT_VERSION) $(DESTDIR)$(PREFIX)/lib/$(OUT_MAJOR)
|
||||
- $(LN_S) $(OUT_VERSION) $(DESTDIR)$(PREFIX)/lib/$(OUT_BASE)
|
||||
+ ../install-sh -m 0644 -t $(DESTDIR)$(PREFIX)/$(LIB)/ $(LIBDIR)/$(TARGET).a
|
||||
+ ../install-sh -m 0755 -t $(DESTDIR)$(PREFIX)/$(LIB)/ $(LIBDIR)/$(OUT_VERSION)
|
||||
+ $(RM) $(DESTDIR)$(PREFIX)/$(LIB)/$(OUT_MAJOR)
|
||||
+ $(RM) $(DESTDIR)$(PREFIX)/$(LIB)/$(OUT_BASE)
|
||||
+ $(LN_S) $(OUT_VERSION) $(DESTDIR)$(PREFIX)/$(LIB)/$(OUT_MAJOR)
|
||||
+ $(LN_S) $(OUT_VERSION) $(DESTDIR)$(PREFIX)/$(LIB)/$(OUT_BASE)
|
||||
../install-sh -m 0644 -t $(DESTDIR)$(PREFIX)/include/libkarma/ $(INST_HEADERS)
|
||||
|
||||
uninstall:
|
||||
- $(RM) $(PREFIX)/lib/$(TARGET).a $(PREFIX)/lib/$(OUT_MAJOR) $(PREFIX)/lib/$(OUT_BASE) $(PREFIX)/lib/$(OUT_VERSION)
|
||||
+ $(RM) $(PREFIX)/$(LIB)/$(TARGET).a $(PREFIX)/$(LIB)/$(OUT_MAJOR) $(PREFIX)/$(LIB)/$(OUT_BASE) $(PREFIX)/$(LIB)/$(OUT_VERSION)
|
||||
$(RM) -r $(PREFIX)/include/libkarma
|
||||
|
||||
OBJS = $(SRCS:.c=.o)
|
||||
--- libkarma-0.1.2/karma-sharp/Makefile.ORI 2012-08-03 13:21:02.657679440 +0200
|
||||
+++ libkarma-0.1.2/karma-sharp/Makefile 2012-08-03 13:21:07.144597685 +0200
|
||||
@@ -22,22 +22,23 @@
|
||||
|
||||
karma-sharp.pc: FORCE
|
||||
sed -e 's,@prefix@,$(PREFIX),g; s,@VERSION@,$(VERSION),g' \
|
||||
+ -e 's,@libdir@,$(PREFIX)/$(LIB),g; s,@includedir@,$(PREFIX)/include,g;' \
|
||||
karma-sharp.pc.in > karma-sharp.pc
|
||||
|
||||
ifdef HAS_MONO
|
||||
install: $(ASSEMBLY) karma-sharp.pc $(ASSEMBLY).config
|
||||
- ../install-sh -d $(DESTDIR)$(PREFIX)/lib/karma-sharp
|
||||
- ../install-sh -d $(DESTDIR)$(PREFIX)/lib/pkgconfig
|
||||
- ../install-sh -t $(DESTDIR)$(PREFIX)/lib/karma-sharp $(ASSEMBLY) $(ASSEMBLY).config
|
||||
- ../install-sh -t $(DESTDIR)$(PREFIX)/lib/pkgconfig -m 0644 karma-sharp.pc
|
||||
+ ../install-sh -d $(DESTDIR)$(PREFIX)/$(LIB)/karma-sharp
|
||||
+ ../install-sh -d $(DESTDIR)$(PREFIX)/$(LIB)/pkgconfig
|
||||
+ ../install-sh -t $(DESTDIR)$(PREFIX)/$(LIB)/karma-sharp $(ASSEMBLY) $(ASSEMBLY).config
|
||||
+ ../install-sh -t $(DESTDIR)$(PREFIX)/$(LIB)/pkgconfig -m 0644 karma-sharp.pc
|
||||
else
|
||||
install:
|
||||
|
||||
endif
|
||||
|
||||
uninstall: FORCE
|
||||
- $(RM) -r $(PREFIX)/lib/karma-sharp
|
||||
- $(RM) $(PREFIX)/lib/pkgconfig/karma-sharp.pc
|
||||
+ $(RM) -r $(PREFIX)/$(LIB)/karma-sharp
|
||||
+ $(RM) $(PREFIX)/$(LIB)/pkgconfig/karma-sharp.pc
|
||||
|
||||
$(ASSEMBLY): $(ASSEMBLY_SOURCES) $(ASSEMBLY_RESOURCES)
|
||||
$(MCS) $(MCS_FLAGS) -unsafe -target:library -out:$@ $(ASSEMBLY_SOURCES) $(ASSEMBLY_RESOURCES:%=-resource:%) -r:Mono.Posix
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 1.7 KiB |
@ -1,19 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?> <!-- -*- SGML -*- -->
|
||||
|
||||
<deviceinfo version="0.2">
|
||||
<device>
|
||||
<match key="info.udi" string="/org/freedesktop/Hal/devices/storage_serial_Rio_Rio_Karma_0000000000000000">
|
||||
<merge key="storage.policy.should_mount" type="bool">true</merge>
|
||||
<merge key="storage.policy.is_removable" type="bool">true</merge>
|
||||
<merge key="storage.policy.default.mount_root" type="string">/media</merge>
|
||||
</match>
|
||||
</device>
|
||||
|
||||
<device>
|
||||
<match key="info.udi" string="/org/freedesktop/Hal/devices/volume_part2_size_19919976960">
|
||||
<merge key="volume.policy.desired_mount_point" type="string">karma</merge>
|
||||
<merge key="volume.policy.mount_filesystem" type="string">omfs</merge>
|
||||
</match>
|
||||
</device>
|
||||
</deviceinfo>
|
||||
|
||||
@ -1,11 +1,40 @@
|
||||
--- ia_ora-kde-1.0.8/admin/cvs.sh.ORI 2012-08-03 22:52:42.259238606 +0200
|
||||
+++ ia_ora-kde-1.0.8/admin/cvs.sh 2012-08-03 22:52:49.735803751 +0200
|
||||
--- ia_ora-kde-1.0.8/admin/configure.in.min.ORI 2013-06-04 22:06:43.320769735 +0200
|
||||
+++ ia_ora-kde-1.0.8/admin/configure.in.min 2013-06-04 22:06:49.748640759 +0200
|
||||
@@ -41,7 +41,7 @@
|
||||
KDE_SET_PREFIX
|
||||
|
||||
dnl generate the config header
|
||||
-AM_CONFIG_HEADER(config.h) dnl at the distribution this done
|
||||
+AC_CONFIG_HEADER(config.h) dnl at the distribution this done
|
||||
|
||||
dnl Checks for programs.
|
||||
AC_CHECK_COMPILERS
|
||||
--- ia_ora-kde-1.0.8/admin/cvs.sh.automake11 2007-08-23 21:48:58.000000000 +0200
|
||||
+++ ia_ora-kde-1.0.8/admin/cvs.sh 2013-06-04 22:06:38.413868181 +0200
|
||||
@@ -68,7 +68,7 @@
|
||||
echo "*** KDE requires automake $required_automake_version"
|
||||
exit 1
|
||||
;;
|
||||
- automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.10* )
|
||||
+ automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.1[012]* )
|
||||
+ automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.1[0-9]* )
|
||||
echo "*** $AUTOMAKE_STRING found."
|
||||
UNSERMAKE=no
|
||||
;;
|
||||
@@ -128,7 +128,7 @@
|
||||
echo "*** Creating configure"
|
||||
call_and_fix_autoconf
|
||||
|
||||
-if egrep "^AM_CONFIG_HEADER" configure.in >/dev/null 2>&1; then
|
||||
+if egrep "^A[CM]_CONFIG_HEADER" configure.in >/dev/null 2>&1; then
|
||||
echo "*** Creating config.h template"
|
||||
$AUTOHEADER || exit 1
|
||||
touch config.h.in
|
||||
@@ -184,7 +184,7 @@
|
||||
fi
|
||||
fi
|
||||
$ACLOCAL $ACLOCALFLAGS
|
||||
-if egrep "^AM_CONFIG_HEADER" configure.in >/dev/null 2>&1; then
|
||||
+if egrep "^A[CM]_CONFIG_HEADER" configure.in >/dev/null 2>&1; then
|
||||
echo "*** Creating config.h template"
|
||||
$AUTOHEADER || exit 1
|
||||
touch config.h.in
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
[Dolphin]
|
||||
Sorting=6
|
||||
Timestamp=2008,11,20,16,19,31
|
||||
@ -1,3 +0,0 @@
|
||||
[Dolphin]
|
||||
Sorting=6
|
||||
Timestamp=2008,11,20,16,19,31
|
||||
@ -1,3 +0,0 @@
|
||||
[Dolphin]
|
||||
Sorting=6
|
||||
Timestamp=2008,11,20,16,19,31
|
||||
@ -1,3 +0,0 @@
|
||||
[Dolphin]
|
||||
Sorting=6
|
||||
Timestamp=2008,11,20,16,19,31
|
||||
@ -1,3 +0,0 @@
|
||||
[Dolphin]
|
||||
Sorting=6
|
||||
Timestamp=2008,11,20,16,19,31
|
||||
Loading…
Reference in new issue