rev 13793 - in kde-extras/kdesvn/trunk: . debian debian/patches
Michael Biebl
biebl at alioth.debian.org
Tue Feb 17 10:11:12 UTC 2009
Author: biebl
Date: 2009-02-17 10:11:12 +0000 (Tue, 17 Feb 2009)
New Revision: 13793
Added:
kde-extras/kdesvn/trunk/debian/libsvnqt5.install
Removed:
kde-extras/kdesvn/trunk/debian/libsvnqt4.install
kde-extras/kdesvn/trunk/debian/man/
kde-extras/kdesvn/trunk/debian/patches/01-shortcuts.patch
Modified:
kde-extras/kdesvn/trunk/
kde-extras/kdesvn/trunk/debian/changelog
kde-extras/kdesvn/trunk/debian/control
kde-extras/kdesvn/trunk/debian/kdesvn-kio-plugins.install
kde-extras/kdesvn/trunk/debian/kdesvn.install
kde-extras/kdesvn/trunk/debian/kdesvn.manpages
kde-extras/kdesvn/trunk/debian/libsvnqt-dev.install
kde-extras/kdesvn/trunk/debian/patches/series
kde-extras/kdesvn/trunk/debian/rules
Log:
Merged revisions 12395-12399,12440,12459-12460,12638,12678-12680,13299-13303,13430-13433 via svnmerge from
svn+ssh://biebl@svn.debian.org/svn/pkg-kde/kde-extras/kdesvn/branches/experimental
........
r12395 | biebl | 2008-10-11 12:37:31 +0200 (Sa, 11 Okt 2008) | 4 lines
* First upstream release of the KDE 4 port.
* debian/control
- Update Build-Depends from kdelibs4-dev to kdelibs5-dev.
- Update Depends of libsvnqt-dev from libqt3-mt-dev to libqt4-dev.
........
r12396 | biebl | 2008-10-11 12:46:01 +0200 (Sa, 11 Okt 2008) | 2 lines
Rename libsvnqt4 binary package to libsvnqt4-5. The soname has been bumped
and the library is now called libsvnqt4.
........
r12397 | biebl | 2008-10-11 12:49:46 +0200 (Sa, 11 Okt 2008) | 2 lines
* debian/*.install
- Update install files.
........
r12398 | biebl | 2008-10-11 14:04:55 +0200 (Sa, 11 Okt 2008) | 2 lines
* debian/patches/01-shortcuts.patch
- Update to the new code base.
........
r12399 | biebl | 2008-10-11 14:06:24 +0200 (Sa, 11 Okt 2008) | 2 lines
* debian/patches/00-toolbar-actions.patch
- Unclutter the toolbar. Patch cherry-picked from upstream svn.
........
r12440 | biebl | 2008-10-17 15:54:48 +0200 (Fr, 17 Okt 2008) | 2 lines
Add kdesvn-dbg package which provides the debug symbols.
Thanks to Ra?\195?\186l S?\195?\161nchez Siles for the patch. Closes: #447521
........
r12459 | biebl | 2008-10-24 18:05:17 +0200 (Fr, 24 Okt 2008) | 4 lines
* First upstream release of the KDE 4 port. Closes: #502176
* Rename libsvnqt-dev binary package to libsvnqt4-dev to match the new
library name. The old Qt 3 version and this new Qt 4 based version can be
installed in parallel. Closes: #440591
........
r12460 | biebl | 2008-10-24 18:20:42 +0200 (Fr, 24 Okt 2008) | 1 line
Upload to experimental
........
r12638 | biebl | 2008-11-15 13:01:38 +0100 (Sa, 15 Nov 2008) | 1 line
New upstream release.
........
r12678 | biebl | 2008-11-18 15:45:38 +0100 (Di, 18 Nov 2008) | 4 lines
* debian/patches/00-toolbar-actions.patch
- Removed, merged upstream.
* debian/patches/01-shortcuts.patch
- Removed, merged upstream.
........
r12679 | biebl | 2008-11-18 16:56:05 +0100 (Di, 18 Nov 2008) | 7 lines
The header files are now in an unversioned directory again and according
to upstream it was never a goal to make the devel packages coinstallable,
i.e. the versioned include directory in previous 1.2.x versions was a
glitch.
As a consequence the devel package is renamed to libsvnqt-dev again and
has a Conflicts/Replaces against libsvnqt4-dev to ensure proper upgrades
from the previous upload.
........
r12680 | biebl | 2008-11-18 16:56:26 +0100 (Di, 18 Nov 2008) | 1 line
Upload to experimental
........
r13299 | biebl | 2009-01-11 01:13:59 +0100 (So, 11 Jan 2009) | 4 lines
* debian/control
- Update the Conflicts with kdesdk-kio-plugins to (>= 4:4.0.0). Kdesvn is
a KDE 4 application now and only conflicts with the KDE 4 version of
kdesdk-kio-plugins. Closes: #503914
........
r13300 | biebl | 2009-01-11 01:49:11 +0100 (So, 11 Jan 2009) | 1 line
Fix spelling error in package description: s/subversion/Subversion/
........
r13301 | biebl | 2009-01-11 01:51:56 +0100 (So, 11 Jan 2009) | 2 lines
- Add ${misc:Depends} to all binary packages.
- Misc white space cleanups.
........
r13302 | biebl | 2009-01-11 01:56:53 +0100 (So, 11 Jan 2009) | 2 lines
* debian/rules
- Add dh_desktop call for the kdesvn package.
........
r13303 | biebl | 2009-01-11 02:09:35 +0100 (So, 11 Jan 2009) | 1 line
Upload to experimental
........
r13430 | biebl | 2009-01-20 14:06:53 +0100 (Di, 20 Jan 2009) | 1 line
New upstream release.
........
r13431 | biebl | 2009-01-20 14:12:06 +0100 (Di, 20 Jan 2009) | 4 lines
* debian/man/
- Removed, all relevant changes were merged upstream. Closes: #512379
* debian/kdesvn.manpages
- Install the man pages provided by upstream.
........
r13432 | biebl | 2009-01-20 14:33:53 +0100 (Di, 20 Jan 2009) | 2 lines
Rename libsvnqt4-5 to libsvnqt5 as upstream has dropped the Qt 4 version
number from the library name again.
........
r13433 | biebl | 2009-01-20 14:34:42 +0100 (Di, 20 Jan 2009) | 1 line
Upload to experimental
........
Property changes on: kde-extras/kdesvn/trunk
___________________________________________________________________
Name: svnmerge-integrated
- /kde-extras/kdesvn/branches/experimental:1-12394
+ /kde-extras/kdesvn/branches/experimental:1-13792
Modified: kde-extras/kdesvn/trunk/debian/changelog
===================================================================
--- kde-extras/kdesvn/trunk/debian/changelog 2009-02-17 10:00:58 UTC (rev 13792)
+++ kde-extras/kdesvn/trunk/debian/changelog 2009-02-17 10:11:12 UTC (rev 13793)
@@ -1,3 +1,68 @@
+kdesvn (1.2.3-1) experimental; urgency=low
+
+ * New upstream release.
+ * debian/man/
+ - Removed, all relevant changes were merged upstream. Closes: #512379
+ * debian/kdesvn.manpages
+ - Install the man pages provided by upstream.
+ * Rename libsvnqt4-5 to libsvnqt5 as upstream has dropped the Qt 4 version
+ number from the library name again.
+
+ -- Michael Biebl <biebl at debian.org> Tue, 20 Jan 2009 14:34:30 +0100
+
+kdesvn (1.2.2-2) experimental; urgency=low
+
+ * debian/control
+ - Update the Conflicts with kdesdk-kio-plugins to (>= 4:4.0.0). Kdesvn is
+ a KDE 4 application now and only conflicts with the KDE 4 version of
+ kdesdk-kio-plugins. Closes: #503914
+ - Fix spelling error in package description: s/subversion/Subversion/
+ - Add ${misc:Depends} to all binary packages.
+ - Misc white space cleanups.
+ * debian/rules
+ - Add dh_desktop call for the kdesvn package.
+
+ -- Michael Biebl <biebl at debian.org> Sun, 11 Jan 2009 02:08:42 +0100
+
+kdesvn (1.2.2-1) experimental; urgency=low
+
+ * New upstream release.
+ * debian/patches/00-toolbar-actions.patch
+ - Removed, merged upstream.
+ * debian/patches/01-shortcuts.patch
+ - Removed, merged upstream.
+ * The header files are now in an unversioned directory again and according
+ to upstream it was never a goal to make the devel packages coinstallable,
+ i.e. the versioned include directory in previous 1.2.x versions was a
+ glitch.
+ As a consequence the devel package is renamed to libsvnqt-dev again and
+ has a Conflicts/Replaces against libsvnqt4-dev to ensure proper upgrades
+ from the previous upload.
+
+ -- Michael Biebl <biebl at debian.org> Tue, 18 Nov 2008 16:49:00 +0100
+
+kdesvn (1.2.1-1) experimental; urgency=low
+
+ * First upstream release of the KDE 4 port. Closes: #502176
+ * debian/control
+ - Update Build-Depends from kdelibs4-dev to kdelibs5-dev.
+ - Update Depends of libsvnqt-dev from libqt3-mt-dev to libqt4-dev.
+ * Rename libsvnqt4 binary package to libsvnqt4-5. The soname has been bumped
+ and the library is now called libsvnqt4.
+ * Rename libsvnqt-dev binary package to libsvnqt4-dev to match the new
+ library name. The old Qt 3 version and this new Qt 4 based version can be
+ installed in parallel. Closes: #440591
+ * debian/*.install
+ - Update install files.
+ * debian/patches/01-shortcuts.patch
+ - Update to the new code base.
+ * debian/patches/00-toolbar-actions.patch
+ - Unclutter the toolbar. Patch cherry-picked from upstream svn.
+ * Add kdesvn-dbg package which provides the debug symbols.
+ Thanks to Raúl Sánchez Siles for the patch. Closes: #447521
+
+ -- Michael Biebl <biebl at debian.org> Fri, 24 Oct 2008 18:19:51 +0200
+
kdesvn (1.0.4-2) unstable; urgency=low
* debian/control
Modified: kde-extras/kdesvn/trunk/debian/control
===================================================================
--- kde-extras/kdesvn/trunk/debian/control 2009-02-17 10:00:58 UTC (rev 13792)
+++ kde-extras/kdesvn/trunk/debian/control 2009-02-17 10:11:12 UTC (rev 13793)
@@ -3,28 +3,30 @@
Priority: optional
Maintainer: Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>
Uploaders: Michael Biebl <biebl at debian.org>
-Build-Depends: cdbs (>= 0.4.50), debhelper (>= 5.0.0), cmake (>= 2.4), kdelibs4-dev (>= 4:3.4.3-2), libsvn-dev (>= 1.2.0), libssl-dev (>= 0.9.8a), libsqlite3-dev, gettext, quilt
+Build-Depends: cdbs (>= 0.4.50), debhelper (>= 5.0.0), cmake (>= 2.4), kdelibs5-dev, libsvn-dev (>= 1.2.0), libssl-dev (>= 0.9.8a), libsqlite3-dev, gettext, quilt
Standards-Version: 3.8.0
Vcs-Svn: svn://svn.debian.org/svn/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/
-Package: libsvnqt4
+Package: libsvnqt5
Section: libs
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: Qt wrapper library for subversion
- This package provides svnqt, a Qt wrapper library around the
- subversion library.
+Description: Qt wrapper library for Subversion
+ This package provides svnqt, a Qt wrapper library around the
+ Subversion library.
.
- It is based on the RapidSvn SvnCpp library, a subversion client API
+ It is based on the RapidSvn SvnCpp library, a Subversion client API
written in C++.
Package: libsvnqt-dev
Section: libdevel
Architecture: any
-Depends: libsvnqt4 (= ${binary:Version}), libqt3-mt-dev, libsvn-dev
-Description: Qt wrapper library for subversion (development files)
+Depends: libsvnqt5 (= ${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.
@@ -34,23 +36,38 @@
Depends: ${shlibs:Depends}, ${misc:Depends}, kdesvn-kio-plugins (= ${binary:Version})
Recommends: kompare, graphviz
Suggests: khelpcenter, kdiff3
-Description: subversion client with tight KDE integration
- KDESvn is a graphical client for the subversion revision control
+Description: Subversion client with tight KDE integration
+ KDESvn is a graphical client for the Subversion revision control
system (svn).
.
Besides offering common and advanced svn operations, it features
- a tight integration into KDE and can be embedded into other KDE
+ a tight integration into KDE and can be embedded into other KDE
applications like konqueror via the KDE component technology KParts.
Package: kdesvn-kio-plugins
Section: devel
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
-Conflicts: kdesdk-misc (<< 4:3.5.0-1), kdesdk-kio-plugins (<< 4:4.0.0)
-Replaces: kdesdk-kio-plugins (<< 4:4.0.0)
-Description: subversion I/O slaves for KDE
- This packages includes KIO slaves for svn, svn+file, svn+http,
- svn+https, svn+ssh. This allows you to access subversion repositories
+Conflicts: kdesdk-misc (<< 4:3.5.0-1), kdesdk-kio-plugins (>= 4:4.0.0)
+Replaces: kdesdk-kio-plugins (>= 4:4.0.0)
+Description: Subversion I/O slaves for KDE
+ This packages includes KIO slaves for svn, svn+file, svn+http,
+ svn+https, svn+ssh. This allows you to access Subversion repositories
inside any KIO enabled KDE application.
.
This package is part of kdesvn.
+
+Package: kdesvn-dbg
+Section: devel
+Architecture: any
+Priority: extra
+Depends: kdesvn (= ${binary:Version}) , libsvnqt5 (= ${binary:Version}), ${misc:Depends}
+Description: debug symbols for kdesvn
+ KDESvn is a graphical client for the Subversion revision control
+ system (svn).
+ .
+ Besides offering common and advanced svn operations, it features
+ a tight integration into KDE and can be embedded into other KDE
+ applications like konqueror via the KDE component technology KParts.
+ .
+ This package contains the debugging symbols.
Modified: kde-extras/kdesvn/trunk/debian/kdesvn-kio-plugins.install
===================================================================
--- kde-extras/kdesvn/trunk/debian/kdesvn-kio-plugins.install 2009-02-17 10:00:58 UTC (rev 13792)
+++ kde-extras/kdesvn/trunk/debian/kdesvn-kio-plugins.install 2009-02-17 10:11:12 UTC (rev 13793)
@@ -1,4 +1,5 @@
-debian/tmp/usr/share/services/*.protocol
-debian/tmp/usr/lib/kde3/kio*
-debian/tmp/usr/lib/kde3/kded_kdesvnd.*
-debian/tmp/usr/share/services/kded/
+debian/tmp/usr/share/kde4/services/*.protocol
+debian/tmp/usr/share/kde4/services/kded/
+debian/tmp/usr/lib/kde4/kio_ksvn.so
+debian/tmp/usr/lib/kde4/kded_kdesvnd.so
+debian/tmp/usr/share/dbus-1/interfaces/org.kde.kdesvnd.xml
Modified: kde-extras/kdesvn/trunk/debian/kdesvn.install
===================================================================
--- kde-extras/kdesvn/trunk/debian/kdesvn.install 2009-02-17 10:00:58 UTC (rev 13792)
+++ kde-extras/kdesvn/trunk/debian/kdesvn.install 2009-02-17 10:11:12 UTC (rev 13793)
@@ -1,13 +1,13 @@
debian/icons/kdesvn.xpm /usr/share/pixmaps/
debian/tmp/usr/bin/
-debian/tmp/usr/lib/kde3/libkdesvnpart.*
-debian/tmp/usr/share/apps/kdesvn/
-debian/tmp/usr/share/apps/kdesvnpart/
-debian/tmp/usr/share/apps/konqueror/servicemenus/
-debian/tmp/usr/share/apps/kconf_update/
+debian/tmp/usr/lib/kde4/kdesvnpart.so
+debian/tmp/usr/share/kde4/apps/kdesvn/
+debian/tmp/usr/share/kde4/apps/kdesvnpart/
+debian/tmp/usr/share/kde4/apps/kconf_update/
+debian/tmp/usr/share/kde4/config.kcfg/
+debian/tmp/usr/share/kde4/services/ServiceMenus/
+debian/tmp/usr/share/kde4/services/kdesvnpart.desktop
debian/tmp/usr/share/icons/
debian/tmp/usr/share/locale/*/LC_MESSAGES/*.mo
-debian/tmp/usr/share/config.kcfg/
-debian/tmp/usr/share/applications/kde/*.desktop
-debian/tmp/usr/share/doc/HTML/ /usr/share/doc/kde/
-
+debian/tmp/usr/share/applications/kde4/*.desktop
+debian/tmp/usr/share/doc/kde4/HTML/
Modified: kde-extras/kdesvn/trunk/debian/kdesvn.manpages
===================================================================
--- kde-extras/kdesvn/trunk/debian/kdesvn.manpages 2009-02-17 10:00:58 UTC (rev 13792)
+++ kde-extras/kdesvn/trunk/debian/kdesvn.manpages 2009-02-17 10:11:12 UTC (rev 13793)
@@ -1,2 +1,2 @@
-debian/man/kdesvn.1
-debian/man/kdesvnaskpass.1
+debian/tmp/usr/share/man/man1/kdesvn.1
+debian/tmp/usr/share/man/man1/kdesvnaskpass.1
Property changes on: kde-extras/kdesvn/trunk/debian/libsvnqt-dev.install
___________________________________________________________________
Name: svn:mergeinfo
+
Deleted: kde-extras/kdesvn/trunk/debian/libsvnqt4.install
Copied: kde-extras/kdesvn/trunk/debian/libsvnqt5.install (from rev 13433, kde-extras/kdesvn/branches/experimental/debian/libsvnqt5.install)
===================================================================
--- kde-extras/kdesvn/trunk/debian/libsvnqt5.install (rev 0)
+++ kde-extras/kdesvn/trunk/debian/libsvnqt5.install 2009-02-17 10:11:12 UTC (rev 13793)
@@ -0,0 +1 @@
+debian/tmp/usr/lib/libsvnqt.so.*
Deleted: kde-extras/kdesvn/trunk/debian/patches/01-shortcuts.patch
Modified: kde-extras/kdesvn/trunk/debian/patches/series
===================================================================
--- kde-extras/kdesvn/trunk/debian/patches/series 2009-02-17 10:00:58 UTC (rev 13792)
+++ kde-extras/kdesvn/trunk/debian/patches/series 2009-02-17 10:11:12 UTC (rev 13793)
@@ -1 +0,0 @@
-01-shortcuts.patch
Modified: kde-extras/kdesvn/trunk/debian/rules
===================================================================
--- kde-extras/kdesvn/trunk/debian/rules 2009-02-17 10:00:58 UTC (rev 13792)
+++ kde-extras/kdesvn/trunk/debian/rules 2009-02-17 10:11:12 UTC (rev 13793)
@@ -9,8 +9,10 @@
DEB_COMPRESS_EXCLUDE := .dcl .docbook -license .tag .sty .el
-DEB_DH_MAKESHLIBS_ARGS_libsvnqt4 := -V
+DEB_DH_MAKESHLIBS_ARGS_libsvnqt5 := -V
# Tell dh_shlibdeps where to find our own libs.
DEB_SHLIBDEPS_INCLUDE := debian/tmp/usr/lib
+binary-install/kdesvn::
+ dh_desktop -p$(cdbs_curpkg)
More information about the pkg-kde-commits
mailing list