Update to 1.5.0

- New upstream release
- Rebase sb2 patches
- Removed merged patches

Signed-off-by: Björn Bidar <bjorn.bidar@thaodan.de>

1 files changed, 54 insertions, 0 deletions

diff --git a/0005-Add-p-to-copyprj-to-enable-copying-of-prjconf.patch b/0005-Add-p-to-copyprj-to-enable-copying-of-prjconf.patch
new file mode 100644
index 000000000000..fc5258ec16db
--- /dev/null
+++ b/0005-Add-p-to-copyprj-to-enable-copying-of-prjconf.patch
@@ -0,0 +1,54 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Marko Lemmetty <marko.lemmetty@jollamobile.com>
+Date: Fri, 15 May 2020 14:47:19 +0300
+Subject: [PATCH] Add -p to copyprj to enable copying of prjconf
+
+---
+ osc/commandline.py | 3 +++
+ osc/core.py        | 5 +++++
+ 2 files changed, 8 insertions(+)
+
+diff --git a/osc/commandline.py b/osc/commandline.py
+index d67a4184afac79795c2e3dd7a2ca1ad64d77fe9a..2eff6bfb2a38a7919d2c1850a57f49ebe7feba92 100644
+--- a/osc/commandline.py
++++ b/osc/commandline.py
+@@ -2114,6 +2114,8 @@ class Osc(cmdln.Cmdln):
+                         help='replicate the history of each package.')
+     @cmdln.option('-o', '--make-older', action='store_true',
+                         help='No idea')
++    @cmdln.option('-p', '--prjconf', action='store_true',
++                        help='copy the prjconf also')
+     @cmdln.option('-r', '--re-sign', action='store_true',
+                         help='re-sign the binaries')
+     @cmdln.option('-m', '--message', metavar='TEXT',
+@@ -2159,6 +2161,7 @@ class Osc(cmdln.Cmdln):
+                      makeolder = opts.make_older,
+                      resign = opts.re_sign,
+                      now = opts.now,
++                     prjconf = opts.prjconf,
+                      comment = comment)
+         print("done cp")
+         print(r)
+diff --git a/osc/core.py b/osc/core.py
+index d3d4ca9cf3b3cfc6ad966fa3692cfa019d8d567c..66b51f437df47cb09cb7b440338836cf9a79ec62 100644
+--- a/osc/core.py
++++ b/osc/core.py
+@@ -6284,6 +6284,8 @@ def copy_prj(src_apiurl, src_project, dst_project,
+              withhistory = False,
+              makeolder = False,
+              resign = False,
++             now = False,
++             prjconf = False,
+              comment = None):
+     """
+     Create a copy of a project.
+@@ -6305,6 +6307,9 @@ def copy_prj(src_apiurl, src_project, dst_project,
+         query['comment'] = comment
+     if now:
+         query['nodelay'] = '1'
++    if prjconf:
++        query['prjconf'] = '1'
++
+     u = makeurl(src_apiurl, ['source', dst_project], query=query)
+     print("copyprj ", u, file=sys.stderr)
+     f = http_POST(u)