From: "Alexey I. Froloff" <raorn@altlinux.org>
To: ALT Devel discussion list <devel@lists.altlinux.org>
Subject: Re: [devel] [SCM] packages/boinc: heads/master
Date: Wed, 28 Jul 2010 15:55:25 +0400
Message-ID: <20100728115525.GC10876@altlinux.org> (raw)
In-Reply-To: <20100728114959.4A67F23D60A8@ssh.git.altlinux.org>
[-- Attachment #1: Type: text/plain, Size: 1315 bytes --]
On Wed, Jul 28, 2010 at 03:49:59PM +0400, Paul Wolneykien wrote:
> diff: debian/upstream:. patches/README:. name=README.patch
> diff: debian/upstream:. patches/alt-service-actions:. name=alt-service-actions.patch
> diff: debian/upstream:. patches/fix-boinc-client-service:. name=fix-boinc-client-service.patch
> -diff: debian/upstream:. patches/install-examples:. name=examples.patch
> +diff: debian/upstream:. patches/install-examples:. name=install-examples.patch
> diff: debian/upstream:. patches/install-icons:. name=install-icons.patch
> diff: debian/upstream:. patches/install-init-script:. name=install-init-script.patch
> diff: debian/upstream:. patches/install-schedules:. name=install-schedules.patch
Генерить патчи таким образом - не самая хорошая идея. При сборке
они могут тупо не приложиться, если где-то есть пересечения.
diff: debian/upstream:. patches/README:. name=README.patch
diff: patches/README:. patches/alt-service-actions:. name=alt-service-actions.patch
diff: patches/alt-service-actions:. patches/fix-boinc-client-service:. name=fix-boinc-client-service.patch
И соответственно мержить надо из debian/upstream в
patches/README, из patches/README в patches/alt-service-actions и
т.д.
--
Regards, --
Sir Raorn. --- http://thousandsofhate.blogspot.com/
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 198 bytes --]
next parent reply other threads:[~2010-07-28 11:55 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-07-28 11:55 ` Alexey I. Froloff [this message]
2010-08-02 8:59 ` Ildar Mulyukov
2010-08-02 9:37 ` Alexey I. Froloff
2010-08-03 7:57 ` Ildar Mulyukov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20100728115525.GC10876@altlinux.org \
--to=raorn@altlinux.org \
--cc=devel@lists.altlinux.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
ALT Linux Team development discussions
This inbox may be cloned and mirrored by anyone:
git clone --mirror http://lore.altlinux.org/devel/0 devel/git/0.git
# If you have public-inbox 1.1+ installed, you may
# initialize and index your mirror using the following commands:
public-inbox-init -V2 devel devel/ http://lore.altlinux.org/devel \
devel@altlinux.org devel@altlinux.ru devel@lists.altlinux.org devel@lists.altlinux.ru devel@linux.iplabs.ru mandrake-russian@linuxteam.iplabs.ru sisyphus@linuxteam.iplabs.ru
public-inbox-index devel
Example config snippet for mirrors.
Newsgroup available over NNTP:
nntp://lore.altlinux.org/org.altlinux.lists.devel
AGPL code for this site: git clone https://public-inbox.org/public-inbox.git