Imported Upstream version 1.12.35

Change-Id: Ibdfef371030207bc1a8c0f18af1f103b568b0dbc
Signed-off-by: DongHun Kwak <dh0128.kwak@samsung.com>

diff --git a/VERSION.cmake b/VERSION.cmake
index f5188db..c1cd5ab 100644 (file)
--- a/VERSION.cmake
+++ b/VERSION.cmake
@@ -34,7 +34,7 @@
 #
 SET(VERSION_MAJOR "1")
 SET(VERSION_MINOR "12")
-SET(VERSION_PATCH "34")
+SET(VERSION_PATCH "35")
 
-# LAST RELEASED: 1.12.34
+# LAST RELEASED: 1.12.35
 #=======

diff --git a/doc/zypper.8 b/doc/zypper.8
index c6a0943..c5d9b6c 100644 (file)
--- a/doc/zypper.8
+++ b/doc/zypper.8
@@ -2,12 +2,12 @@
 .\"     Title: zypper
 .\"    Author: [see the "AUTHORS" section]
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 02/24/2016
+.\"      Date: 02/26/2016
 .\"    Manual: ZYPPER
 .\"    Source: SUSE Linux
 .\"  Language: English
 .\"
-.TH "ZYPPER" "8" "02/24/2016" "SUSE Linux" "ZYPPER"
+.TH "ZYPPER" "8" "02/26/2016" "SUSE Linux" "ZYPPER"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -626,6 +626,10 @@ Create solver test case for debugging\&. See the install command for details\&.
 .RS 4
 Don\(cqt require user interaction\&. Alias for the \-\-non\-interactive global option\&.
 .RE
+.PP
+This command also accepts the \fBDownload\-and\-install mode options\fR described in the \fBinstall\fR command\&.
+.RS 4
+.RE
 .RE
 .PP
 \fBinstall\-new\-recommends\fR (\fBinr\fR) [\fIoptions\fR]
@@ -881,7 +885,7 @@ approach to update\&. This method does not explicitly select packages with best
 Don\(cqt require user interaction\&. Alias for the \-\-non\-interactive global option\&.
 .RE
 .PP
-This command also accepts the download\-and\-install mode options described in the \fBinstall\fR command description\&.
+This command also accepts the \fBDownload\-and\-install mode options\fR described in the \fBinstall\fR command description\&.
 .RS 4
 .RE
 .RE
@@ -1087,7 +1091,7 @@ Show the detailed installation summary\&.
 Don\(cqt require user interaction\&. Alias for the \-\-non\-interactive global option\&.
 .RE
 .PP
-This command also accepts the \fBdownload\-and\-install\fR mode options described in the \fBinstall\fR command description\&.
+This command also accepts the \fBDownload\-and\-install mode options\fR described in the \fBinstall\fR command description\&.
 .RS 4
 .RE
 .RE
@@ -1176,7 +1180,7 @@ option to the rpm commands run by the dist\-upgrade command\&.
 Show the detailed installation summary\&.
 .RE
 .PP
-This command also accepts the download\-and\-install mode options described in the \fBinstall\fR command description\&.
+This command also accepts the \fBDownload\-and\-install mode options\fR described in the \fBinstall\fR command description\&.
 .RS 4
 .RE
 .PP

diff --git a/doc/zypper.8.txt b/doc/zypper.8.txt
index af630a6..66c65cb 100644 (file)
--- a/doc/zypper.8.txt
+++ b/doc/zypper.8.txt
@@ -351,6 +351,8 @@ Package Management Commands
 
        *-y*, *--no-confirm*::
                Don't require user interaction. Alias for the --non-interactive global option.
+
+       This command also accepts the *Download-and-install mode options* described in the *install* command.:: {nop}
 --
 
 *install-new-recommends* (*inr*) ['options']::
@@ -494,7 +496,7 @@ Update Management Commands
        *-y*, *--no-confirm*::
                Don't require user interaction. Alias for the --non-interactive global option.
 
-       This command also accepts the download-and-install mode options described in the *install* command description.:: {nop}
+       This command also accepts the *Download-and-install mode options* described in the *install* command description.:: {nop}
 --
 
 *list-patches* (*lp*) ['options']::
@@ -601,7 +603,7 @@ Update Management Commands
        *-y*, *--no-confirm*::
                Don't require user interaction. Alias for the --non-interactive global option.
 
-       This command also accepts the *download-and-install* mode options described in the *install* command description.:: {nop}
+       This command also accepts the *Download-and-install mode options* described in the *install* command description.:: {nop}
 --
 
 *dist-upgrade* (*dup*) ['options']::
@@ -640,7 +642,7 @@ Update Management Commands
        *--details*::
                Show the detailed installation summary.
 
-       This command also accepts the download-and-install mode options described in the *install* command description.:: {nop}
+       This command also accepts the *Download-and-install mode options* described in the *install* command description.:: {nop}
 
        *Expert Options:* :: Don't use them unless you know you need them.
 

diff --git a/package/zypper.changes b/package/zypper.changes
index f5d36fe..3a37e65 100644 (file)
--- a/package/zypper.changes
+++ b/package/zypper.changes
@@ -1,4 +1,11 @@
 -------------------------------------------------------------------
+Fri Feb 26 12:57:18 CET 2016 - ma@suse.de
+
+- man: Enhance description of Download-and-install mode options
+  (bsc#968254)
+- version 1.12.35
+
+-------------------------------------------------------------------
 Wed Feb 24 15:22:53 CET 2016 - ma@suse.de
 
 - Return 106-ZYPPER_EXIT_INF_REPOS_SKIPPED if repos were skipped due