Package=libdmx Merge_Strategy= Interactive=no QUIET=0 Package_version= MANUAL_MERGE=no Using package libdmx Warning: overwriting existing dir libdmx Cloning from Debian repository... Initialized empty Git repository in /srv/XorgAutoPackage/libdmx/.git/ Already on branch "debian-unstable" Fetching from freedesktop repository... remote: Generating pack... remote: Done counting 9 objects. remote: Result has 6 objects. remote: Deltifying 6 objects. remote: 0% (0/6) done 16% (1/6) done remote: 33% (2/6) done remote: 50% (3/6) done remote: 66% (4/6) done remote: 83% (5/6) done 100% (6/6) done remote: remote: Total 6, written 6 (delta 4), reused 0 (delta 0) * refs/heads/upstream-head: storing branch 'master' of git://git.freedesktop.org/git/xorg/lib/libdmx commit: cfd82b1 Auto-following refs/tags/MODULAR_COPY 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_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-7-0 Auto-following refs/tags/libdmx-1_0_2 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/libdmx commit: e608c6a * refs/tags/XORG-6_7_99_1: storing tag 'XORG-6_7_99_1' of git://git.freedesktop.org/git/xorg/lib/libdmx commit: 90b1782 * refs/tags/XORG-6_7_99_2: storing tag 'XORG-6_7_99_2' of git://git.freedesktop.org/git/xorg/lib/libdmx commit: 90b1782 * refs/tags/XORG-6_7_99_901: storing tag 'XORG-6_7_99_901' of git://git.freedesktop.org/git/xorg/lib/libdmx commit: 90b1782 * refs/tags/XORG-6_7_99_902: storing tag 'XORG-6_7_99_902' of git://git.freedesktop.org/git/xorg/lib/libdmx commit: 90b1782 * refs/tags/XORG-6_7_99_903: storing tag 'XORG-6_7_99_903' of git://git.freedesktop.org/git/xorg/lib/libdmx commit: 90b1782 * refs/tags/XORG-6_7_99_904: storing tag 'XORG-6_7_99_904' of git://git.freedesktop.org/git/xorg/lib/libdmx commit: 90b1782 * refs/tags/XORG-6_8_0: storing tag 'XORG-6_8_0' of git://git.freedesktop.org/git/xorg/lib/libdmx commit: 90b1782 * refs/tags/XORG-6_8_1: storing tag 'XORG-6_8_1' of git://git.freedesktop.org/git/xorg/lib/libdmx commit: 90b1782 * refs/tags/XORG-6_8_99_1: storing tag 'XORG-6_8_99_1' of git://git.freedesktop.org/git/xorg/lib/libdmx commit: 9569816 * refs/tags/XORG-6_8_99_10: storing tag 'XORG-6_8_99_10' of git://git.freedesktop.org/git/xorg/lib/libdmx commit: 9569816 * refs/tags/XORG-6_8_99_11: storing tag 'XORG-6_8_99_11' of git://git.freedesktop.org/git/xorg/lib/libdmx commit: 9569816 * refs/tags/XORG-6_8_99_12: storing tag 'XORG-6_8_99_12' of git://git.freedesktop.org/git/xorg/lib/libdmx commit: 48338cc * refs/tags/XORG-6_8_99_13: storing tag 'XORG-6_8_99_13' of git://git.freedesktop.org/git/xorg/lib/libdmx commit: 48338cc * refs/tags/XORG-6_8_99_14: storing tag 'XORG-6_8_99_14' of git://git.freedesktop.org/git/xorg/lib/libdmx commit: 48338cc * refs/tags/XORG-6_8_99_15: storing tag 'XORG-6_8_99_15' of git://git.freedesktop.org/git/xorg/lib/libdmx commit: 48338cc * refs/tags/XORG-6_8_99_16: storing tag 'XORG-6_8_99_16' of git://git.freedesktop.org/git/xorg/lib/libdmx commit: 48338cc * refs/tags/XORG-6_8_99_2: storing tag 'XORG-6_8_99_2' of git://git.freedesktop.org/git/xorg/lib/libdmx commit: 9569816 * refs/tags/XORG-6_8_99_3: storing tag 'XORG-6_8_99_3' of git://git.freedesktop.org/git/xorg/lib/libdmx commit: 9569816 * refs/tags/XORG-6_8_99_4: storing tag 'XORG-6_8_99_4' of git://git.freedesktop.org/git/xorg/lib/libdmx commit: 9569816 * refs/tags/XORG-6_8_99_5: storing tag 'XORG-6_8_99_5' of git://git.freedesktop.org/git/xorg/lib/libdmx commit: 9569816 * refs/tags/XORG-6_8_99_6: storing tag 'XORG-6_8_99_6' of git://git.freedesktop.org/git/xorg/lib/libdmx commit: 9569816 * refs/tags/XORG-6_8_99_7: storing tag 'XORG-6_8_99_7' of git://git.freedesktop.org/git/xorg/lib/libdmx commit: 9569816 * refs/tags/XORG-6_8_99_8: storing tag 'XORG-6_8_99_8' of git://git.freedesktop.org/git/xorg/lib/libdmx commit: 9569816 * refs/tags/XORG-6_8_99_9: storing tag 'XORG-6_8_99_9' of git://git.freedesktop.org/git/xorg/lib/libdmx commit: 9569816 * refs/tags/XORG-6_8_99_900: storing tag 'XORG-6_8_99_900' of git://git.freedesktop.org/git/xorg/lib/libdmx commit: 48338cc * refs/tags/XORG-6_8_99_901: storing tag 'XORG-6_8_99_901' of git://git.freedesktop.org/git/xorg/lib/libdmx commit: 48338cc * refs/tags/XORG-6_8_99_902: storing tag 'XORG-6_8_99_902' of git://git.freedesktop.org/git/xorg/lib/libdmx commit: 48338cc * refs/tags/XORG-6_8_99_903: storing tag 'XORG-6_8_99_903' of git://git.freedesktop.org/git/xorg/lib/libdmx commit: 48338cc * refs/tags/XORG-6_99_99_900: storing tag 'XORG-6_99_99_900' of git://git.freedesktop.org/git/xorg/lib/libdmx commit: e51544b * refs/tags/XORG-6_99_99_901: storing tag 'XORG-6_99_99_901' of git://git.freedesktop.org/git/xorg/lib/libdmx commit: 68ee705 * refs/tags/XORG-6_99_99_902: storing tag 'XORG-6_99_99_902' of git://git.freedesktop.org/git/xorg/lib/libdmx commit: 68ee705 * refs/tags/XORG-6_99_99_903: storing tag 'XORG-6_99_99_903' of git://git.freedesktop.org/git/xorg/lib/libdmx commit: 7f82999 * refs/tags/XORG-6_99_99_904: storing tag 'XORG-6_99_99_904' of git://git.freedesktop.org/git/xorg/lib/libdmx commit: 1594c27 * refs/tags/XORG-7_0: storing tag 'XORG-7_0' of git://git.freedesktop.org/git/xorg/lib/libdmx commit: 3aec4c9 * refs/tags/XORG-7_0_99_901: storing tag 'XORG-7_0_99_901' of git://git.freedesktop.org/git/xorg/lib/libdmx commit: 44c22b0 * refs/tags/XORG-7_1: storing tag 'XORG-7_1' of git://git.freedesktop.org/git/xorg/lib/libdmx commit: fe6012c * refs/tags/lg3d-base: storing tag 'lg3d-base' of git://git.freedesktop.org/git/xorg/lib/libdmx commit: 90b1782 * refs/tags/lg3d-rel-0-7-0: storing tag 'lg3d-rel-0-7-0' of git://git.freedesktop.org/git/xorg/lib/libdmx commit: 90b1782 * refs/tags/libdmx-1_0_2: storing tag 'libdmx-1_0_2' of git://git.freedesktop.org/git/xorg/lib/libdmx commit: fe6012c * refs/tags/rel-0-6-1: storing tag 'rel-0-6-1' of git://git.freedesktop.org/git/xorg/lib/libdmx commit: 90b1782 * refs/tags/sco_port_update-base: storing tag 'sco_port_update-base' of git://git.freedesktop.org/git/xorg/lib/libdmx commit: 9569816 Switched to a new branch "mybranch" Merging Debian changes... Auto-merged Makefile.am CONFLICT (add/add): Merge conflict in Makefile.am 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: ChangeLog # 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/libdmx-dev.install # new file: debian/libdmx1.install # new file: debian/rules # new file: debian/watch # 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: Makefile.am # modified: Makefile.am # Attempting to address merge issues automatically... Initialized empty Git repository in /srv/XorgAutoPackage/libdmx-FDO-HEAD/.git/ remote: Generating pack... remote: Done counting 158 objects. remote: Deltifying 158 objects. remote: 0% (1/158) done 1% (2/158) done 2% (4/158) done remote: 3% (5/158) done 4% (7/158) done 5% (8/158) done remote: 6% (10/158) done 7% (12/158) done 8% (13/158) done remote: 9% (15/158) done 10% (16/158) done 11% (18/158) done 12% (19/158) done remote: 13% (21/158) done 14% (23/158) done 15% (24/158) done remote: 16% (26/158) done 17% (27/158) done 18% (29/158) done remote: 19% (31/158) done 20% (32/158) done 21% (34/158) done remote: 22% (35/158) done 23% (37/158) done 24% (38/158) done remote: 25% (40/158) done 26% (42/158) done 27% (43/158) done remote: 28% (45/158) done 29% (46/158) done 30% (48/158) done remote: 31% (49/158) done 32% (51/158) done 33% (53/158) done remote: 34% (54/158) done 35% (56/158) done 36% (57/158) done remote: 37% (59/158) done 38% (61/158) done 39% (62/158) done remote: 40% (64/158) done 41% (65/158) done remote: 42% (67/158) done 43% (68/158) done 44% (70/158) done remote: 45% (72/158) done 46% (73/158) done 47% (75/158) done remote: 48% (76/158) done 49% (78/158) done 50% (79/158) done remote: 51% (81/158) done 52% (83/158) done 53% (84/158) done remote: 54% (86/158) done remote: 55% (87/158) done 56% (89/158) done remote: 57% (91/158) done remote: 58% (92/158) done remote: 59% (94/158) done remote: 60% (95/158) done remote: 61% (97/158) done remote: 62% (98/158) done remote: 63% (100/158) done remote: 64% (102/158) done remote: 65% (103/158) done 66% (105/158) done remote: 67% (106/158) done remote: 68% (108/158) done remote: 69% (110/158) done remote: 70% (111/158) done remote: 71% (113/158) done 72% (114/158) done remote: 73% (116/158) done 74% (117/158) done remote: 75% (119/158) done remote: 76% (121/158) done remote: 77% (122/158) done remote: 78% (124/158) done remote: 79% (125/158) done 80% (127/158) done remote: 81% (128/158) done 82% (130/158) done 83% (132/158) done remote: 84% (133/158) done 85% (135/158) done remote: 86% (136/158) done 87% (138/158) done 88% (140/158) done remote: 89% (141/158) done remote: 90% (143/158) done remote: 91% (144/158) done remote: 92% (146/158) done remote: 93% (147/158) done remote: 94% (149/158) done remote: 95% (151/158) done remote: 96% (152/158) done remote: 97% (154/158) done remote: 98% (155/158) done remote: 99% (157/158) done remote: 100% (158/158) done remote: remote: Total 158, written 158 (delta 72), reused 146 (delta 65) # unmerged: Makefile.am + Discarding Debian differences in Makefile.am Created commit 46bcc7c: Dropping Debian's Makefile.am in favor of X.org's + Copying missing xsfbs into place - No available dir ../xsfbs from Already up-to-date. Success resolving 1 merge issue in libdmx Running autoreconf Updating changelog... dch warning: new version (1.0.2+git20071211-0ubuntu0bwh) is less than the current version number (1:1.0.2-3). ./debian/rules:13: debian/xsfbs/xsfbs.mk: No such file or directory make: *** No rule to make target `debian/xsfbs/xsfbs.mk'. Stop. ERROR: rules clean: 2