Package: dpkg-dev Version: 1.15.8.6 Severity: normal File: /usr/bin/dpkg-mergechangelogs
j...@gnu:~/src/tasksel>git stash apply dpkg-mergechangelogs: warning: .merge_file_qmEqOI(l1365): bad key-value after `;': `urgency=low ' LINE: tasksel (2.50) unstable; urgency=low dpkg-mergechangelogs: warning: .merge_file_QUd3Nf(l1366): bad key-value after `;': `urgency=low ' LINE: tasksel (2.50) unstable; urgency=low dpkg-mergechangelogs: warning: .merge_file_4ONINM(l1369): bad key-value after `;': `urgency=low ' LINE: tasksel (2.50) unstable; urgency=low Auto-merging debian/changelog CONFLICT (content): Merge conflict in debian/changelog The changelog started with this: tasksel (2.87) UNRELEASED; urgency=low Perhaps it's really choking on the UNRELEASED? -- System Information: Debian Release: squeeze/sid APT prefers unstable APT policy: (500, 'unstable'), (500, 'stable') Architecture: i386 (i686) Kernel: Linux 2.6.32-5-686 (SMP w/2 CPU cores) Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash Versions of packages dpkg-dev depends on: ii base-files 5.10 Debian base system miscellaneous f ii binutils 2.20.1-15 The GNU assembler, linker and bina ii bzip2 1.0.5-6 high-quality block-sorting file co ii libdpkg-perl 1.15.8.6 Dpkg perl modules ii make 3.81-8 An utility for Directing compilati ii patch 2.6-3 Apply a diff file to an original ii xz-utils 5.0.0-2 XZ-format compression utilities Versions of packages dpkg-dev recommends: ii build-essential 11.5 Informational list of build-essent ii fakeroot 1.14.4-1 Gives a fake root environment ii gcc [c-compiler] 4:4.4.5-1 The GNU C compiler ii gcc-4.3 [c-compiler] 4.3.5-4 The GNU C compiler ii gcc-4.4 [c-compiler] 4.4.5-8 The GNU C compiler ii gnupg 1.4.10-4 GNU privacy guard - a free PGP rep ii gpgv 1.4.10-4 GNU privacy guard - signature veri ii libalgorithm-merge-perl 0.08-2 Perl module for three-way merge of ii tcc [c-compiler] 0.9.25-5 the smallest ANSI C compiler Versions of packages dpkg-dev suggests: ii debian-keyring 2010.08.01 GnuPG (and obsolete PGP) keys of D -- no debconf information -- see shy jo
signature.asc
Description: Digital signature
