summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--anaconda.spec.in8
-rw-r--r--configure.ac2
-rw-r--r--po/anaconda.pot12
3 files changed, 15 insertions, 7 deletions
diff --git a/anaconda.spec.in b/anaconda.spec.in
index 51d65938a..164e6819c 100644
--- a/anaconda.spec.in
+++ b/anaconda.spec.in
@@ -293,6 +293,14 @@ update-desktop-database &> /dev/null || :
/usr/lib/dracut/modules.d/80%{name}/*
%changelog
+* Thu Aug 16 2012 Chris Lumens <clumens@redhat.com> - 18.6-1
+- Remove linuxrc.s390 (dcantrell)
+- Source in url-lib.sh if we don't have it (#847831) (jkeating)
+- parse-kickstart: add proc_cmdline (fix init_logger()) (wwoods)
+- Remove the data/bootdisk directory tree. (clumens)
+- Remove duplicate boot disk setting code (#848841). (clumens)
+- Force authconfig to be installed on the target system (#848803). (clumens)
+
* Wed Aug 15 2012 Chris Lumens <clumens@redhat.com> - 18.5-1
- Mark/unmark some strings for translation, as appropriate. (clumens)
- Save the distro label into the right variable for retranslation. (clumens)
diff --git a/configure.ac b/configure.ac
index a31d48041..ab1873f98 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,7 +20,7 @@
m4_define(python_required_version, 2.5)
AC_PREREQ([2.63])
-AC_INIT([anaconda], [18.5], [anaconda-devel-list@redhat.com])
+AC_INIT([anaconda], [18.6], [anaconda-devel-list@redhat.com])
AM_INIT_AUTOMAKE([foreign no-dist-gzip dist-bzip2])
AC_CONFIG_HEADERS([config.h])
diff --git a/po/anaconda.pot b/po/anaconda.pot
index b27e07de5..9253cc62b 100644
--- a/po/anaconda.pot
+++ b/po/anaconda.pot
@@ -6,9 +6,9 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: anaconda 18.4\n"
+"Project-Id-Version: anaconda 18.5\n"
"Report-Msgid-Bugs-To: anaconda-devel-list@redhat.com\n"
-"POT-Creation-Date: 2012-08-15 15:34-0400\n"
+"POT-Creation-Date: 2012-08-16 17:39-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1535,20 +1535,20 @@ msgstr ""
msgid "Probing storage..."
msgstr ""
-#: pyanaconda/ui/tui/spokes/storage.py:255
+#: pyanaconda/ui/tui/spokes/storage.py:249
msgid "Generating updated storage configuration"
msgstr ""
-#: pyanaconda/ui/tui/spokes/storage.py:263
+#: pyanaconda/ui/tui/spokes/storage.py:257
#: pyanaconda/ui/gui/spokes/storage.py:248
msgid "Checking storage configuration..."
msgstr ""
-#: pyanaconda/ui/tui/spokes/storage.py:298
+#: pyanaconda/ui/tui/spokes/storage.py:292
msgid "Autopartitioning Options"
msgstr ""
-#: pyanaconda/ui/tui/spokes/storage.py:329
+#: pyanaconda/ui/tui/spokes/storage.py:323
msgid ""
"Installation requires partitioning of your hard drive. Select what space to "
"use for the install target."