[Git-commits] [grml/live-boot-grml] 71d864: Merge remote-tracking branch 'deb/debian' into deb...

[Christian Hofstaedtler]

  Branch: refs/heads/master
  Home:   https://github.com/grml/live-boot-grml

  Commit: 71d86430dfeaacdedfb93dce0984361ad6fb9858
      https://github.com/grml/live-boot-grml/commit/71d86430dfeaacdedfb93dce0984361ad6fb9858
  Author: Christian Hofstaedtler <ch at grml.org>
  Date:   2011-12-06 (Tue, 06 Dec 2011)

  Changed paths:
    M Makefile
  M VERSION
  M bin/live-snapshot
  M debian/changelog
  M debian/control
  M debian/live-boot.init
  M debian/rules
  M hooks/live
  M manpages/de/live-boot.de.7
  M manpages/de/live-snapshot.de.1
  M manpages/en/live-boot.7
  M manpages/en/live-snapshot.1
  M manpages/po/de/live-boot.7.po
  M manpages/po/de/live-snapshot.1.po
  M manpages/pot/live-boot.7.pot
  M manpages/pot/live-snapshot.1.pot
  M scripts/live
  A scripts/live-bottom/10validateroot
  M scripts/live-helpers

  Log Message:
  -----------
  Merge remote-tracking branch 'deb/debian' into debian


  Commit: 6ac1aac5fcd96ce1e986e64884bd8c16a7aa9ea8
      https://github.com/grml/live-boot-grml/commit/6ac1aac5fcd96ce1e986e64884bd8c16a7aa9ea8
  Author: Christian Hofstaedtler <ch at grml.org>
  Date:   2011-12-06 (Tue, 06 Dec 2011)

  Changed paths:
    M Makefile
  M VERSION
  M bin/live-snapshot
  M debian/changelog
  M debian/control
  M debian/live-boot-grml.init
  M debian/rules
  M hooks/live
  M manpages/de/live-boot.de.7
  M manpages/de/live-snapshot.de.1
  M manpages/en/live-boot.7
  M manpages/en/live-snapshot.1
  M manpages/po/de/live-boot.7.po
  M manpages/po/de/live-snapshot.1.po
  M manpages/pot/live-boot.7.pot
  M manpages/pot/live-snapshot.1.pot
  M scripts/live
  A scripts/live-bottom/10validateroot
  M scripts/live-helpers

  Log Message:
  -----------
  Merge branch 'debian'

Conflicts:
	debian/changelog
	debian/control
	debian/rules


  Commit: d46d0105188c56457d4beb620c0cc7723be3a849
      https://github.com/grml/live-boot-grml/commit/d46d0105188c56457d4beb620c0cc7723be3a849
  Author: Christian Hofstaedtler <ch at grml.org>
  Date:   2011-12-06 (Tue, 06 Dec 2011)

  Changed paths:
    R debian/patches/01_fix_output_file.patch
  M debian/patches/series

  Log Message:
  -----------
  Drop upstream-applied patch: 01_fix_output_file


  Commit: 37de4fd22509663ad0237ed15bb5452d2f0e9dc1
      https://github.com/grml/live-boot-grml/commit/37de4fd22509663ad0237ed15bb5452d2f0e9dc1
  Author: Christian Hofstaedtler <ch at grml.org>
  Date:   2011-12-06 (Tue, 06 Dec 2011)

  Changed paths:
    R debian/patches/10_validateroot.patch
  M debian/patches/series

  Log Message:
  -----------
  Drop upstream-applied patch: 10_validateroot


  Commit: 94e15515eedcb233b53ca4d35327f0380de7019e
      https://github.com/grml/live-boot-grml/commit/94e15515eedcb233b53ca4d35327f0380de7019e
  Author: Christian Hofstaedtler <ch at grml.org>
  Date:   2011-12-06 (Tue, 06 Dec 2011)

  Changed paths:
    R debian/patches/25_support_lvm_for_live-media.patch
  M debian/patches/series

  Log Message:
  -----------
  Drop upstream-applied patch: 25_support_lvm_for_live-media


  Commit: ff71d02fb376c244522a8214bbdd5abd54a7aab5
      https://github.com/grml/live-boot-grml/commit/ff71d02fb376c244522a8214bbdd5abd54a7aab5
  Author: Christian Hofstaedtler <ch at grml.org>
  Date:   2011-12-06 (Tue, 06 Dec 2011)

  Changed paths:
    M debian/patches/07_support_findiso.patch

  Log Message:
  -----------
  07_support_findiso: remove upstream-applied parts


  Commit: 8847dfc9b096124d7884f96fc5bdfd4e1a0f4381
      https://github.com/grml/live-boot-grml/commit/8847dfc9b096124d7884f96fc5bdfd4e1a0f4381
  Author: Christian Hofstaedtler <ch at grml.org>
  Date:   2011-12-06 (Tue, 06 Dec 2011)

  Changed paths:
    M debian/patches/31_package_rename.patch

  Log Message:
  -----------
  Manually refresh 31_package_rename


  Commit: 447c0d1349b4c96c9161f837990cd9c98f7c5ced
      https://github.com/grml/live-boot-grml/commit/447c0d1349b4c96c9161f837990cd9c98f7c5ced
  Author: Christian Hofstaedtler <ch at grml.org>
  Date:   2011-12-06 (Tue, 06 Dec 2011)

  Changed paths:
    M debian/patches/03_grml_version_file_hook.patch
  M debian/patches/12_uuid_support.patch
  M debian/patches/14_no_blkid_on_lenny.patch
  M debian/patches/19_revert_toram_bootoption_to_expected_behaviour.patch
  M debian/patches/27_support_static_ip.patch
  M debian/patches/29_support_dns_in_initramfs.patch
  M debian/patches/30_support_multiarch_dns.patch
  M debian/patches/32_add_kms.patch

  Log Message:
  -----------
  Automatically refresh patches that need it


  Commit: 1e61d64290a53d71985f34b0a592092777284c74
      https://github.com/grml/live-boot-grml/commit/1e61d64290a53d71985f34b0a592092777284c74
  Author: Christian Hofstaedtler <ch at grml.org>
  Date:   2011-12-06 (Tue, 06 Dec 2011)

  Changed paths:
    A debian/patches/33_retry_phram.patch
  M debian/patches/series
  M scripts/live

  Log Message:
  -----------
  Turn d4619b77 into a quilt patch

Otherwise dpkg-source (rightfully) complains that there are
untracked local changes.


Compare: https://github.com/grml/live-boot-grml/compare/d4619b7...1e61d64