[devel] kdenonbeta/kdedebian/kalternatives
Juanjo Alvarez <[email protected]> Wed, 6 Oct 2004 23:53:38 +0200 (CEST)
| Newsgroups | gmane.comp.kde.devel.debian |
|---|---|
| Message-ID | <20041006215338.9914216AE5__34555.5569664159$1097099643$gmane$org@office.kde.org> |
CVS commit by juanjux:
microfix
M +2 -2 configure.in.in 1.3
M +8 -4 src/altitemelement.cpp 1.12
--- kdenonbeta/kdedebian/kalternatives/configure.in.in #1.2:1.3
@@ -5,6 +5,6 @@
AC_CHECK_KDEMAXPATHLEN
-AC_CHECK_FILE(/var/lib/dpkg/alternatives, [AC_DEFINE([DEBIAN], [], [debian]) AC_MSG_NOTICE(it is a debian)],
-[AC_CHECK_FILE(/var/lib/rpm/alternatives,
+AC_CHECK_FILE(/etc/debian-release, [AC_DEFINE([DEBIAN], [], [debian]) AC_MSG_NOTICE(it is a debian)],
+[AC_CHECK_FILE(/etc/mandrakelinux-release,
[AC_DEFINE([MANDRAKE], [], [mandrake]) AC_MSG_NOTICE(it is a mandrake)],
[AC_MSG_NOTICE(it is an other distribution)])])
--- kdenonbeta/kdedebian/kalternatives/src/altitemelement.cpp #1.11:1.12
@@ -166,11 +166,15 @@ QString FindDescriptionThread::getDescri
#ifdef DEBIAN
int posDesc = m_descTmp.findRev("Description:");
+ if (posDesc != -1)
+ {
+ m_descTmp.remove(0, posDesc+12);
+ }
#else
int posDesc = m_descTmp.findRev("Description :");
-#endif
if (posDesc != -1)
{
m_descTmp.remove(0, posDesc+13);
}
+#endif
}