CVS commit: src/external/gpl2/lvm2tools/dist

[Adam Hamsik <haad%netbsd.org@localhost>]

Module Name:    src
Committed By:   haad
Date:           Fri Dec 12 11:55:07 UTC 2008

Added Files:
        src/external/gpl2/lvm2tools/dist/include: activate.h archiver.h btree.h
            clvm.h config.h configure.h crc.h defaults.h dev-cache.h device.h
            display.h errors.h filter-composite.h filter-md.h
            filter-persistent.h filter-regex.h filter-sysfs.h filter.h
            format-text.h format1.h format_pool.h intl.h label.h
            last-path-component.h lib.h locking.h log.h lv_alloc.h lvm-exec.h
            lvm-file.h lvm-string.h lvm-types.h lvm-wrappers.h lvmcache.h
            memlock.h metadata-exported.h metadata.h pogen.h pv_alloc.h
            report.h segtype.h sharedlib.h str_list.h targets.h text_export.h
            text_import.h toolcontext.h util.h uuid.h version.h xlate.h
Removed Files:
        src/external/gpl2/lvm2tools/dist: CONTRIBUTORS
        src/external/gpl2/lvm2tools/dist/debian: README.Debian changelog
            control copyright dirs docs init.d manpages rules
        src/external/gpl2/lvm2tools/dist/dmeventd: Makefile.in
        src/external/gpl2/lvm2tools/dist/dmeventd/mirror: .exported_symbols
            Makefile.in dmeventd_mirror.c
        src/external/gpl2/lvm2tools/dist/dmeventd/snapshot: .exported_symbols
            Makefile.in dmeventd_snapshot.c
        src/external/gpl2/lvm2tools/dist/old-tests/config: Makefile config_t.c
            empty_array.conf vg0
        src/external/gpl2/lvm2tools/dist/old-tests/datastruct: hash_t.c
        src/external/gpl2/lvm2tools/dist/old-tests/dev-mgr: dev_cache_t.c
        src/external/gpl2/lvm2tools/dist/old-tests/device: Makefile.in
            dev_cache_t.c fill_device.c random.c random.h
        src/external/gpl2/lvm2tools/dist/old-tests/filters: Makefile.in
            pfilter_t.c rfilter_t.c sample.cfg
        src/external/gpl2/lvm2tools/dist/old-tests/format1: Makefile.in
            get_pvs_t.c get_vgs_t.c pretty_print.c pretty_print.h read_pv_t.c
            read_vg_t.c write_vg_t.c
        src/external/gpl2/lvm2tools/dist/old-tests/mm: Makefile.in
            dbg_malloc_t.c
        src/external/gpl2/lvm2tools/dist/old-tests/regex: Makefile.in
            dev_patterns devices.list matcher_t.c parse_t.c

Log Message:
Resolve conflicts created by import of lvm2tools-2.02.43.


To generate a diff of this commit:
cvs rdiff -r1.1.1.1 -r0 src/external/gpl2/lvm2tools/dist/CONTRIBUTORS
cvs rdiff -r1.1.1.1 -r0 src/external/gpl2/lvm2tools/dist/debian/README.Debian \
    src/external/gpl2/lvm2tools/dist/debian/changelog \
    src/external/gpl2/lvm2tools/dist/debian/control \
    src/external/gpl2/lvm2tools/dist/debian/copyright \
    src/external/gpl2/lvm2tools/dist/debian/dirs \
    src/external/gpl2/lvm2tools/dist/debian/docs \
    src/external/gpl2/lvm2tools/dist/debian/init.d \
    src/external/gpl2/lvm2tools/dist/debian/manpages \
    src/external/gpl2/lvm2tools/dist/debian/rules
cvs rdiff -r1.1.1.1 -r0 src/external/gpl2/lvm2tools/dist/dmeventd/Makefile.in
cvs rdiff -r1.1.1.1 -r0 \
    src/external/gpl2/lvm2tools/dist/dmeventd/mirror/.exported_symbols \
    src/external/gpl2/lvm2tools/dist/dmeventd/mirror/Makefile.in \
    src/external/gpl2/lvm2tools/dist/dmeventd/mirror/dmeventd_mirror.c
cvs rdiff -r1.1.1.1 -r0 \
    src/external/gpl2/lvm2tools/dist/dmeventd/snapshot/.exported_symbols \
    src/external/gpl2/lvm2tools/dist/dmeventd/snapshot/Makefile.in \
    src/external/gpl2/lvm2tools/dist/dmeventd/snapshot/dmeventd_snapshot.c
cvs rdiff -r0 -r1.2 src/external/gpl2/lvm2tools/dist/include/activate.h \
    src/external/gpl2/lvm2tools/dist/include/archiver.h \
    src/external/gpl2/lvm2tools/dist/include/btree.h \
    src/external/gpl2/lvm2tools/dist/include/clvm.h \
    src/external/gpl2/lvm2tools/dist/include/config.h \
    src/external/gpl2/lvm2tools/dist/include/configure.h \
    src/external/gpl2/lvm2tools/dist/include/crc.h \
    src/external/gpl2/lvm2tools/dist/include/defaults.h \
    src/external/gpl2/lvm2tools/dist/include/dev-cache.h \
    src/external/gpl2/lvm2tools/dist/include/device.h \
    src/external/gpl2/lvm2tools/dist/include/display.h \
    src/external/gpl2/lvm2tools/dist/include/errors.h \
    src/external/gpl2/lvm2tools/dist/include/filter-composite.h \
    src/external/gpl2/lvm2tools/dist/include/filter-md.h \
    src/external/gpl2/lvm2tools/dist/include/filter-persistent.h \
    src/external/gpl2/lvm2tools/dist/include/filter-regex.h \
    src/external/gpl2/lvm2tools/dist/include/filter-sysfs.h \
    src/external/gpl2/lvm2tools/dist/include/filter.h \
    src/external/gpl2/lvm2tools/dist/include/format-text.h \
    src/external/gpl2/lvm2tools/dist/include/format1.h \
    src/external/gpl2/lvm2tools/dist/include/format_pool.h \
    src/external/gpl2/lvm2tools/dist/include/intl.h \
    src/external/gpl2/lvm2tools/dist/include/label.h \
    src/external/gpl2/lvm2tools/dist/include/last-path-component.h \
    src/external/gpl2/lvm2tools/dist/include/lib.h \
    src/external/gpl2/lvm2tools/dist/include/locking.h \
    src/external/gpl2/lvm2tools/dist/include/log.h \
    src/external/gpl2/lvm2tools/dist/include/lv_alloc.h \
    src/external/gpl2/lvm2tools/dist/include/lvm-exec.h \
    src/external/gpl2/lvm2tools/dist/include/lvm-file.h \
    src/external/gpl2/lvm2tools/dist/include/lvm-string.h \
    src/external/gpl2/lvm2tools/dist/include/lvm-types.h \
    src/external/gpl2/lvm2tools/dist/include/lvm-wrappers.h \
    src/external/gpl2/lvm2tools/dist/include/lvmcache.h \
    src/external/gpl2/lvm2tools/dist/include/memlock.h \
    src/external/gpl2/lvm2tools/dist/include/metadata-exported.h \
    src/external/gpl2/lvm2tools/dist/include/metadata.h \
    src/external/gpl2/lvm2tools/dist/include/pogen.h \
    src/external/gpl2/lvm2tools/dist/include/pv_alloc.h \
    src/external/gpl2/lvm2tools/dist/include/report.h \
    src/external/gpl2/lvm2tools/dist/include/segtype.h \
    src/external/gpl2/lvm2tools/dist/include/sharedlib.h \
    src/external/gpl2/lvm2tools/dist/include/str_list.h \
    src/external/gpl2/lvm2tools/dist/include/targets.h \
    src/external/gpl2/lvm2tools/dist/include/text_export.h \
    src/external/gpl2/lvm2tools/dist/include/text_import.h \
    src/external/gpl2/lvm2tools/dist/include/toolcontext.h \
    src/external/gpl2/lvm2tools/dist/include/util.h \
    src/external/gpl2/lvm2tools/dist/include/uuid.h \
    src/external/gpl2/lvm2tools/dist/include/version.h \
    src/external/gpl2/lvm2tools/dist/include/xlate.h
cvs rdiff -r1.1.1.1 -r0 \
    src/external/gpl2/lvm2tools/dist/old-tests/config/Makefile \
    src/external/gpl2/lvm2tools/dist/old-tests/config/config_t.c \
    src/external/gpl2/lvm2tools/dist/old-tests/config/empty_array.conf \
    src/external/gpl2/lvm2tools/dist/old-tests/config/vg0
cvs rdiff -r1.1.1.1 -r0 \
    src/external/gpl2/lvm2tools/dist/old-tests/datastruct/hash_t.c
cvs rdiff -r1.1.1.1 -r0 \
    src/external/gpl2/lvm2tools/dist/old-tests/dev-mgr/dev_cache_t.c
cvs rdiff -r1.1.1.1 -r0 \
    src/external/gpl2/lvm2tools/dist/old-tests/device/Makefile.in \
    src/external/gpl2/lvm2tools/dist/old-tests/device/dev_cache_t.c \
    src/external/gpl2/lvm2tools/dist/old-tests/device/fill_device.c \
    src/external/gpl2/lvm2tools/dist/old-tests/device/random.c \
    src/external/gpl2/lvm2tools/dist/old-tests/device/random.h
cvs rdiff -r1.1.1.1 -r0 \
    src/external/gpl2/lvm2tools/dist/old-tests/filters/Makefile.in \
    src/external/gpl2/lvm2tools/dist/old-tests/filters/pfilter_t.c \
    src/external/gpl2/lvm2tools/dist/old-tests/filters/rfilter_t.c \
    src/external/gpl2/lvm2tools/dist/old-tests/filters/sample.cfg
cvs rdiff -r1.1.1.1 -r0 \
    src/external/gpl2/lvm2tools/dist/old-tests/format1/Makefile.in \
    src/external/gpl2/lvm2tools/dist/old-tests/format1/get_pvs_t.c \
    src/external/gpl2/lvm2tools/dist/old-tests/format1/get_vgs_t.c \
    src/external/gpl2/lvm2tools/dist/old-tests/format1/pretty_print.c \
    src/external/gpl2/lvm2tools/dist/old-tests/format1/pretty_print.h \
    src/external/gpl2/lvm2tools/dist/old-tests/format1/read_pv_t.c \
    src/external/gpl2/lvm2tools/dist/old-tests/format1/read_vg_t.c \
    src/external/gpl2/lvm2tools/dist/old-tests/format1/write_vg_t.c
cvs rdiff -r1.1.1.1 -r0 \
    src/external/gpl2/lvm2tools/dist/old-tests/mm/Makefile.in \
    src/external/gpl2/lvm2tools/dist/old-tests/mm/dbg_malloc_t.c
cvs rdiff -r1.1.1.1 -r0 \
    src/external/gpl2/lvm2tools/dist/old-tests/regex/Makefile.in \
    src/external/gpl2/lvm2tools/dist/old-tests/regex/dev_patterns \
    src/external/gpl2/lvm2tools/dist/old-tests/regex/devices.list \
    src/external/gpl2/lvm2tools/dist/old-tests/regex/matcher_t.c \
    src/external/gpl2/lvm2tools/dist/old-tests/regex/parse_t.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.