diff options
| author | Robert Xu <[email protected]> | 2011-08-20 22:17:03 -0400 |
|---|---|---|
| committer | Robert Xu <[email protected]> | 2011-08-20 22:17:03 -0400 |
| commit | 6f3a1bc646b0d5eb63f09e59e9b0262d47ee4ebf (patch) | |
| tree | 141e44b1b831644c739f3ec4e0bef2d10ef71da7 /ubuntu/maverick/applications/kdesvn | |
| parent | 7621ba87b889eccdea4958715c25de4b403ad705 (diff) | |
| parent | 26f5630a822b38ef215210699e9e08e74143b38b (diff) | |
| download | tde-packaging-6f3a1bc646b0d5eb63f09e59e9b0262d47ee4ebf.tar.gz tde-packaging-6f3a1bc646b0d5eb63f09e59e9b0262d47ee4ebf.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging
Diffstat (limited to 'ubuntu/maverick/applications/kdesvn')
| -rw-r--r-- | ubuntu/maverick/applications/kdesvn/debian/changelog | 4 | ||||
| -rw-r--r-- | ubuntu/maverick/applications/kdesvn/debian/control | 2 | ||||
| -rwxr-xr-x | ubuntu/maverick/applications/kdesvn/debian/rules | 8 |
3 files changed, 7 insertions, 7 deletions
diff --git a/ubuntu/maverick/applications/kdesvn/debian/changelog b/ubuntu/maverick/applications/kdesvn/debian/changelog index 0f022062e..55c73dd3c 100644 --- a/ubuntu/maverick/applications/kdesvn/debian/changelog +++ b/ubuntu/maverick/applications/kdesvn/debian/changelog @@ -6,7 +6,7 @@ kdesvn-trinity (1.0.4-2~2ubuntu4) karmic; urgency=low kdesvn-trinity (1.0.4-2~0ubuntu4) intrepid; urgency=low - * Moved KDE3 to /opt/trinity + * Moved Trinity to /opt/trinity * Integrated properly with KDE4.2+ -- Timothy Pearson <[email protected]> Tue, 10 March 2009 12:31:00 -0600 @@ -19,7 +19,7 @@ kdesvn-trinity (1.0.4-2~0ubuntu3) intrepid; urgency=low kdesvn (1.0.4-2~hardy1) hardy-backports; urgency=low - * Upload fixed KDE3 package from sid for compatibility with svn 1.5 + * Upload fixed Trinity package from sid for compatibility with svn 1.5 (LP: #283468) - Intrepid package is KDE4 and not a suitable solution for hardy-backports diff --git a/ubuntu/maverick/applications/kdesvn/debian/control b/ubuntu/maverick/applications/kdesvn/debian/control index 54e8db49d..c7849ea5e 100644 --- a/ubuntu/maverick/applications/kdesvn/debian/control +++ b/ubuntu/maverick/applications/kdesvn/debian/control @@ -44,7 +44,7 @@ Package: kdesvn-kio-plugins-trinity Section: devel Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} -Description: subversion I/O slaves for KDE3 +Description: subversion I/O slaves for Trinity 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. diff --git a/ubuntu/maverick/applications/kdesvn/debian/rules b/ubuntu/maverick/applications/kdesvn/debian/rules index ab9e7aa91..6e339cd2e 100755 --- a/ubuntu/maverick/applications/kdesvn/debian/rules +++ b/ubuntu/maverick/applications/kdesvn/debian/rules @@ -46,8 +46,8 @@ common-install-impl:: rm -rf debian/tmp/usr/lib64/trinity rm -rf debian/tmp/usr/share rm -rf debian/tmp/usr/include - mkdir -p debian/tmp/opt/trinity/lib/kde3 - touch debian/tmp/opt/trinity/lib/kde3/removeme - cp -Rp debian/tmp/opt/trinity/lib/kde3/* debian/tmp/opt/trinity/lib/ - rm -rf debian/tmp/opt/trinity/lib/kde3 + mkdir -p debian/tmp/opt/trinity/lib/trinity + touch debian/tmp/opt/trinity/lib/trinity/removeme + cp -Rp debian/tmp/opt/trinity/lib/trinity/* debian/tmp/opt/trinity/lib/ + rm -rf debian/tmp/opt/trinity/lib/trinity rm -rf debian/tmp/opt/trinity/lib/removeme |