Merge branch 'release-0.17' into devel

8 files changed, 31 insertions, 31 deletions

diff --git a/ChangeLog b/ChangeLog
index fb58a10..e6b1e28 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
-Release 0.17 - Tue Feb 22 2013
+Release 0.17 - Tue Feb 28 2013
 ===========================================================
  * support new distribution Fedora 18
  * enable to handle more than 3 partitions
diff --git a/VERSION b/VERSION
index b0e375c..50653ad 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.17-rc0
+0.17
diff --git a/debian/changelog b/debian/changelog
index 564156e..1a7f58a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,20 +1,20 @@
-mic (0.17-0.rc0) unstable; urgency=low
-
- * support new distribution Fedora 18
- * enable to handle more than 3 partitions
- * support partitions without mount point
- * move vcs infomation from .vcs to .packages
- * clean up some mess in utils/misc.py
- * bug fix:
-   - fix failure when symbolic link vmlinuz in single disk
-   - fix incorrect alignment handling
-   - fix requires squashfs in opensuse
-   - fix unicode error in myurlgrab
- * code cleanup:
-   - clean up some mess in utils/misc.py
-   - clean up pylint issue in creator.py
-
- -- Gui Chen <gui.chen@intel.com>  Tue, 22 Feb 2013 17:25:35 +0800
+mic (0.17-1) unstable; urgency=low
+
+  * support new distribution Fedora 18
+  * enable to handle more than 3 partitions
+  * support partitions without mount point
+  * move vcs infomation from .vcs to .packages
+  * clean up some mess in utils/misc.py
+  * bug fix:
+    - fix failure when symbolic link vmlinuz in single disk
+    - fix incorrect alignment handling
+    - fix requires squashfs in opensuse
+    - fix unicode error in myurlgrab
+  * code cleanup:
+    - clean up some mess in utils/misc.py
+    - clean up pylint issue in creator.py
+
+ -- Gui Chen <gui.chen@intel.com>  Tue, 28 Feb 2013 17:25:35 +0800
 
 mic (0.16-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index ee3f41c..278c369 100644
--- a/debian/control
+++ b/debian/control
@@ -21,6 +21,8 @@ Depends: ${misc:Depends}, ${python:Depends}, ${dist:Depends},
  psmisc,
  squashfs-tools (>= 4.0),
  yum (>= 3.2),
+ syslinux (>= 2:4.05),
+ extlinux (>= 2:4.05),
  libzypp,
  python-zypp,
  python-m2crypto,
diff --git a/debian/rules b/debian/rules
index 674a4e1..ebdca12 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,9 +4,9 @@
 #export DH_VERBOSE=1
 
 ifeq ($(shell cat /etc/issue | cut -d' ' -f2), 11.10)
-	SUBSTVARS = -Vdist:Depends="qemu-arm-static, syslinux (>= 2:4.05)"
+	SUBSTVARS = -Vdist:Depends="qemu-arm-static"
 else
-	SUBSTVARS = -Vdist:Depends="qemu-user-static, syslinux (>= 2:4.05), extlinux (>= 2:4.05)"
+	SUBSTVARS = -Vdist:Depends="qemu-user-static"
 endif
 
 
diff --git a/doc/RELEASE_NOTES b/doc/RELEASE_NOTES
index d697f56..a25f2f1 100644
--- a/doc/RELEASE_NOTES
+++ b/doc/RELEASE_NOTES
@@ -1,6 +1,6 @@
  MIC Image Creator 0.17 Release Notes
 ===========================================================
-Released Feb 26 2013
+Released Feb 28 2013
 
 This release note documents the changes included in the MIC 0.17 release. And
 the release contains new features, enhancements and bug fixes.
diff --git a/packaging/mic.changes b/packaging/mic.changes
index 227972e..8bf2c33 100644
--- a/packaging/mic.changes
+++ b/packaging/mic.changes
@@ -1,4 +1,4 @@
-* Tue Feb 22 2013 Gui Chen <gui.chen@intel.com> - 0.17
+* Tue Feb 28 2013 Gui Chen <gui.chen@intel.com> - 0.17
   - support new distribution Fedora 18
   - enable to handle more than 3 partitions
   - support partitions without mount point
diff --git a/packaging/mic.spec b/packaging/mic.spec
index f19dd57..7eb25c4 100644
--- a/packaging/mic.spec
+++ b/packaging/mic.spec
@@ -3,7 +3,7 @@
 Name:       mic
 Summary:    Image Creator for Linux Distributions
 Version:    0.17
-Release:    0.rc0
+Release:    1
 Group:      System/Base
 License:    GPLv2
 BuildArch:  noarch
@@ -44,7 +44,7 @@ Requires:   squashfs-tools >= 4.0
 Requires:   syslinux-extlinux
 %endif
 
-%if "0%{?tizen_version}" != "0"
+%if 0%{?tizen_version:1}
 Requires:   qemu-linux-user
 %else
 Requires:   qemu-arm-static
@@ -53,7 +53,7 @@ Requires:   qemu-arm-static
 Requires:   python-zypp
 
 BuildRequires:  python-devel
-%if "0%{?tizen_version}" == "0"
+%if 0%{?tizen_version:1}
 BuildRequires:  python-docutils
 %endif
 
@@ -61,7 +61,6 @@ Obsoletes:  mic2
 
 BuildRoot:  %{_tmppath}/%{name}_%{version}-build
 
-
 %description
 The tool mic is used to create and manipulate images for Linux distributions.
 It is composed of three subcommand\: create, convert, chroot. Subcommand create
@@ -69,13 +68,12 @@ is used to create images with different types; subcommand convert is used to
 convert an image to a specified type; subcommand chroot is used to chroot into
 an image.
 
-
 %prep
 %setup -q -n %{name}-%{version}
 
 %build
 CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
-%if "0%{?tizen_version}" == "0"
+%if 0%{?tizen_version:1}
 make man
 %endif
 
@@ -89,7 +87,7 @@ rm -rf $RPM_BUILD_ROOT
 
 # install man page
 mkdir -p %{buildroot}/%{_prefix}/share/man/man1
-%if "0%{?tizen_version}" == "0"
+%if 0%{?tizen_version:1}
 install -m644 doc/mic.1 %{buildroot}/%{_prefix}/share/man/man1
 %endif
 
@@ -97,7 +95,7 @@ install -m644 doc/mic.1 %{buildroot}/%{_prefix}/share/man/man1
 %defattr(-,root,root,-)
 %doc doc/*
 %doc README.rst AUTHORS COPYING ChangeLog
-%if "0%{?tizen_version}" == "0"
+%if 0%{?tizen_version:1}
 %{_mandir}/man1/*
 %endif
 %dir %{_sysconfdir}/%{name}