Package: pristine-tar
Version: 1.00
Severity: normal
>From v84 to v85 kvm dropped two symlinks from their tarballs:
kernel/include/asm -> asm-x86
kernel/include-compat/asm -> asm-x86
With pristine-tar, they are still in the upstream branch after
importing v85. I've attached a example session...
-- System Information:
Debian Release: squeeze/sid
APT prefers unstable
APT policy: (900, 'unstable'), (300, 'experimental')
Architecture: i386 (i686)
Kernel: Linux 2.6.29.1-polaris (SMP w/2 CPU cores; PREEMPT)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash
Versions of packages pristine-tar depends on:
ii libc6 2.9-7 GNU C Library: Shared libraries
ii perl-modules 5.10.0-19 Core Perl modules
ii xdelta 1.1.3-8 A diff utility which works with bi
ii zlib1g 1:1.2.3.3.dfsg-13 compression library - runtime
Versions of packages pristine-tar recommends:
ii bzip2 1.0.5-1 high-quality block-sorting file co
ii pbzip2 1.0.5-1 parallel bzip2 implementation
pristine-tar suggests no packages.
-- no debconf information
jlue...@polaris:~/git/debian$ mkdir test
jlue...@polaris:~/git/debian$ cd test
jlue...@polaris:~/git/debian/test$ git init
Initialized empty Git repository in /home/jluebbe/git/debian/test/.git/
jlue...@polaris:~/git/debian/test$ git-import-orig -u 84+dfsg --no-merge --no-dch ../tarballs/kvm_84+dfsg.orig.tar.gz
Upstream version is 84+dfsg
Warning: Can't symlink orig.tar.gz due to missing debian/changelog
Initial import of '../tarballs/kvm_84+dfsg.orig.tar.gz' ...
pristine-tar: committed kvm_84+dfsg.orig.tar.gz.delta to branch pristine-tar
Succesfully merged version 84+dfsg of ../tarballs/kvm_84+dfsg.orig.tar.gz into .
jlue...@polaris:~/git/debian/test$ ls -l kernel/include/
total 12
lrwxrwxrwx 1 jluebbe jluebbe 7 2009-04-28 19:40 asm -> asm-x86
drwxr-xr-x 2 jluebbe jluebbe 4096 2009-02-15 01:36 asm-ia64
drwxr-xr-x 2 jluebbe jluebbe 4096 2009-02-15 01:36 asm-x86
drwxr-xr-x 2 jluebbe jluebbe 4096 2009-02-15 01:36 linux
jlue...@polaris:~/git/debian/test$ ls -l kernel/include-compat/
total 8
lrwxrwxrwx 1 jluebbe jluebbe 7 2009-04-28 19:40 asm -> asm-x86
drwxr-xr-x 2 jluebbe jluebbe 4096 2009-02-12 16:19 asm-x86
drwxr-xr-x 2 jluebbe jluebbe 4096 2009-02-12 16:19 linux
jlue...@polaris:~/git/debian/test$ git-import-orig -u 85+dfsg --no-merge --no-dch ../tarballs/kvm_85+dfsg.orig.tar.gz
Upstream version is 85+dfsg
Warning: Can't symlink orig.tar.gz due to missing debian/changelog
Importing '../tarballs/kvm_85+dfsg.orig.tar.gz' to branch 'upstream'...
Switched to branch 'upstream'
rm 'kvm'
rm 'qemu/hw/ppc_chrp.c'
rm 'qemu/pc-bios/bios-pq/0004_kvm-bios-add-mtrr-support.patch'
rm 'qemu/pc-bios/bios-pq/0005_kvm-bios-smp-mtrr-support.patch'
rm 'qemu/pc-bios/bios-pq/0006_kvm-bios-extend-mtrrs-to-above-4g.patch'
rm 'qemu/pc-bios/bios-pq/0007_kvm-bios-cleanup-consolidate-above-4g-memory-parsing.patch'
rm 'qemu/pc-bios/bios-pq/0008_kvm-bios-switch-mtrrs-to-cover-only-the-pci-range-and--default-to-wb.patch'
rm 'qemu/pc-bios/bios-pq/0009_kvm-bios-resolve-memory-device-roll-over-reporting--issues-with-32g-guests.patch'
rm 'qemu/pc-bios/bios-pq/0010_kvm-bios-fix-smbios-memory-device-length-boundary--condition.patch'
[upstream 68b73b1] Imported Upstream version 85+dfsg
416 files changed, 32652 insertions(+), 17075 deletions(-)
create mode 100755 kernel/configure
create mode 100644 kernel/include-compat/asm-ia64/msidef.h
create mode 100644 kernel/x86/kvm_timer.h
create mode 100644 kernel/x86/timer.c
delete mode 100755 kvm
create mode 100644 qemu/CODING_STYLE
create mode 100644 qemu/acl.c
create mode 100644 qemu/acl.h
create mode 100644 qemu/bt-host.h
create mode 100644 qemu/cmd.c
create mode 100644 qemu/cmd.h
rewrite qemu/hw/device-hotplug.c (87%)
rewrite qemu/hw/firmware_abi.h (70%)
create mode 100644 qemu/hw/framebuffer.c
create mode 100644 qemu/hw/framebuffer.h
create mode 100644 qemu/hw/ioapic.c
create mode 100644 qemu/hw/msmouse.c
create mode 100644 qemu/hw/msmouse.h
create mode 100644 qemu/hw/openpic.h
create mode 100644 qemu/hw/pci-hotplug.c
create mode 100644 qemu/hw/pci_ids.h
rename qemu/hw/{ppc_chrp.c => ppc_newworld.c} (82%)
create mode 100644 qemu/hw/ppce500.h
create mode 100644 qemu/hw/ppce500_mpc8544ds.c
create mode 100644 qemu/hw/ppce500_pci.c
create mode 100644 qemu/hxtool
create mode 100644 qemu/keymaps.h
create mode 100644 qemu/monitor.h
delete mode 100644 qemu/pc-bios/bios-pq/0004_kvm-bios-add-mtrr-support.patch
rename qemu/pc-bios/bios-pq/{0009_kvm-bios-resolve-memory-device-roll-over-reporting--issues-with-32g-guests.patch => 0004_kvm-bios-resolve-memory-device-roll-over-reporting--issues-with-32g-guests.patch} (100%)
rename qemu/pc-bios/bios-pq/{0010_kvm-bios-fix-smbios-memory-device-length-boundary--condition.patch => 0005_kvm-bios-fix-smbios-memory-device-length-boundary--condition.patch} (100%)
delete mode 100644 qemu/pc-bios/bios-pq/0005_kvm-bios-smp-mtrr-support.patch
delete mode 100644 qemu/pc-bios/bios-pq/0006_kvm-bios-extend-mtrrs-to-above-4g.patch
create mode 100644 qemu/pc-bios/bios-pq/0006_qemu-bios-use-preprocessor-for-pci-link-routing.patch
create mode 100644 qemu/pc-bios/bios-pq/0007_bios-add-26-pci-slots,-bringing-the-total-to-32.patch
delete mode 100644 qemu/pc-bios/bios-pq/0007_kvm-bios-cleanup-consolidate-above-4g-memory-parsing.patch
delete mode 100644 qemu/pc-bios/bios-pq/0008_kvm-bios-switch-mtrrs-to-cover-only-the-pci-range-and--default-to-wb.patch
create mode 100644 qemu/pc-bios/bios-pq/0008_qemu-bios-provide-gpe-_l0x-methods.patch
create mode 100644 qemu/pc-bios/bios-pq/0009_qemu-bios-pci-hotplug-support.patch
create mode 100644 qemu/pc-bios/bios-pq/0010_bios-mark-the-acpi-sci-interrupt-as-connected-to-irq-9.patch
create mode 100644 qemu/pc-bios/bios-pq/0011_read-additional-acpi-tables-from-a-vm.patch
rewrite qemu/pc-bios/bios-pq/series (69%)
create mode 100644 qemu/pc-bios/mpc8544ds.dts
rewrite qemu/ppc-dis.c (70%)
create mode 100644 qemu/qemu-io.c
create mode 100644 qemu/qemu-options.hx
create mode 100644 qemu/qemu.sasl
rewrite qemu/readline.c (61%)
create mode 100644 qemu/readline.h
create mode 100644 qemu/vnc-auth-sasl.c
create mode 100644 qemu/vnc-auth-sasl.h
create mode 100644 qemu/vnc-auth-vencrypt.c
create mode 100644 qemu/vnc-auth-vencrypt.h
create mode 100644 qemu/vnc-tls.c
create mode 100644 qemu/vnc-tls.h
create mode 100644 qemu/x_keymap.h
create mode 100755 scripts/make-release
create mode 100644 user/test/x86/msr.c
pristine-tar: committed kvm_85+dfsg.orig.tar.gz.delta to branch pristine-tar
Succesfully merged version 85+dfsg of ../tarballs/kvm_85+dfsg.orig.tar.gz into .
jlue...@polaris:~/git/debian/test$ ls -l kernel/include/
total 12
lrwxrwxrwx 1 jluebbe jluebbe 7 2009-04-28 19:40 asm -> asm-x86
drwxr-xr-x 2 jluebbe jluebbe 4096 2009-04-21 12:04 asm-ia64
drwxr-xr-x 2 jluebbe jluebbe 4096 2009-04-21 12:04 asm-x86
drwxr-xr-x 2 jluebbe jluebbe 4096 2009-04-21 12:04 linux
jlue...@polaris:~/git/debian/test$ ls -l kernel/include-compat/
total 12
lrwxrwxrwx 1 jluebbe jluebbe 7 2009-04-28 19:40 asm -> asm-x86
drwxr-xr-x 2 jluebbe jluebbe 4096 2009-04-21 11:57 asm-ia64
drwxr-xr-x 2 jluebbe jluebbe 4096 2009-04-21 11:57 asm-x86
drwxr-xr-x 2 jluebbe jluebbe 4096 2009-04-21 11:57 linux
jlue...@polaris:~/git/debian/test$ mkdir tarball
jlue...@polaris:~/git/debian/test$ cd tarball
jlue...@polaris:~/git/debian/test/tarball$ tar xf ../../tarballs/kvm_85+dfsg.orig.tar.gz
jlue...@polaris:~/git/debian/test/tarball$ ls -l kvm-85/kernel/include/
total 12
drwxr-xr-x 2 jluebbe jluebbe 4096 2009-04-21 12:04 asm-ia64
drwxr-xr-x 2 jluebbe jluebbe 4096 2009-04-21 12:04 asm-x86
drwxr-xr-x 2 jluebbe jluebbe 4096 2009-04-21 12:04 linux
jlue...@polaris:~/git/debian/test/tarball$ ls -l kvm-85/kernel/include-compat/
total 12
drwxr-xr-x 2 jluebbe jluebbe 4096 2009-04-21 11:57 asm-ia64
drwxr-xr-x 2 jluebbe jluebbe 4096 2009-04-21 11:57 asm-x86
drwxr-xr-x 2 jluebbe jluebbe 4096 2009-04-21 11:57 linux
jlue...@polaris:~/git/debian/test/tarball$ exit
