Ubuntu Pastebin

Paste from neo at Fri, 1 Jul 2016 17:09:58 +0000

Download as text 
  1
  2
  3
  4
  5
  6
  7
  8
  9
 10
 11
 12
 13
 14
 15
 16
 17
 18
 19
 20
 21
 22
 23
 24
 25
 26
 27
 28
 29
 30
 31
 32
 33
 34
 35
 36
 37
 38
 39
 40
 41
 42
 43
 44
 45
 46
 47
 48
 49
 50
 51
 52
 53
 54
 55
 56
 57
 58
 59
 60
 61
 62
 63
 64
 65
 66
 67
 68
 69
 70
 71
 72
 73
 74
 75
 76
 77
 78
 79
 80
 81
 82
 83
 84
 85
 86
 87
 88
 89
 90
 91
 92
 93
 94
 95
 96
 97
 98
 99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
diff --git a/debian/changelog b/debian/changelog
index 68a51f8..cadc5f6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-kdesdk-kioslaves (4:16.04.2-0ubuntu1) UNRELEASED; urgency=medium
+kdesdk-kioslaves (4:16.04.2-1ubuntu1) UNRELEASED; urgency=medium
 
   [ Clive Johnston ]
   * New upstream release
@@ -14,6 +14,12 @@ kdesdk-kioslaves (4:16.04.2-0ubuntu1) UNRELEASED; urgency=medium
   * Switch to KF5 build
   * New upstream release (16.04.2)
 
+  [ Rik Mills ]
+  * Merge with debian packaging
+  * Disable svn support, it doesn't work with 1.9+
+    Thanks to Chris Lamb for the report (Closes: debian bug 799525)
+  * Update install files
+
  -- Clive Johnston <clivejo@kubuntu.org>  Fri, 24 Jun 2016 22:38:40 +0100
 
 kdesdk-kioslaves (4:15.08.3-1) experimental; urgency=medium
diff --git a/debian/control b/debian/control
index 74730ff..485f620 100644
--- a/debian/control
+++ b/debian/control
@@ -29,15 +29,3 @@ Description: transparent Subversion access and Perl documentation KIO slaves
  plugin, which can be used to browse the Perl documentation within Konqueror.
  .
  This package is part of the KDE Software Development Kit module.
-
-Package: kdesdk-kioslaves-dbg
-Section: debug
-Architecture: any
-Priority: extra
-Depends: kate-dbg,
-         kde-runtime-dbg,
-         kdesdk-kio-plugins (= ${binary:Version}),
-         ${misc:Depends}
-Description: debugging symbols for kdesdk-kio-plugins
- This package contains debugging files used to investigate problems with
- binaries included in kdesdk-kio-plugins.
diff --git a/debian/kdesdk-kio-plugins.install b/debian/kdesdk-kio-plugins.install
index 667a462..426ca0d 100644
--- a/debian/kdesdk-kio-plugins.install
+++ b/debian/kdesdk-kio-plugins.install
@@ -1,57 +1,57 @@
-usr/bin/kio_svn_helper
-usr/lib/kde4/kded_ksvnd.so
+# usr/bin/kio_svn_helper
+# usr/lib/kde4/kded_ksvnd.so
 usr/lib/kde4/kio_perldoc.so
-usr/lib/kde4/kio_svn.so
-usr/share/dbus-1/interfaces/org.kde.ksvnd.xml
-usr/share/icons/hicolor/128x128/actions/vcs-add-svn-kiosvn.png
-usr/share/icons/hicolor/128x128/actions/vcs-branch-svn-kiosvn.png
-usr/share/icons/hicolor/128x128/actions/vcs-merge-svn-kiosvn.png
-usr/share/icons/hicolor/128x128/actions/vcs-remove-svn-kiosvn.png
-usr/share/icons/hicolor/128x128/actions/vcs-status-svn-kiosvn.png
-usr/share/icons/hicolor/128x128/actions/vcs-switch-svn-kiosvn.png
-usr/share/icons/hicolor/16x16/actions/vcs-add-svn-kiosvn.png
-usr/share/icons/hicolor/16x16/actions/vcs-branch-svn-kiosvn.png
-usr/share/icons/hicolor/16x16/actions/vcs-merge-svn-kiosvn.png
-usr/share/icons/hicolor/16x16/actions/vcs-remove-svn-kiosvn.png
-usr/share/icons/hicolor/16x16/actions/vcs-status-svn-kiosvn.png
-usr/share/icons/hicolor/16x16/actions/vcs-switch-svn-kiosvn.png
-usr/share/icons/hicolor/22x22/actions/vcs-add-svn-kiosvn.png
-usr/share/icons/hicolor/22x22/actions/vcs-branch-svn-kiosvn.png
-usr/share/icons/hicolor/22x22/actions/vcs-merge-svn-kiosvn.png
-usr/share/icons/hicolor/22x22/actions/vcs-remove-svn-kiosvn.png
-usr/share/icons/hicolor/22x22/actions/vcs-status-svn-kiosvn.png
-usr/share/icons/hicolor/22x22/actions/vcs-switch-svn-kiosvn.png
-usr/share/icons/hicolor/32x32/actions/vcs-add-svn-kiosvn.png
-usr/share/icons/hicolor/32x32/actions/vcs-branch-svn-kiosvn.png
-usr/share/icons/hicolor/32x32/actions/vcs-merge-svn-kiosvn.png
-usr/share/icons/hicolor/32x32/actions/vcs-remove-svn-kiosvn.png
-usr/share/icons/hicolor/32x32/actions/vcs-status-svn-kiosvn.png
-usr/share/icons/hicolor/32x32/actions/vcs-switch-svn-kiosvn.png
-usr/share/icons/hicolor/48x48/actions/vcs-add-svn-kiosvn.png
-usr/share/icons/hicolor/48x48/actions/vcs-branch-svn-kiosvn.png
-usr/share/icons/hicolor/48x48/actions/vcs-merge-svn-kiosvn.png
-usr/share/icons/hicolor/48x48/actions/vcs-remove-svn-kiosvn.png
-usr/share/icons/hicolor/48x48/actions/vcs-status-svn-kiosvn.png
-usr/share/icons/hicolor/48x48/actions/vcs-switch-svn-kiosvn.png
-usr/share/icons/hicolor/64x64/actions/vcs-add-svn-kiosvn.png
-usr/share/icons/hicolor/64x64/actions/vcs-branch-svn-kiosvn.png
-usr/share/icons/hicolor/64x64/actions/vcs-merge-svn-kiosvn.png
-usr/share/icons/hicolor/64x64/actions/vcs-remove-svn-kiosvn.png
-usr/share/icons/hicolor/64x64/actions/vcs-status-svn-kiosvn.png
-usr/share/icons/hicolor/64x64/actions/vcs-switch-svn-kiosvn.png
-usr/share/icons/hicolor/scalable/actions/vcs-add-svn-kiosvn.svgz
-usr/share/icons/hicolor/scalable/actions/vcs-branch-svn-kiosvn.svgz
-usr/share/icons/hicolor/scalable/actions/vcs-merge-svn-kiosvn.svgz
-usr/share/icons/hicolor/scalable/actions/vcs-remove-svn-kiosvn.svgz
-usr/share/icons/hicolor/scalable/actions/vcs-status-svn-kiosvn.svgz
-usr/share/icons/hicolor/scalable/actions/vcs-switch-svn-kiosvn.svgz
+# usr/lib/kde4/kio_svn.so
+# usr/share/dbus-1/interfaces/org.kde.ksvnd.xml
+# usr/share/icons/hicolor/128x128/actions/vcs-add-svn-kiosvn.png
+# usr/share/icons/hicolor/128x128/actions/vcs-branch-svn-kiosvn.png
+# usr/share/icons/hicolor/128x128/actions/vcs-merge-svn-kiosvn.png
+# usr/share/icons/hicolor/128x128/actions/vcs-remove-svn-kiosvn.png
+# usr/share/icons/hicolor/128x128/actions/vcs-status-svn-kiosvn.png
+# usr/share/icons/hicolor/128x128/actions/vcs-switch-svn-kiosvn.png
+# usr/share/icons/hicolor/16x16/actions/vcs-add-svn-kiosvn.png
+# usr/share/icons/hicolor/16x16/actions/vcs-branch-svn-kiosvn.png
+# usr/share/icons/hicolor/16x16/actions/vcs-merge-svn-kiosvn.png
+# usr/share/icons/hicolor/16x16/actions/vcs-remove-svn-kiosvn.png
+# usr/share/icons/hicolor/16x16/actions/vcs-status-svn-kiosvn.png
+# usr/share/icons/hicolor/16x16/actions/vcs-switch-svn-kiosvn.png
+# usr/share/icons/hicolor/22x22/actions/vcs-add-svn-kiosvn.png
+# usr/share/icons/hicolor/22x22/actions/vcs-branch-svn-kiosvn.png
+# usr/share/icons/hicolor/22x22/actions/vcs-merge-svn-kiosvn.png
+# usr/share/icons/hicolor/22x22/actions/vcs-remove-svn-kiosvn.png
+# usr/share/icons/hicolor/22x22/actions/vcs-status-svn-kiosvn.png
+# usr/share/icons/hicolor/22x22/actions/vcs-switch-svn-kiosvn.png
+# usr/share/icons/hicolor/32x32/actions/vcs-add-svn-kiosvn.png
+# usr/share/icons/hicolor/32x32/actions/vcs-branch-svn-kiosvn.png
+# usr/share/icons/hicolor/32x32/actions/vcs-merge-svn-kiosvn.png
+# usr/share/icons/hicolor/32x32/actions/vcs-remove-svn-kiosvn.png
+# usr/share/icons/hicolor/32x32/actions/vcs-status-svn-kiosvn.png
+# usr/share/icons/hicolor/32x32/actions/vcs-switch-svn-kiosvn.png
+# usr/share/icons/hicolor/48x48/actions/vcs-add-svn-kiosvn.png
+# usr/share/icons/hicolor/48x48/actions/vcs-branch-svn-kiosvn.png
+# usr/share/icons/hicolor/48x48/actions/vcs-merge-svn-kiosvn.png
+# usr/share/icons/hicolor/48x48/actions/vcs-remove-svn-kiosvn.png
+# usr/share/icons/hicolor/48x48/actions/vcs-status-svn-kiosvn.png
+# usr/share/icons/hicolor/48x48/actions/vcs-switch-svn-kiosvn.png
+# usr/share/icons/hicolor/64x64/actions/vcs-add-svn-kiosvn.png
+# usr/share/icons/hicolor/64x64/actions/vcs-branch-svn-kiosvn.png
+# usr/share/icons/hicolor/64x64/actions/vcs-merge-svn-kiosvn.png
+# usr/share/icons/hicolor/64x64/actions/vcs-remove-svn-kiosvn.png
+# usr/share/icons/hicolor/64x64/actions/vcs-status-svn-kiosvn.png
+# usr/share/icons/hicolor/64x64/actions/vcs-switch-svn-kiosvn.png
+# usr/share/icons/hicolor/scalable/actions/vcs-add-svn-kiosvn.svgz
+# usr/share/icons/hicolor/scalable/actions/vcs-branch-svn-kiosvn.svgz
+# usr/share/icons/hicolor/scalable/actions/vcs-merge-svn-kiosvn.svgz
+# usr/share/icons/hicolor/scalable/actions/vcs-remove-svn-kiosvn.svgz
+# usr/share/icons/hicolor/scalable/actions/vcs-status-svn-kiosvn.svgz
+# usr/share/icons/hicolor/scalable/actions/vcs-switch-svn-kiosvn.svgz
 usr/share/kde4/apps/kio_perldoc/pod2html.pl
-usr/share/kde4/services/ServiceMenus/subversion.desktop
-usr/share/kde4/services/ServiceMenus/subversion_toplevel.desktop
-usr/share/kde4/services/kded/ksvnd.desktop
+# usr/share/kde4/services/ServiceMenus/subversion.desktop
+# usr/share/kde4/services/ServiceMenus/subversion_toplevel.desktop
+# usr/share/kde4/services/kded/ksvnd.desktop
 usr/share/kde4/services/perldoc.protocol
-usr/share/kde4/services/svn+file.protocol
-usr/share/kde4/services/svn+http.protocol
-usr/share/kde4/services/svn+https.protocol
-usr/share/kde4/services/svn+ssh.protocol
-usr/share/kde4/services/svn.protocol
+# usr/share/kde4/services/svn+file.protocol
+# usr/share/kde4/services/svn+http.protocol
+# usr/share/kde4/services/svn+https.protocol
+# usr/share/kde4/services/svn+ssh.protocol
+# usr/share/kde4/services/svn.protocol
diff --git a/debian/rules b/debian/rules
index bb59c98..87e8bdd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,8 +2,11 @@
 
 include /usr/share/pkg-kde-tools/qt-kde-team/3/debian-qt-kde.mk
 
+override_dh_auto_configure:
+	$(overridden_command) -- -DBUILD_svn=FALSE
+
 override_dh_auto_install:
 	$(overridden_command) --destdir=debian/tmp
 
 override_dh_strip:
-	$(overridden_command) --dbg-package=kdesdk-kioslaves-dbg
+	$(overridden_command) --dbgsym-migration='kdesdk-kioslaves-dbg (<= 4:15.08.3-2~1.gbpeb13b4~)'
Download as text