Ubuntu Pastebin

Paste from clivejo at Fri, 14 Aug 2015 13:10:23 +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
From 722307f97f9bd19be0ff12c998ef273ad3874fbe Mon Sep 17 00:00:00 2001
From: Clive Johnston <clivejo@aol.com>
Date: Fri, 14 Aug 2015 14:06:45 +0100
Subject: [PATCH] Fixing build problems

- Fixed changed paths to oktetapartbrowserui.rc, oktetapartreadonlyui.rc
  and oktetapartreadwriteui.rc
- Updated the watch file, for both stable and unstable
- Fixed issues with copyright file
---
 debian/copyright      | 2 +-
 debian/okteta.install | 6 +++---
 debian/watch          | 3 ++-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index 0d42651..704971d 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -44,7 +44,7 @@ Files: mobile/program/about.cpp
        program/program.cpp
        program/program.h
 Copyright: 2006-2012, Friedrich W. H. Kossebau <kossebau@kde.org>
-License: GPL-2 or GPL-3 or GPL-KDEeV
+License: GPL-KDEeV
  This program is free software; you can redistribute it and/or
  modify it under the terms of the GNU General Public License as
  published by the Free Software Foundation; either version 2 of
diff --git a/debian/okteta.install b/debian/okteta.install
index 2d393b3..4d1a524 100644
--- a/debian/okteta.install
+++ b/debian/okteta.install
@@ -12,9 +12,9 @@ usr/share/icons/hicolor/16x16/apps/okteta.png
 usr/share/icons/hicolor/32x32/apps/okteta.png
 usr/share/icons/hicolor/48x48/apps/okteta.png
 usr/share/kxmlgui5/okteta/oktetaui.rc
-usr/share/kxmlgui5/oktetapart/oktetapartbrowserui.rc
-usr/share/kxmlgui5/oktetapart/oktetapartreadonlyui.rc
-usr/share/kxmlgui5/oktetapart/oktetapartreadwriteui.rc
+usr/share/oktetapart/oktetapartbrowserui.rc
+usr/share/oktetapart/oktetapartreadonlyui.rc
+usr/share/oktetapart/oktetapartreadwriteui.rc
 usr/share/mime/packages/okteta.xml
 usr/share/okteta/structures/elf/main.osd
 usr/share/okteta/structures/elf/metadata.desktop
diff --git a/debian/watch b/debian/watch
index ee182a5..893376a 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,3 @@
 version=3
-http://download.kde.org/stable/([\d.]+)/src/okteta-([\d.]+).tar.xz
+http://download.kde.org/stable/applications/([\d.]+)/src/okteta-([\d.]+).tar.xz
+http://download.kde.org/unstable/applications/([\d.]+)/src/okteta-([\d.]+).tar.xz
-- 
2.5.0
Download as text