Package=libxevie Merge_Strategy= Interactive=no QUIET=0 Package_version= MANUAL_MERGE=no Using package libxevie Warning: overwriting existing dir libxevie Cloning from Debian repository... Initialized empty Git repository in /srv/XorgAutoPackage/libxevie/.git/ Already on branch "debian-unstable" Fetching from freedesktop repository... remote: Generating pack... remote: Done counting 11 objects. remote: Result has 7 objects. remote: Deltifying 7 objects. remote: 0% (0/7) done 14% (1/7) done 28% (2/7) done remote: 42% (3/7) done remote: 57% (4/7) done remote: 71% (5/7) done remote: 85% (6/7) done 100% (7/7) done remote: remote: Total 7, written 7 (delta 4), reused 0 (delta 0) * refs/heads/upstream-head: storing branch 'master' of git://git.freedesktop.org/git/xorg/lib/libXevie commit: 0050934 Auto-following refs/tags/MODULAR_COPY Auto-following refs/tags/XACE-SELINUX-MERGE Auto-following refs/tags/XORG-6_7_99_1 Auto-following refs/tags/XORG-6_7_99_2 Auto-following refs/tags/XORG-6_7_99_901 Auto-following refs/tags/XORG-6_7_99_902 Auto-following refs/tags/XORG-6_7_99_903 Auto-following refs/tags/XORG-6_7_99_904 Auto-following refs/tags/XORG-6_8_0 Auto-following refs/tags/XORG-6_8_1 Auto-following refs/tags/XORG-6_8_1_901 Auto-following refs/tags/XORG-6_8_1_902 Auto-following refs/tags/XORG-6_8_1_903 Auto-following refs/tags/XORG-6_8_1_904 Auto-following refs/tags/XORG-6_8_2 Auto-following refs/tags/XORG-6_8_99_1 Auto-following refs/tags/XORG-6_8_99_10 Auto-following refs/tags/XORG-6_8_99_11 Auto-following refs/tags/XORG-6_8_99_12 Auto-following refs/tags/XORG-6_8_99_13 Auto-following refs/tags/XORG-6_8_99_14 Auto-following refs/tags/XORG-6_8_99_15 Auto-following refs/tags/XORG-6_8_99_16 Auto-following refs/tags/XORG-6_8_99_2 Auto-following refs/tags/XORG-6_8_99_3 Auto-following refs/tags/XORG-6_8_99_4 Auto-following refs/tags/XORG-6_8_99_5 Auto-following refs/tags/XORG-6_8_99_6 Auto-following refs/tags/XORG-6_8_99_7 Auto-following refs/tags/XORG-6_8_99_8 Auto-following refs/tags/XORG-6_8_99_9 Auto-following refs/tags/XORG-6_8_99_900 Auto-following refs/tags/XORG-6_8_99_901 Auto-following refs/tags/XORG-6_8_99_902 Auto-following refs/tags/XORG-6_8_99_903 Auto-following refs/tags/XORG-6_99_99_900 Auto-following refs/tags/XORG-6_99_99_901 Auto-following refs/tags/XORG-6_99_99_902 Auto-following refs/tags/XORG-6_99_99_903 Auto-following refs/tags/XORG-6_99_99_904 Auto-following refs/tags/XORG-7_0 Auto-following refs/tags/XORG-7_0_99_901 Auto-following refs/tags/XORG-7_1 Auto-following refs/tags/lg3d-base Auto-following refs/tags/lg3d-rel-0-6-2 Auto-following refs/tags/lg3d-rel-0-7-0 Auto-following refs/tags/libXevie-1_0_1 Auto-following refs/tags/rel-0-6-1 Auto-following refs/tags/sco_port_update-base remote: Generating pack... remote: Done counting 0 objects. remote: Total 0, written 0 (delta 0), reused 0 (delta 0) * refs/tags/MODULAR_COPY: storing tag 'MODULAR_COPY' of git://git.freedesktop.org/git/xorg/lib/libXevie commit: 29eaac2 * refs/tags/XACE-SELINUX-MERGE: storing tag 'XACE-SELINUX-MERGE' of git://git.freedesktop.org/git/xorg/lib/libXevie commit: 273efca * refs/tags/XORG-6_7_99_1: storing tag 'XORG-6_7_99_1' of git://git.freedesktop.org/git/xorg/lib/libXevie commit: a1f75fe * refs/tags/XORG-6_7_99_2: storing tag 'XORG-6_7_99_2' of git://git.freedesktop.org/git/xorg/lib/libXevie commit: a1f75fe * refs/tags/XORG-6_7_99_901: storing tag 'XORG-6_7_99_901' of git://git.freedesktop.org/git/xorg/lib/libXevie commit: e793225 * refs/tags/XORG-6_7_99_902: storing tag 'XORG-6_7_99_902' of git://git.freedesktop.org/git/xorg/lib/libXevie commit: e793225 * refs/tags/XORG-6_7_99_903: storing tag 'XORG-6_7_99_903' of git://git.freedesktop.org/git/xorg/lib/libXevie commit: e793225 * refs/tags/XORG-6_7_99_904: storing tag 'XORG-6_7_99_904' of git://git.freedesktop.org/git/xorg/lib/libXevie commit: e793225 * refs/tags/XORG-6_8_0: storing tag 'XORG-6_8_0' of git://git.freedesktop.org/git/xorg/lib/libXevie commit: e793225 * refs/tags/XORG-6_8_1: storing tag 'XORG-6_8_1' of git://git.freedesktop.org/git/xorg/lib/libXevie commit: e793225 * refs/tags/XORG-6_8_1_901: storing tag 'XORG-6_8_1_901' of git://git.freedesktop.org/git/xorg/lib/libXevie commit: e793225 * refs/tags/XORG-6_8_1_902: storing tag 'XORG-6_8_1_902' of git://git.freedesktop.org/git/xorg/lib/libXevie commit: e793225 * refs/tags/XORG-6_8_1_903: storing tag 'XORG-6_8_1_903' of git://git.freedesktop.org/git/xorg/lib/libXevie commit: e793225 * refs/tags/XORG-6_8_1_904: storing tag 'XORG-6_8_1_904' of git://git.freedesktop.org/git/xorg/lib/libXevie commit: e793225 * refs/tags/XORG-6_8_2: storing tag 'XORG-6_8_2' of git://git.freedesktop.org/git/xorg/lib/libXevie commit: e793225 * refs/tags/XORG-6_8_99_1: storing tag 'XORG-6_8_99_1' of git://git.freedesktop.org/git/xorg/lib/libXevie commit: e793225 * refs/tags/XORG-6_8_99_10: storing tag 'XORG-6_8_99_10' of git://git.freedesktop.org/git/xorg/lib/libXevie commit: 20b140f * refs/tags/XORG-6_8_99_11: storing tag 'XORG-6_8_99_11' of git://git.freedesktop.org/git/xorg/lib/libXevie commit: 20b140f * refs/tags/XORG-6_8_99_12: storing tag 'XORG-6_8_99_12' of git://git.freedesktop.org/git/xorg/lib/libXevie commit: 20b140f * refs/tags/XORG-6_8_99_13: storing tag 'XORG-6_8_99_13' of git://git.freedesktop.org/git/xorg/lib/libXevie commit: 20b140f * refs/tags/XORG-6_8_99_14: storing tag 'XORG-6_8_99_14' of git://git.freedesktop.org/git/xorg/lib/libXevie commit: a669d54 * refs/tags/XORG-6_8_99_15: storing tag 'XORG-6_8_99_15' of git://git.freedesktop.org/git/xorg/lib/libXevie commit: a669d54 * refs/tags/XORG-6_8_99_16: storing tag 'XORG-6_8_99_16' of git://git.freedesktop.org/git/xorg/lib/libXevie commit: a669d54 * refs/tags/XORG-6_8_99_2: storing tag 'XORG-6_8_99_2' of git://git.freedesktop.org/git/xorg/lib/libXevie commit: 2730ec4 * refs/tags/XORG-6_8_99_3: storing tag 'XORG-6_8_99_3' of git://git.freedesktop.org/git/xorg/lib/libXevie commit: 2730ec4 * refs/tags/XORG-6_8_99_4: storing tag 'XORG-6_8_99_4' of git://git.freedesktop.org/git/xorg/lib/libXevie commit: 2730ec4 * refs/tags/XORG-6_8_99_5: storing tag 'XORG-6_8_99_5' of git://git.freedesktop.org/git/xorg/lib/libXevie commit: 2730ec4 * refs/tags/XORG-6_8_99_6: storing tag 'XORG-6_8_99_6' of git://git.freedesktop.org/git/xorg/lib/libXevie commit: 2730ec4 * refs/tags/XORG-6_8_99_7: storing tag 'XORG-6_8_99_7' of git://git.freedesktop.org/git/xorg/lib/libXevie commit: 2730ec4 * refs/tags/XORG-6_8_99_8: storing tag 'XORG-6_8_99_8' of git://git.freedesktop.org/git/xorg/lib/libXevie commit: 20b140f * refs/tags/XORG-6_8_99_9: storing tag 'XORG-6_8_99_9' of git://git.freedesktop.org/git/xorg/lib/libXevie commit: 20b140f * refs/tags/XORG-6_8_99_900: storing tag 'XORG-6_8_99_900' of git://git.freedesktop.org/git/xorg/lib/libXevie commit: a669d54 * refs/tags/XORG-6_8_99_901: storing tag 'XORG-6_8_99_901' of git://git.freedesktop.org/git/xorg/lib/libXevie commit: a669d54 * refs/tags/XORG-6_8_99_902: storing tag 'XORG-6_8_99_902' of git://git.freedesktop.org/git/xorg/lib/libXevie commit: a669d54 * refs/tags/XORG-6_8_99_903: storing tag 'XORG-6_8_99_903' of git://git.freedesktop.org/git/xorg/lib/libXevie commit: 44e396d * refs/tags/XORG-6_99_99_900: storing tag 'XORG-6_99_99_900' of git://git.freedesktop.org/git/xorg/lib/libXevie commit: 731b653 * refs/tags/XORG-6_99_99_901: storing tag 'XORG-6_99_99_901' of git://git.freedesktop.org/git/xorg/lib/libXevie commit: bb290ce * refs/tags/XORG-6_99_99_902: storing tag 'XORG-6_99_99_902' of git://git.freedesktop.org/git/xorg/lib/libXevie commit: bb290ce * refs/tags/XORG-6_99_99_903: storing tag 'XORG-6_99_99_903' of git://git.freedesktop.org/git/xorg/lib/libXevie commit: bdde5c7 * refs/tags/XORG-6_99_99_904: storing tag 'XORG-6_99_99_904' of git://git.freedesktop.org/git/xorg/lib/libXevie commit: 5498493 * refs/tags/XORG-7_0: storing tag 'XORG-7_0' of git://git.freedesktop.org/git/xorg/lib/libXevie commit: 5498493 * refs/tags/XORG-7_0_99_901: storing tag 'XORG-7_0_99_901' of git://git.freedesktop.org/git/xorg/lib/libXevie commit: 26e1c4f * refs/tags/XORG-7_1: storing tag 'XORG-7_1' of git://git.freedesktop.org/git/xorg/lib/libXevie commit: dc6862c * refs/tags/lg3d-base: storing tag 'lg3d-base' of git://git.freedesktop.org/git/xorg/lib/libXevie commit: e793225 * refs/tags/lg3d-rel-0-6-2: storing tag 'lg3d-rel-0-6-2' of git://git.freedesktop.org/git/xorg/lib/libXevie commit: e793225 * refs/tags/lg3d-rel-0-7-0: storing tag 'lg3d-rel-0-7-0' of git://git.freedesktop.org/git/xorg/lib/libXevie commit: e793225 * refs/tags/libXevie-1_0_1: storing tag 'libXevie-1_0_1' of git://git.freedesktop.org/git/xorg/lib/libXevie commit: dc6862c * refs/tags/rel-0-6-1: storing tag 'rel-0-6-1' of git://git.freedesktop.org/git/xorg/lib/libXevie commit: e793225 * refs/tags/sco_port_update-base: storing tag 'sco_port_update-base' of git://git.freedesktop.org/git/xorg/lib/libXevie commit: 2730ec4 Switched to a new branch "mybranch" Merging Debian changes... CONFLICT (delete/modify): ChangeLog deleted in HEAD and modified in debian-unstable. Version debian-unstable of ChangeLog left in tree. Automatic merge failed; fix conflicts and then commit the result. Merges needed # On branch mybranch # Changes to be committed: # (use "git reset HEAD ..." to unstage) # # new file: INSTALL # new file: Makefile.in # new file: aclocal.m4 # new file: config.guess # new file: config.h.in # new file: config.sub # new file: configure # new file: debian/changelog # new file: debian/compat # new file: debian/control # new file: debian/copyright # new file: debian/libxevie-dev.install # new file: debian/libxevie-dev.manpages # new file: debian/libxevie1.install # new file: debian/patches/series # new file: debian/rules # new file: debian/watch # new file: debian/xsfbs/xsfbs-autoreconf.mk # new file: debian/xsfbs/xsfbs.mk # new file: debian/xsfbs/xsfbs.sh # new file: depcomp # new file: install-sh # new file: ltmain.sh # new file: man/Makefile.in # new file: missing # new file: mkinstalldirs # new file: src/Makefile.in # # Changed but not updated: # (use "git add ..." to update what will be committed) # # unmerged: ChangeLog # Attempting to address merge issues automatically... Initialized empty Git repository in /srv/XorgAutoPackage/libxevie-FDO-HEAD/.git/ remote: Generating pack... remote: Done counting 163 objects. remote: Deltifying 163 objects. remote: 0% (1/163) done 1% (2/163) done 2% (4/163) done remote: 3% (5/163) done 4% (7/163) done 5% (9/163) done remote: 6% (10/163) done 7% (12/163) done 8% (14/163) done 9% (15/163) done remote: 10% (17/163) done 11% (18/163) done 12% (20/163) done remote: 13% (22/163) done 14% (23/163) done 15% (25/163) done remote: 16% (27/163) done 17% (28/163) done 18% (30/163) done remote: 19% (31/163) done 20% (33/163) done 21% (35/163) done remote: 22% (36/163) done 23% (38/163) done 24% (40/163) done 25% (41/163) done remote: 26% (43/163) done 27% (45/163) done 28% (46/163) done 29% (48/163) done remote: 30% (49/163) done 31% (51/163) done 32% (53/163) done remote: 33% (54/163) done 34% (56/163) done 35% (58/163) done remote: 36% (59/163) done 37% (61/163) done 38% (62/163) done 39% (64/163) done remote: 40% (66/163) done remote: 41% (67/163) done remote: 42% (69/163) done remote: 43% (71/163) done 44% (72/163) done remote: 45% (74/163) done remote: 46% (75/163) done remote: 47% (77/163) done remote: 48% (79/163) done remote: 49% (80/163) done remote: 50% (82/163) done remote: 51% (84/163) done remote: 52% (85/163) done remote: 53% (87/163) done remote: 54% (89/163) done 55% (90/163) done remote: 56% (92/163) done 57% (93/163) done remote: 58% (95/163) done remote: 59% (97/163) done 60% (98/163) done remote: 61% (100/163) done remote: 62% (102/163) done 63% (103/163) done remote: 64% (105/163) done remote: 65% (106/163) done remote: 66% (108/163) done remote: 67% (110/163) done 68% (111/163) done remote: 69% (113/163) done 70% (115/163) done 71% (116/163) done remote: 72% (118/163) done remote: 73% (119/163) done remote: 74% (121/163) done remote: 75% (123/163) done remote: 76% (124/163) done remote: 77% (126/163) done 78% (128/163) done remote: 79% (129/163) done 80% (131/163) done 81% (133/163) done remote: 82% (134/163) done 83% (136/163) done 84% (137/163) done remote: 85% (139/163) done remote: 86% (141/163) done remote: 87% (142/163) done remote: 88% (144/163) done remote: 89% (146/163) done remote: 90% (147/163) done remote: 91% (149/163) done remote: 92% (150/163) done remote: 93% (152/163) done remote: 94% (154/163) done remote: 95% (155/163) done remote: 96% (157/163) done remote: 97% (159/163) done remote: 98% (160/163) done remote: 99% (162/163) done remote: 100% (163/163) done remote: remote: Total 163, written 163 (delta 80), reused 136 (delta 65) # unmerged: ChangeLog + unmerged ChangeLog from Debian - attempting to delete rm 'ChangeLog' rm 'ChangeLog' Created commit 89be0fd: Dropping Debian-provided ChangeLog in favor of generated one Already up-to-date. Success resolving 1 merge issue in libxevie Dropping debian/patches/series Running autoreconf ./auto-xorg-git: line 410: syntax error near unexpected token `(' ./auto-xorg-git: line 410: `dch -b --distribution $DISTRIBUTION --newversion ${EPOCH}${GITVER}-$ADDVERSION "Checkout from git $TODAY ($BRANCH branch) up to $LASTCOMMIT" || die "dch: $?"'