Imported Upstream version 1.12.13

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ef085c4..a6448d5 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -91,7 +91,7 @@ INSTALL(
 
 # zypper-aptitude compat tool
 INSTALL(
-  PROGRAMS tools/aptitude
+  PROGRAMS tools/aptitude tools/apt-get
   DESTINATION ${INSTALL_PREFIX}/bin
 )
 INSTALL(

diff --git a/VERSION.cmake b/VERSION.cmake
index 06e832d..fd6de9b 100644 (file)
--- a/VERSION.cmake
+++ b/VERSION.cmake
@@ -34,7 +34,7 @@
 #
 SET(VERSION_MAJOR "1")
 SET(VERSION_MINOR "12")
-SET(VERSION_PATCH "12")
+SET(VERSION_PATCH "13")
 
-# LAST RELEASED: 1.12.12
+# LAST RELEASED: 1.12.13
 #=======

diff --git a/doc/zypper.8 b/doc/zypper.8
index fd9c149..a8979b3 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: 07/09/2015
+.\"      Date: 09/01/2015
 .\"    Manual: ZYPPER
 .\"    Source: SUSE Linux
 .\"  Language: English
 .\"
-.TH "ZYPPER" "8" "07/09/2015" "SUSE Linux" "ZYPPER"
+.TH "ZYPPER" "8" "09/01/2015" "SUSE Linux" "ZYPPER"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -1143,26 +1143,26 @@ Don\(cqt use them unless you know you need them\&.
 .PP
 \fB\-\-\fR[\fBno\-\fR]\fBallow\-downgrade\fR
 .RS 4
-Whether to allow downgrading installed resolvables [yes]\&.
+Whether to allow downgrading installed resolvables [zypp\&.conf:solver\&.dupAllowDowngrade]\&.
 .RE
 .PP
 \fB\-\-\fR[\fBno\-\fR]\fBallow\-name\-change\fR
 .RS 4
-Whether to allow changing the names of installed resolvables [yes]\&. Setting this to
+Whether to allow changing the names of installed resolvables [zypp\&.conf:solver\&.dupAllowNameChange]\&. Setting this to
 \fBno\fR
 will not replace packages which have been renamed\&.
 .RE
 .PP
 \fB\-\-\fR[\fBno\-\fR]\fBallow\-arch\-change\fR
 .RS 4
-Whether to allow changing the architecture of installed resolvables [yes]\&.
+Whether to allow changing the architecture of installed resolvables [zypp\&.conf:solver\&.dupAllowArchChange]\&.
 .RE
 .PP
 \fB\-\-\fR[\fBno\-\fR]\fBallow\-vendor\-change\fR
 .RS 4
-Whether to allow changing the vendor of installed resolvables [yes]\&. Setting this to
+Whether to allow changing the vendor of installed resolvables [zypp\&.conf:solver\&.dupAllowVendorChange]\&. Setting this to
 \fBno\fR
-might be useful if you do not want packages from foreign repos being dup\(cqed to the distributions version (or vice versa )\&.
+might be useful if you do not want packages from foreign repos being dup\(cqed to the distributions version (or vice versa)\&.
 .RE
 .PP
 Examples:

diff --git a/doc/zypper.8.txt b/doc/zypper.8.txt
index 89e51a2..8f6e71a 100644 (file)
--- a/doc/zypper.8.txt
+++ b/doc/zypper.8.txt
@@ -623,16 +623,16 @@ Update Management Commands
        *Expert Options:* :: Don't use them unless you know you need them.
 
        *--*[*no-*]*allow-downgrade*::
-               Whether to allow downgrading installed resolvables [yes].
+               Whether to allow downgrading installed resolvables [zypp.conf:solver.dupAllowDowngrade].
 
        *--*[*no-*]*allow-name-change*::
-               Whether to allow changing the names of installed resolvables [yes]. Setting this to *no* will not replace packages which have been renamed.
+               Whether to allow changing the names of installed resolvables [zypp.conf:solver.dupAllowNameChange]. Setting this to *no* will not replace packages which have been renamed.
 
        *--*[*no-*]*allow-arch-change*::
-               Whether to allow changing the architecture of installed resolvables [yes].
+               Whether to allow changing the architecture of installed resolvables [zypp.conf:solver.dupAllowArchChange].
 
        *--*[*no-*]*allow-vendor-change*::
-               Whether to allow changing the vendor of installed resolvables [yes]. Setting this to *no* might be useful if you do not want packages from foreign repos being dup'ed to the distributions version (or vice versa ).
+               Whether to allow changing the vendor of installed resolvables [zypp.conf:solver.dupAllowVendorChange]. Setting this to *no* might be useful if you do not want packages from foreign repos being dup'ed to the distributions version (or vice versa).
 
 
        Examples: :: {nop}

diff --git a/package/zypper.changes b/package/zypper.changes
index 08a687e..35c8d8c 100644 (file)
--- a/package/zypper.changes
+++ b/package/zypper.changes
@@ -1,4 +1,38 @@
 -------------------------------------------------------------------
+Tue Sep  1 18:26:11 CEST 2015 - ma@suse.de
+
+- man: mention new zypp.conf solver.dupAllow* config options
+  (FATE#319128)
+- add apt-get alias for aptitude
+- BuildRequires:  libzypp-devel >= 15.14.0
+- version 1.12.13
+
+-------------------------------------------------------------------
+Sun Aug 30 01:13:19 CEST 2015 - ma@suse.de
+
+- Update zypper-po.tar.bz2
+
+-------------------------------------------------------------------
+Thu Aug 27 01:14:48 CEST 2015 - ma@suse.de
+
+- Update sle-zypper-po.tar.bz2
+
+-------------------------------------------------------------------
+Sun Aug 23 01:13:12 CEST 2015 - ma@suse.de
+
+- Update zypper-po.tar.bz2
+
+-------------------------------------------------------------------
+Thu Aug 20 01:13:19 CEST 2015 - ma@suse.de
+
+- Update zypper-po.tar.bz2
+
+-------------------------------------------------------------------
+Sun Aug 16 01:14:12 CEST 2015 - ma@suse.de
+
+- Update zypper-po.tar.bz2
+
+-------------------------------------------------------------------
 Fri Aug 14 15:30:37 CEST 2015 - ma@suse.de
 
 - lp: Let '--issue=string' also look for matches in IssueType 

diff --git a/po/sle-zypper-po.tar.bz2 b/po/sle-zypper-po.tar.bz2
index 44c440c..8ea69a6 100644 (file)
Binary files a/po/sle-zypper-po.tar.bz2 and b/po/sle-zypper-po.tar.bz2 differ

diff --git a/po/zypper-po.tar.bz2 b/po/zypper-po.tar.bz2
index 9b417af..5b62fd5 100644 (file)
Binary files a/po/zypper-po.tar.bz2 and b/po/zypper-po.tar.bz2 differ

diff --git a/src/Zypper.cc b/src/Zypper.cc
index e4db38e..92f423e 100644 (file)
--- a/src/Zypper.cc
+++ b/src/Zypper.cc
@@ -2170,10 +2170,10 @@ void Zypper::processCommandOptions()
       "-d, --download-only         Only download the packages, do not install.\n"
       ), "only, in-advance, in-heaps, as-needed") )
       .optionSection(_("Expert options:") )
-      .option( "--[no-]allow-downgrade",       _("Whether to allow downgrading installed resolvables [yes].") )
-      .option( "--[no-]allow-name-change",     _("Whether to allow changing the names of installed resolvables [yes].") )
-      .option( "--[no-]allow-arch-change",     _("Whether to allow changing the architecture of installed resolvables [yes].") )
-      .option( "--[no-]allow-vendor-change",   _("Whether to allow changing the vendor of installed resolvables [yes].") )
+      .option( "--[no-]allow-downgrade",       _("Whether to allow downgrading installed resolvables.") )
+      .option( "--[no-]allow-name-change",     _("Whether to allow changing the names of installed resolvables.") )
+      .option( "--[no-]allow-arch-change",     _("Whether to allow changing the architecture of installed resolvables.") )
+      .option( "--[no-]allow-vendor-change",   _("Whether to allow changing the vendor of installed resolvables.") )
       ;
     break;
   }

diff --git a/tools/apt-get b/tools/apt-get
new file mode 120000 (symlink)
index 0000000..7fb0e8b
--- /dev/null
+++ b/tools/apt-get
@@ -0,0 +1 @@
+aptitude
\ No newline at end of file

diff --git a/zypper.spec.cmake b/zypper.spec.cmake
index e1f4376..d7204da 100644 (file)
--- a/zypper.spec.cmake
+++ b/zypper.spec.cmake
@@ -22,7 +22,7 @@ BuildRequires:  boost-devel >= 1.33.1
 BuildRequires:  cmake >= 2.4.6
 BuildRequires:  gcc-c++ >= 4.7
 BuildRequires:  gettext-devel >= 0.15
-BuildRequires:  libzypp-devel >= 15.13.0
+BuildRequires:  libzypp-devel >= 15.14.0
 BuildRequires:  readline-devel >= 5.1
 Requires:       procps
 %if 0%{?suse_version}
@@ -179,6 +179,7 @@ rm -rf "$RPM_BUILD_ROOT"
 %files aptitude
 %defattr(-,root,root)
 %{_bindir}/aptitude
+%{_bindir}/apt-get
 %dir %{_sysconfdir}/zypp/apt-packagemap.d/
 %config(noreplace) %{_sysconfdir}/zypp/apt-packagemap.d/*