Bug#595137: unblock: kdesvn/1.5.4-1
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Please unblock package kdesvn
1.5.4-1 is a bug fix only release which fixes two bugs:
http://kdesvn.alwins-world.de/ticket/804
http://kdesvn.alwins-world.de/ticket/805
(sorry, no Debian bug reports).
It also contains a few translation updates and some packaging cleanup.
debdiff (minus translations) is attached.
Thanks for considering
unblock kdesvn/1.5.4-1
-- System Information:
Debian Release: squeeze/sid
APT prefers unstable
APT policy: (500, 'unstable'), (1, 'experimental')
Architecture: i386 (i686)
Kernel: Linux 2.6.32-5-686 (SMP w/1 CPU core)
Locale: LANG=de_DE.utf8, LC_CTYPE=de_DE.utf8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru kdesvn-1.5.3/ChangeLog kdesvn-1.5.4/ChangeLog
--- kdesvn-1.5.3/ChangeLog 2010-04-09 10:31:42.000000000 +0200
+++ kdesvn-1.5.4/ChangeLog 2010-08-19 20:53:13.000000000 +0200
@@ -1,3 +1,6 @@
+version 1.5.4:
+ * fixed problem ssh-askpass environment (ticket #805)
+
version 1.5.3:
* fixed a problem with some svn servers where version of server and svn-filesystem differs (ticket #765)
* fixed wrong default depth for update in svnqt and frontend
diff -Nru kdesvn-1.5.3/CMakeLists.txt kdesvn-1.5.4/CMakeLists.txt
--- kdesvn-1.5.3/CMakeLists.txt 2010-04-09 10:31:42.000000000 +0200
+++ kdesvn-1.5.4/CMakeLists.txt 2010-07-23 15:07:48.000000000 +0200
@@ -25,7 +25,7 @@
ELSE (CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION EQUAL 4)
CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
ENDIF (CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION EQUAL 4)
-SET(BASE_VERSION 1.5.3)
+SET(BASE_VERSION 1.5.4)
OPTION(BUILD_TESTS "Building the tests yes or no (default off)")
diff -Nru kdesvn-1.5.3/debian/changelog kdesvn-1.5.4/debian/changelog
--- kdesvn-1.5.3/debian/changelog 2010-06-01 23:54:06.000000000 +0200
+++ kdesvn-1.5.4/debian/changelog 2010-08-24 22:14:06.000000000 +0200
@@ -1,3 +1,13 @@
+kdesvn (1.5.4-1) unstable; urgency=low
+
+ * New upstream release.
+ * debian/control
+ - Bump Standards-Version to 3.9.1.
+ - Use Breaks instead of Conflicts as recommended by the new policy.
+ - Drop old Conflicts against kdesdk-misc which is no longer necessary.
+
+ -- Michael Biebl <biebl@debian.org> Tue, 24 Aug 2010 22:14:04 +0200
+
kdesvn (1.5.3-2) unstable; urgency=low
* Install KDE 4 HTML documentation to /usr/share/doc/kde/HTML.
diff -Nru kdesvn-1.5.3/debian/control kdesvn-1.5.4/debian/control
--- kdesvn-1.5.3/debian/control 2010-06-01 23:27:29.000000000 +0200
+++ kdesvn-1.5.4/debian/control 2010-08-24 22:12:28.000000000 +0200
@@ -4,7 +4,7 @@
Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>
Uploaders: Michael Biebl <biebl@debian.org>
Build-Depends: debhelper (>= 7.3.16), cmake (>= 2.4), kdelibs5-dev, libsvn-dev (>= 1.2.0), libssl-dev (>= 0.9.8a), libsqlite3-dev, gettext, pkg-kde-tools (>= 0.9)
-Standards-Version: 3.8.4
+Standards-Version: 3.9.1
Vcs-Svn: svn://svn.debian.org/pkg-kde/kde-extras/kdesvn/trunk/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-kde/kde-extras/kdesvn/trunk/
Homepage: http://kdesvn.alwins-world.de/
@@ -24,8 +24,6 @@
Section: libdevel
Architecture: any
Depends: libsvnqt6 (= ${binary:Version}), ${misc:Depends}, libqt4-dev, libsvn-dev
-Conflicts: libsvnqt4-dev
-Replaces: libsvnqt4-dev
Description: Qt wrapper library for Subversion (development files)
This package contains the header files and symbolic links that developers
using svnqt will need.
@@ -48,7 +46,7 @@
Section: vcs
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
-Conflicts: kdesdk-misc (<< 4:3.5.0-1), kdesdk-kio-plugins (>= 4:4.0.0)
+Breaks: kdesdk-kio-plugins (>= 4:4.0.0)
Replaces: kdesdk-kio-plugins (>= 4:4.0.0)
Description: Subversion I/O slaves for KDE
This package includes KIO slaves for svn, svn+file, svn+http,
Binärdateien /tmp/bfOI5LVfTQ/kdesvn-1.5.3/doc/en/index.cache.bz2 and /tmp/885f4GBjct/kdesvn-1.5.4/doc/en/index.cache.bz2 sind verschieden.
Binärdateien /tmp/bfOI5LVfTQ/kdesvn-1.5.3/doc/nl/index.cache.bz2 and /tmp/885f4GBjct/kdesvn-1.5.4/doc/nl/index.cache.bz2 sind verschieden.
diff -Nru kdesvn-1.5.3/INSTALL-cmake kdesvn-1.5.4/INSTALL-cmake
--- kdesvn-1.5.3/INSTALL-cmake 2007-08-20 11:10:43.000000000 +0200
+++ kdesvn-1.5.4/INSTALL-cmake 2010-07-08 14:55:28.000000000 +0200
@@ -18,7 +18,7 @@
Prepare install
===============
-You require at least cmake 2.4, kde 3.4.x and subversion 1.2. In source-tree-build are mostly unwanted, so
+You require at least cmake 2.4, kde 4.2 and subversion 1.4. In source-tree-build are mostly unwanted, so
make a subdir called "kdesvn-build" and change to it.
Basic installation
diff -Nru kdesvn-1.5.3/kdesvn.spec kdesvn-1.5.4/kdesvn.spec
--- kdesvn-1.5.3/kdesvn.spec 2010-04-09 10:41:58.000000000 +0200
+++ kdesvn-1.5.4/kdesvn.spec 2010-08-19 21:06:30.000000000 +0200
@@ -1,7 +1,7 @@
# norootforbuild
Summary: A subversion client for the KDE with KIO integration.
Name: kdesvn
-Version: 1.5.3
+Version: 1.5.4
Release: 1%{?dist}
License: LGPL
Vendor: Rajko Albrecht <ral@alwins-world.de>
diff -Nru kdesvn-1.5.3/po/de.po kdesvn-1.5.4/po/de.po
diff -Nru kdesvn-1.5.3/po/es.po kdesvn-1.5.4/po/es.po
diff -Nru kdesvn-1.5.3/po/fr.po kdesvn-1.5.4/po/fr.po
diff -Nru kdesvn-1.5.3/po/ja.po kdesvn-1.5.4/po/ja.po
diff -Nru kdesvn-1.5.3/po/lt.po kdesvn-1.5.4/po/lt.po
diff -Nru kdesvn-1.5.3/po/pt_BR.po kdesvn-1.5.4/po/pt_BR.po
diff -Nru kdesvn-1.5.3/po/ro.po kdesvn-1.5.4/po/ro.po
diff -Nru kdesvn-1.5.3/src/helpers/sshagent.cpp kdesvn-1.5.4/src/helpers/sshagent.cpp
--- kdesvn-1.5.3/src/helpers/sshagent.cpp 2009-08-16 23:14:31.000000000 +0200
+++ kdesvn-1.5.4/src/helpers/sshagent.cpp 2010-08-19 20:36:28.000000000 +0200
@@ -79,29 +79,6 @@
m_authSock = QString::fromLocal8Bit(sock);
/* make sure that we have a askpass program.
* on some systems something like that isn't installed.*/
-#ifdef FORCE_ASKPASS
- kDebug(9510)<<"Using test askpass"<<endl;
-#ifdef HAS_SETENV
- ::setenv("SSH_ASKPASS",FORCE_ASKPASS,1);
-#else
- ::putenv("SSH_ASKPASS="FORCE_ASKPASS);
-#endif
-#else
- QString pro = BIN_INSTALL_DIR;
- if (pro.size()>0) {
- pro.append("/");
- }
- pro.append("kdesvnaskpass");
-#ifdef HAS_SETENV
- ::setenv("SSH_ASKPASS", pro.toAscii(),1);
-#else
- pro = "SSH_ASKPASS="+pro;
- ::putenv(pro.toAscii());
-#endif
-/*
- }
-*/
-#endif
m_isOurAgent = false;
m_isRunning = true;
}
@@ -111,10 +88,34 @@
m_isOurAgent = true;
m_isRunning = startSshAgent();
}
-
+ askPassEnv();
return m_isRunning;
}
+void SshAgent::askPassEnv()
+{
+#ifdef FORCE_ASKPASS
+ kDebug(9510)<<"Using test askpass"<<endl;
+#ifdef HAS_SETENV
+ ::setenv("SSH_ASKPASS",FORCE_ASKPASS,1);
+#else
+ ::putenv("SSH_ASKPASS="FORCE_ASKPASS);
+#endif
+#else
+ QString pro = BIN_INSTALL_DIR;
+ if (pro.size()>0) {
+ pro.append("/");
+ }
+ pro.append("kdesvnaskpass");
+#ifdef HAS_SETENV
+ ::setenv("SSH_ASKPASS", pro.toAscii(),1);
+#else
+ pro = "SSH_ASKPASS="+pro;
+ ::putenv(pro.toAscii());
+#endif
+#endif
+}
+
bool SshAgent::addSshIdentities(bool force)
{
@@ -137,6 +138,7 @@
kDebug(9510)<<"Using test askpass"<<endl;
proc.setEnv("SSH_ASKPASS",FORCE_ASKPASS);
#else
+ kDebug(9510) << "Using kdesvnaskpass"<<endl;
proc.setEnv("SSH_ASKPASS", "kdesvnaskpass");
#endif
@@ -146,6 +148,7 @@
proc.waitForFinished(-1);
m_addIdentitiesDone = proc.exitStatus()==QProcess::NormalExit && proc.exitStatus() == 0;
+ askPassEnv();
return m_addIdentitiesDone;
}
diff -Nru kdesvn-1.5.3/src/helpers/sshagent.h kdesvn-1.5.4/src/helpers/sshagent.h
--- kdesvn-1.5.3/src/helpers/sshagent.h 2009-08-16 23:14:31.000000000 +0200
+++ kdesvn-1.5.4/src/helpers/sshagent.h 2010-08-19 20:36:28.000000000 +0200
@@ -53,6 +53,7 @@
private:
bool startSshAgent();
+ void askPassEnv();
QString m_Output;
diff -Nru kdesvn-1.5.3/src/ksvnwidgets/encodingselector_impl.h kdesvn-1.5.4/src/ksvnwidgets/encodingselector_impl.h
--- kdesvn-1.5.3/src/ksvnwidgets/encodingselector_impl.h 2009-08-16 23:14:31.000000000 +0200
+++ kdesvn-1.5.4/src/ksvnwidgets/encodingselector_impl.h 2010-07-23 15:00:15.000000000 +0200
@@ -33,7 +33,7 @@
void setCurrentEncoding(const QString&cur);
-protected slots:
+protected Q_SLOTS:
virtual void itemActivated(int);
signals:
diff -Nru kdesvn-1.5.3/src/ksvnwidgets/encodingselector.ui kdesvn-1.5.4/src/ksvnwidgets/encodingselector.ui
--- kdesvn-1.5.3/src/ksvnwidgets/encodingselector.ui 2009-03-28 18:27:58.000000000 +0100
+++ kdesvn-1.5.4/src/ksvnwidgets/encodingselector.ui 2010-07-23 15:00:15.000000000 +0200
@@ -1,48 +1,49 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
<author>Rajko Albrecht</author>
<class>EncodingSelector</class>
- <widget class="QWidget" name="EncodingSelector" >
- <property name="geometry" >
+ <widget class="QWidget" name="EncodingSelector">
+ <property name="geometry">
<rect>
<x>0</x>
<y>0</y>
- <width>288</width>
- <height>45</height>
+ <width>409</width>
+ <height>36</height>
</rect>
</property>
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="windowTitle" >
+ <property name="windowTitle">
<string>Form1</string>
</property>
- <layout class="QHBoxLayout" name="horizontalLayout" >
+ <layout class="QHBoxLayout" name="horizontalLayout">
<item>
- <widget class="QLabel" name="m_Mainlabel" >
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Minimum" hsizetype="Minimum" >
+ <widget class="QLabel" name="m_Mainlabel">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="text" >
+ <property name="text">
<string>Select encoding:</string>
</property>
- <property name="alignment" >
+ <property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
- <property name="wordWrap" >
+ <property name="wordWrap">
<bool>false</bool>
</property>
</widget>
</item>
<item>
- <widget class="KComboBox" name="m_encodingList" >
+ <widget class="KComboBox" name="m_encodingList">
<item>
- <property name="text" >
+ <property name="text">
<string>Default utf-8</string>
</property>
</item>
@@ -50,7 +51,7 @@
</item>
</layout>
</widget>
- <layoutdefault spacing="6" margin="11" />
+ <layoutdefault spacing="6" margin="11"/>
<customwidgets>
<customwidget>
<class>KComboBox</class>
@@ -59,5 +60,25 @@
</customwidget>
</customwidgets>
<resources/>
- <connections/>
+ <connections>
+ <connection>
+ <sender>m_encodingList</sender>
+ <signal>activated(int)</signal>
+ <receiver>EncodingSelector</receiver>
+ <slot>itemActivated(int)</slot>
+ <hints>
+ <hint type="sourcelabel">
+ <x>381</x>
+ <y>31</y>
+ </hint>
+ <hint type="destinationlabel">
+ <x>251</x>
+ <y>35</y>
+ </hint>
+ </hints>
+ </connection>
+ </connections>
+ <slots>
+ <slot>itemActivated(int)</slot>
+ </slots>
</ui>
Reply to: