[devel] [SCM] packages/boinc: heads/master
Alexey I. Froloff
raorn на altlinux.org
Ср Июл 28 11:55:25 UTC 2010
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/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://lists.altlinux.org/pipermail/devel/attachments/20100728/af6ca2bb/attachment.bin>
Подробная информация о списке рассылки Devel