diff -Nru cdebootstrap-0.5.9ubuntu1/config/suites cdebootstrap-0.5.10ubuntu1/config/suites --- cdebootstrap-0.5.9ubuntu1/config/suites 2012-11-29 16:41:14.000000000 +0000 +++ cdebootstrap-0.5.10ubuntu1/config/suites 2013-05-14 20:47:55.000000000 +0000 @@ -66,6 +66,10 @@ Config: generic-ubuntu Keyring: ubuntu-archive-keyring.gpg +Suite: saucy +Config: generic-ubuntu +Keyring: ubuntu-archive-keyring.gpg + Suite: oldstable Keyring: debian-archive-keyring.gpg diff -Nru cdebootstrap-0.5.9ubuntu1/debian/changelog cdebootstrap-0.5.10ubuntu1/debian/changelog --- cdebootstrap-0.5.9ubuntu1/debian/changelog 2012-11-29 16:41:14.000000000 +0000 +++ cdebootstrap-0.5.10ubuntu1/debian/changelog 2013-05-14 20:47:55.000000000 +0000 @@ -1,3 +1,18 @@ +cdebootstrap (0.5.10ubuntu1) saucy; urgency=low + + * Merge from Debian Unstable. Remaining changes: + - Add support for older Ubuntu version in config/suites. + - Add "-Wno-error=unused-result" at CFLAGS_* in debian/rules against FTBFS. + * Add support for Ubuntu Saucy in config/suites. + + -- Vibhav Pant Sun, 28 Apr 2013 11:58:16 +0530 + +cdebootstrap (0.5.10) unstable; urgency=low + + * Disable InRelease support. (closes: #704613) + + -- Bastian Blank Mon, 15 Apr 2013 16:23:16 +0200 + cdebootstrap (0.5.9ubuntu1) raring; urgency=low * Merge form Debian. Remaining changes: diff -Nru cdebootstrap-0.5.9ubuntu1/src/download.c cdebootstrap-0.5.10ubuntu1/src/download.c --- cdebootstrap-0.5.9ubuntu1/src/download.c 2012-11-29 16:41:14.000000000 +0000 +++ cdebootstrap-0.5.10ubuntu1/src/download.c 2013-05-14 20:47:55.000000000 +0000 @@ -61,6 +61,7 @@ const char *message = "InRelease"; di_release *ret; +#if 0 build_indices_root ("InRelease", source, sizeof (source), target, sizeof (target)); if (!download_file (source, target, "InRelease")) @@ -71,6 +72,7 @@ else { log_message (LOG_MESSAGE_WARNING_DOWNLOAD_RETRIEVE, "InRelease"); +#endif message = "Release"; @@ -87,7 +89,9 @@ } else if (gpg_check_release (target, sig_target, "Release")) log_message (authentication ? LOG_MESSAGE_ERROR_DOWNLOAD_VALIDATE : LOG_MESSAGE_WARNING_DOWNLOAD_VALIDATE, "Release"); +#if 0 } +#endif log_message (LOG_MESSAGE_INFO_DOWNLOAD_PARSE, message);