Ubuntu
cdebootstrap package

Merge lp:~vibhavp/ubuntu/saucy/cdebootstrap/merge-from-debian into lp:ubuntu/saucy/cdebootstrap

  1. Saucy (13.10)
  2. merge-from-debian
  3. Merge into saucy
Proposed by Vibhav Pant
Status: Merged
Merge reported by: Andrew Starr-Bochicchio
Merged at revision: not available
Proposed branch: lp:~vibhavp/ubuntu/saucy/cdebootstrap/merge-from-debian
Merge into: lp:ubuntu/saucy/cdebootstrap
Diff against target: 66 lines (+23/-0)
3 files modified
config/suites (+4/-0)
debian/changelog (+15/-0)
src/download.c (+4/-0)
To merge this branch: bzr merge lp:~vibhavp/ubuntu/saucy/cdebootstrap/merge-from-debian
Reviewer Review Type Date Requested Status
Andrew Starr-Bochicchio (community) Approve
Ubuntu branches Pending
Review via email: mp+161312@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Andrew Starr-Bochicchio (andrewsomething) wrote :

Looks good.

Thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'config/suites'
2--- config/suites 2012-11-25 19:09:11 +0000
3+++ config/suites 2013-04-28 06:34:23 +0000
4@@ -66,6 +66,10 @@
5 Config: generic-ubuntu
6 Keyring: ubuntu-archive-keyring.gpg
7
8+Suite: saucy
9+Config: generic-ubuntu
10+Keyring: ubuntu-archive-keyring.gpg
11+
12 Suite: oldstable
13 Keyring: debian-archive-keyring.gpg
14
15
16=== modified file 'debian/changelog'
17--- debian/changelog 2012-11-25 19:09:11 +0000
18+++ debian/changelog 2013-04-28 06:34:23 +0000
19@@ -1,3 +1,18 @@
20+cdebootstrap (0.5.10ubuntu1) saucy; urgency=low
21+
22+ * Merge from Debian Unstable. Remaining changes:
23+ - Add support for older Ubuntu version in config/suites.
24+ - Add "-Wno-error=unused-result" at CFLAGS_* in debian/rules against FTBFS.
25+ * Add support for Ubuntu Saucy in config/suites.
26+
27+ -- Vibhav Pant <vibhavp@ubuntu.com> Sun, 28 Apr 2013 11:58:16 +0530
28+
29+cdebootstrap (0.5.10) unstable; urgency=low
30+
31+ * Disable InRelease support. (closes: #704613)
32+
33+ -- Bastian Blank <waldi@debian.org> Mon, 15 Apr 2013 16:23:16 +0200
34+
35 cdebootstrap (0.5.9ubuntu1) raring; urgency=low
36
37 * Merge form Debian. Remaining changes:
38
39=== modified file 'src/download.c'
40--- src/download.c 2012-11-25 19:09:11 +0000
41+++ src/download.c 2013-04-28 06:34:23 +0000
42@@ -61,6 +61,7 @@
43 const char *message = "InRelease";
44 di_release *ret;
45
46+#if 0
47 build_indices_root ("InRelease", source, sizeof (source), target, sizeof (target));
48
49 if (!download_file (source, target, "InRelease"))
50@@ -71,6 +72,7 @@
51 else
52 {
53 log_message (LOG_MESSAGE_WARNING_DOWNLOAD_RETRIEVE, "InRelease");
54+#endif
55
56 message = "Release";
57
58@@ -87,7 +89,9 @@
59 }
60 else if (gpg_check_release (target, sig_target, "Release"))
61 log_message (authentication ? LOG_MESSAGE_ERROR_DOWNLOAD_VALIDATE : LOG_MESSAGE_WARNING_DOWNLOAD_VALIDATE, "Release");
62+#if 0
63 }
64+#endif
65
66 log_message (LOG_MESSAGE_INFO_DOWNLOAD_PARSE, message);
67

Subscribers

People subscribed via source and target branches

to all changes: