[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-active
Subject:    Re: Packaging of Calligra for PA
From:       Maurice_de_la_Ferté <kadava () gmx ! de>
Date:       2013-02-17 15:23:15
Message-ID: 5120F5E3.1060002 () gmx ! de
[Download RAW message or body]

[Attachment #2 (multipart/alternative)]


Hi,
On 17.02.2013 14:43, Friedrich W. H. Kossebau wrote:
> Am Sonntag, 17. Februar 2013, 13:56:58 schrieb Maurice de la Ferté:
>> On 17.02.2013 02:02, Friedrich W. H. Kossebau wrote:
>>> Am Samstag, 16. Februar 2013, 04:38:09 schrieb Maurice de la Ferté:
>>>> On 16.02.2013 03:21, Friedrich W. H. Kossebau wrote:
>>>>> 2. How is review done for spec/yaml changes?
>>>> Best practice is
>>>> - 'osc branch Project:KDE:Devel calligra'
>>>> - checkout local copy of branched package
>>>> - making changes
>>>> - building local
>>>> - pushing changes
>>>> - building remote
>>>> - reviewing rpmlint messages in logs
>>>> - adding branching repos to test machine
>>>> - installing branching packages on test machine
>>>> - 'osc submitrequest <branched project> calligra Project:KDE:Devel'
>>>> - asking for review on #active
>>> First trivial request is up, seems it works all for me :)
>> Request is applied :)
> \o/
>
> Okay, now that this is established I can get to serious changes :)
>
> Nothing in the pipe yet, but already thinking about how to best fix the
> incomplete registering for all supported mimetypes within the Calligra build
> system. Too late for 2.6.1, but than packagers can always still patch the
> released stuff ;)
>
> Next questions:
> Can I reuse that branch I created somehow?
> How do I ideally merge the changes from the official calligra package?
> Any request is just a diff between the branch to the official package, or?
Yes you can reuse this branched project so long you are not deleting
it. By sending submit requests via Web-Frontend you will see a checkbox
about something like 'deleting after merge', which is enabled by default.
This behaviour is disabled by using 'osc submitrequest' via command
line. A easy way to keep in sync with original package is following setup:

1. Branch a random package from the original project.
     By this you will get the repository setup and build dependencies
     from the original project.

     e.g. osc branch Project:KDE:Devel/cmake

2. Open project home:<user>:Project:KDE:Devel via Web-Frontend
     and enable repository publishing.

     Repositories --> Publish Flag --> All --> Explicity enable

     By this you are able to install the packages directly on your test 
machine

3. Open project home:<user>:Project:KDE:Devel via Web-Frontend
     and branch the package you like to modify/maintain.

     Packages --> Branch package from other project -->
     Name of original project: Project:KDE:Devel
     Name of package in original project: calligra
     Name of branched package in target project:
********[ ] Stay on current revision, don't merge future upstream 
changes automatically

4. Open project home:<user>:Project:KDE:Devel via Web-Frontend
     and delete random package again.

     Packages --> cmake --> Delete package

By this setup you have all changes from original package plus the 
changes you are
working on. Please note, by this merge conflicts can happen you have to 
solve on
your own.

Cheers

Maurice

[Attachment #5 (text/html)]

<html>
  <head>
    <meta content="text/html; charset=ISO-8859-1"
      http-equiv="Content-Type">
  </head>
  <body text="#000000" bgcolor="#FFFFFF">
    <div class="moz-cite-prefix">Hi,<br>
      On 17.02.2013 14:43, Friedrich W. H. Kossebau wrote:<br>
    </div>
    <blockquote cite="mid:1402104.jJ132LfoHq@klux.site" type="cite">
      <pre wrap="">Am Sonntag, 17. Februar 2013, 13:56:58 schrieb Maurice de la Fert&eacute;:
</pre>
      <blockquote type="cite">
        <pre wrap="">On 17.02.2013 02:02, Friedrich W. H. Kossebau wrote:
</pre>
        <blockquote type="cite">
          <pre wrap="">Am Samstag, 16. Februar 2013, 04:38:09 schrieb Maurice de la Fert&eacute;:
</pre>
          <blockquote type="cite">
            <pre wrap="">On 16.02.2013 03:21, Friedrich W. H. Kossebau wrote:
</pre>
            <blockquote type="cite">
              <pre wrap="">2. How is review done for spec/yaml changes?
</pre>
            </blockquote>
            <pre wrap="">Best practice is
- 'osc branch Project:KDE:Devel calligra'
- checkout local copy of branched package
- making changes
- building local
- pushing changes
- building remote
- reviewing rpmlint messages in logs
- adding branching repos to test machine
- installing branching packages on test machine
- 'osc submitrequest &lt;branched project&gt; calligra Project:KDE:Devel'
- asking for review on #active
</pre>
          </blockquote>
          <pre wrap="">First trivial request is up, seems it works all for me :)
</pre>
        </blockquote>
        <pre wrap="">Request is applied :)
</pre>
      </blockquote>
      <pre wrap="">\o/

Okay, now that this is established I can get to serious changes :)

Nothing in the pipe yet, but already thinking about how to best fix the 
incomplete registering for all supported mimetypes within the Calligra build 
system. Too late for 2.6.1, but than packagers can always still patch the 
released stuff ;)

Next questions:
Can I reuse that branch I created somehow?
How do I ideally merge the changes from the official calligra package?
Any request is just a diff between the branch to the official package, or?</pre>
    </blockquote>
    Yes you can reuse this branched project so long you are not deleting<br>
    it. By sending submit requests via Web-Frontend you will see a
    checkbox<br>
    about something like 'deleting after merge', which is enabled by
    default.<br>
    This behaviour is disabled by using 'osc submitrequest' via command<br>
    line. A easy way to keep in sync with original package is following
    setup:<br>
    <br>
    1. Branch a random package from the original project.<br>
    &nbsp; &nbsp; By this you will get the repository setup and build dependencies<br>
    &nbsp; &nbsp; from the original project.<br>
    <br>
    &nbsp; &nbsp; e.g. osc branch Project:KDE:Devel/cmake<br>
    <br>
    2. Open project home:&lt;user&gt;:Project:KDE:Devel via Web-Frontend<br>
    &nbsp;&nbsp;&nbsp; and enable repository publishing.<br>
    &nbsp;&nbsp;&nbsp; <br>
    &nbsp;&nbsp;&nbsp; Repositories --&gt; Publish Flag --&gt; All --&gt; Explicity
    enable<br>
    <br>
    &nbsp;&nbsp;&nbsp; By this you are able to install the packages directly on your
    test machine<br>
    <br>
    3. Open project home:&lt;user&gt;:Project:KDE:Devel via Web-Frontend<br>
    &nbsp;&nbsp;&nbsp; and branch the package you like to modify/maintain.<br>
    <br>
    &nbsp;&nbsp;&nbsp; Packages --&gt; Branch package from other project --&gt;<br>
    &nbsp;&nbsp;&nbsp; Name of original project: Project:KDE:Devel<br>
    &nbsp;&nbsp;&nbsp; Name of package in original project: calligra<br>
    &nbsp;&nbsp;&nbsp; Name of branched package in target project:<br>
    &nbsp;&nbsp;&nbsp; <strong></strong><strong></strong><strong></strong><strong></strong>[
    ] Stay on current revision, don't merge future upstream changes
    automatically<br>
    <br>
    4. Open project home:&lt;user&gt;:Project:KDE:Devel via Web-Frontend<br>
    &nbsp;&nbsp;&nbsp; and delete random package again.<br>
    &nbsp;&nbsp;&nbsp; <br>
    &nbsp;&nbsp;&nbsp; Packages --&gt; cmake --&gt; Delete package<br>
    <br>
    By this setup you have all changes from original package plus the
    changes you are<br>
    working on. Please note, by this merge conflicts can happen you have
    to solve on<br>
    your own.<br>
    <br>
    Cheers<br>
    <br>
    Maurice<br>
  </body>
</html>


_______________________________________________
Active mailing list
Active@kde.org
https://mail.kde.org/mailman/listinfo/active


[prev in list] [next in list] [prev in thread] [next in thread] 

Configure | About | News | Add a list | Sponsored by KoreLogic