On Thu, Jun 5, 2014 at 1:19 PM, Jaromír Mikeš <mira.mi...@gmail.com> wrote: > > > > 2014-06-05 18:38 GMT+02:00 Felipe Sateler <fsate...@debian.org>: > >> On Thu, Jun 5, 2014 at 12:09 PM, Jaromír Mikeš <mira.mi...@gmail.com> >> wrote: >> > >> > >> > >> > 2014-06-05 17:37 GMT+02:00 Felipe Sateler <fsate...@debian.org>: >> > >> >> On Thu, Jun 5, 2014 at 10:55 AM, Jaromír Mikeš <mira.mi...@gmail.com> >> >> wrote: >> >> > >> >> > >> >> > >> >> > 2014-06-04 15:30 GMT+02:00 <mira-gu...@users.alioth.debian.org>: >> >> >> >> >> >> Imported Upstream version 0.5~repack0 >> >> >> MIME-Version: 1.0 >> >> >> Content-Type: text/plain; charset=UTF-8 >> >> >> X-Git-Refname: refs/heads/master >> >> >> X-Git-Reftype: branch >> >> >> X-Git-Oldrev: 092101909e018b29f721a47a0bac6aff5ae18cb4 >> >> >> X-Git-Newrev: 51df561bd4be88fb03f87924fc106ff3500fa347 >> >> >> >> >> >> The following commit has been merged in the master branch: >> >> >> commit 51df561bd4be88fb03f87924fc106ff3500fa347 >> >> >> Merge: 092101909e018b29f721a47a0bac6aff5ae18cb4 >> >> >> 9dd266f1bd0884a952040cf891c76894ab76a053 >> >> >> Author: Jaromír Mikeš <mira.mi...@seznam.cz> >> >> >> Date: Wed Jun 4 15:29:56 2014 +0200 >> >> >> >> >> >> Resolve merge. >> >> >> >> >> >> >> >> > Hello, >> >> > >> >> > can someone help me resolve merge in faustworks repo? >> >> > I think the only problem is that file faustworks/Makefile_QT should >> >> > be >> >> > deleted. >> >> >> >> And you lost your .gitignore. >> >> >> >> You may want to address this too (after build + clean): >> >> >> >> >> >> % git status >> >> Changes not staged for commit: >> >> (use "git add/rm <file>..." to update what will be committed) >> >> (use "git checkout -- <file>..." to discard changes in working >> >> directory) >> >> >> >> deleted: Makefile >> >> >> >> Untracked files: >> >> (use "git add <file>..." to include in what will be committed) >> >> >> >> Resources/translations/i18n_ru.qm >> >> >> >> no changes added to commit (use "git add" and/or "git commit -a" >> > >> > >> > Thank you Felipe for trying to help, >> > but it is not fixed yet :( >> >> What is the problem, exactly? > > > Try build > > $ git-buildpackage -S -uc -us --git-ignore-new > > [snip] > > dpkg-source: info: local changes detected, the modified files are: > faustworks/Makefile_QT
It appears this file is created during build but sometimes not deleted (not sure why). I just added it to the clean target. -- Saludos, Felipe Sateler _______________________________________________ pkg-multimedia-maintainers mailing list pkg-multimedia-maintainers@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-maintainers