lp:~ubuntu-branches/ubuntu/oneiric/cobbler/oneiric-201106090005

Branch merges

Propose for merging

No branches dependent on this one.

On hold for merging into lp:ubuntu/oneiric/cobbler

Dave Walker (community): Disapprove on 2011-06-09

Ubuntu branches: Pending requested 2011-06-09

Diff: 4459 lines (+52/-4124) (has conflicts)

24 files modified

.pc/.version (+0/-1)
.pc/05_cobbler_fix_reposync_permissions.patch/cobbler/action_reposync.py (+0/-568)
.pc/12_fix_dhcp_restart.patch/cobbler/modules/sync_post_restart_services.py (+0/-66)
.pc/21_cobbler_use_netboot.patch/cobbler/modules/manage_import_debian_ubuntu.py (+0/-777)
.pc/33_authn_configfile.patch/config/modules.conf (+0/-86)
.pc/34_fix_apache_wont_start.patch/config/cobbler_web.conf (+0/-14)
.pc/39_cw_remove_vhost.patch/config/cobbler_web.conf (+0/-14)
.pc/40_ubuntu_bind9_management.patch/cobbler/action_check.py (+0/-482)
.pc/40_ubuntu_bind9_management.patch/cobbler/modules/manage_bind.py (+0/-332)
.pc/40_ubuntu_bind9_management.patch/cobbler/modules/sync_post_restart_services.py (+0/-66)
.pc/40_ubuntu_bind9_management.patch/templates/etc/named.template (+0/-31)
.pc/41_update_tree_path_with_arch.patch/cobbler/modules/manage_import_debian_ubuntu.py (+0/-777)
.pc/42_fix_repomirror_create_sync.patch/cobbler/codes.py (+0/-98)
.pc/42_fix_repomirror_create_sync.patch/cobbler/modules/manage_import_debian_ubuntu.py (+0/-779)
.pc/applied-patches (+0/-10)
cobbler/action_check.py (+1/-1)
cobbler/action_reposync.py (+1/-6)
cobbler/codes.py (+2/-2)
cobbler/modules/manage_bind.py (+3/-3)
cobbler/modules/manage_import_debian_ubuntu.py (+18/-5)
cobbler/modules/sync_post_restart_services.py (+2/-2)
config/cobbler_web.conf (+5/-1)
config/modules.conf (+1/-1)
templates/etc/named.template (+19/-2)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

26. By Andres Rodriguez on 2011-06-08

* debian/patches/42_fix_repomirror_create_sync.patch: Improve method to
  obtain Ubuntu mirror to use if python-apt installed.
* debian/cobbler.postinst: Really fix setting of 'server'. Move the logic
  to obtain IP to debian/cobbler.config and set it default if available.

25. By Andres Rodriguez on 2011-06-08

Un-apply all patches and remove .pc. IMO branches should not reflect patches
applied as they generate huge diff's when updating or working with them.

24. By Andres Rodriguez on 2011-06-03

* debian/cobbler.templates: Re-introduce i18n support and refresh template.
* NOTE: The Following patches were NOT really dropped and SHOULD not be.
  - debian/patches/41_update_tree_path_with_arch.patch
  - debian/patches/42_fix_repomirror_create_sync.patch

23. By Chuck Short on 2011-06-03

[Chuck Short]
* New upstream version:
  - Dropped the following patches, already accepted upstream:
    + debian/patches/31_add_ubuntu_koan_utils_support.patch
    + debian/patches/32_fix_koan_import_yum.patch
    + debian/patches/36_tainted_file_path.patch
    + debian/patches/37_koan_install_tree.patch
    + debian/patches/38_koan_qcreate_ubuntu_support.patch
    + debian/patches/41_update_tree_path_with_arch.patch
    + debian/patches/42_fix_repomirror_create_sync.patch
    + debian/patches/42_fix_repomirror_create_sync.patch

[Andres Rodriguez]
* debian/cobbler.{templates, config, postinst}: Add debconf question to
  set next_server and server config options.

22. By Dave Walker on 2011-06-03

* Fixed Lintian error/warnings. (LP: #705436)
  - debian/{po/,control,cobbler.templates}: Added I18N support to debconf
    template file.
  - debian/control:
    + Bumped Standards Version to 3.9.2 (no changes needed)
    + Changed python-koan binary package to section python.
  - debian/copyright:
    + Updated Free Software Foundation (FSF) postal address.
    + Removed reference to base-files BSD licence.
  - debian/patches/44_cobbler_manpage_syntax_fix.patch: Fix manpage to not
    generate errors with pod2man.
  - debian/{rules,cobbler.install}: Drop file extension to /usr/sbin/tftpd.py
  - debian/cobbler.postrm: Set -e on shebang.
  - debian/cobbler-web.lintian-overrides: Overide warning of scripts which
    are purely provided as a web resource, never executed locally.
  - debian/cobbler.manpages, debian/manpages/{cobbler-ext-nodes.1,cobblerd.1,
    tftpd.1}: Initial manpages created.
* debian/control: Added Depends on python-twisted which is required by
  cobblers tftpd.

21. By Dustin Kirkland  on 2011-06-02

* debian/cobbler.postinst:
  - fix minor error in the grep from the last upload, fixing cobbler
    settings
* debian/control:
  - drop cman from suggests; fence-agents will land in the archive very
    soon and should be added as a recommends

20. By Andres Rodriguez on 2011-06-01

Set correct release for upload

19. By Dustin Kirkland  on 2011-06-01

* debian/control:
  - fix upstream URL, LP: #791101

18. By Dustin Kirkland  on 2011-05-31

* debian/cobbler.postinst:
  - set server and next_server in the initial cobbler settings, so as
    to make it more useful out of the box

17. By Andres Rodriguez on 2011-05-02

* debian/patches:
  - 41_update_tree_path_with_arch.patch: Update mirror_name to correctly
    reflect path tree patch when specifying arch on import. (LP: #772012)
  - 42_fix_repomirror_create_sync.patch: Fix the creation of a disabled
    repo mirror; enables apt as a repo. (LP: #765224)
  - 43_fix_reposync_env_variable.patch: Fix reposync HOME env variable for
    debmirror by hardcoding to /var/lib/cobbler. (LP: #775946)