added gitlab to AUR move instructions for orphaned packages

1 files changed, 47 insertions, 2 deletions

diff --git a/templates/summary.m4 b/templates/summary.m4
index 0f32a97..af084cd 100644
--- a/templates/summary.m4
+++ b/templates/summary.m4
@@ -7,13 +7,23 @@ _HEADER(`Archlinux32 Consistency Checker',`anb-stats')
 m4_define(`_STATISTICS',`Statistics')
 m4_define(`_DUPLICATES_STATE_REPO',`Duplicate States in State Repo')
 m4_define(`_MISSING_STATE_FILE',`Missing state file')
+m4_define(`_MOVING_PACKAGES_TO_AUR',`Moving packages to the AUR')
+  m4_define(`_DROPPING_TO_AUR_PREEXISTING_IN_AUR',`Method when AUR and gitlab repo exist')
+  m4_define(`_DROPPING_TO_AUR_NO_PREEXISTING',`Method when no AUR git repo existed')
 m4_define(`_MISSING_PACKAGE_REPO',`Missing git repo')
+
 <h1>Table of Contents</h1>
 <ul>
   <li>_LINK_TO_LABEL(_STATISTICS)</li>
   <li>_LINK_TO_LABEL(_DUPLICATES_STATE_REPO)</li>
   <li>_LINK_TO_LABEL(_MISSING_STATE_FILE)</li>
-  <li>_LINK_TO_LABEL(_MISSING_PACKAGE_REPO)</li>
+  <li>_LINK_TO_LABEL(_MOVING_PACKAGES_TO_AUR)
+    <ul>
+      <li>_LINK_TO_LABEL(_DROPPING_TO_AUR_PREEXISTING_IN_AUR)</li>
+      <li>_LINK_TO_LABEL(_DROPPING_TO_AUR_NO_PREEXISTING)</li>
+    </ul>
+  </li>
+  <li style="margin-top: -15px;">_LINK_TO_LABEL(_MISSING_PACKAGE_REPO)</li>
 </ul>
 
 _SECTION_HEADER(h2,_STATISTICS)
@@ -32,11 +42,46 @@ _TABLE_END()
 
 _SECTION_HEADER(h2,_MISSING_STATE_FILE)
 <p>Candidates to be transfered to the AUR and to adopt there..</p>
-<p><i>TODO: add description here how to do that..</i>/<p>
 _TABLE_START()
 _TABLE_HEADER(repository,status)
 m4_esyscmd(`../scripts/tsv2tablerow ../data/missing_state_file')
 _TABLE_END()
+_SECTION_HEADER(h2,_MOVING_PACKAGES_TO_AUR)
+_SECTION_HEADER(h3,_DROPPING_TO_AUR_PREEXISTING_IN_AUR)
+<pre><code># clone old AUR
+git clone ssh://aur@aur.archlinux.org/&lt;package&gt; &lt;package&gt;
+cd &lt;package&gt;
+attach the upstream gitlab repo of the dropped package
+git remote add gitlab https://gitlab.archlinux.org/archlinux/packaging/packages/mp3wrap.git
+git fetch gitlab
+# gitlab uses main as main branch, AUR still master
+git checkout main
+# check the log of the dropped packages
+# merge forcefully with old AUR, git merge normally complains about
+# unrelated commit, but we basically merge by commit date
+git checkout master
+git merge main
+git merge --allow-unrelated-histories main
+# solve conflicts, mainly PKGBUILD will be a mixture of old AUR and
+# last pakcage versions, you can also just rebase to the version of main
+# gitlab
+git commit -a -m 'merged with gitlab &lt;package&gt; (existed before in the AUR)'
+git push origin master
+</code></pre>
+
+_SECTION_HEADER(h3,_DROPPING_TO_AUR_NO_PREEXISTING)
+<pre><code>pkgctl repo clone --protocol=https &lt;package&gt;
+cd  &lt;package&gt;
+git branch -m main master
+git remote remove origin
+git remote add origin ssh://aur@aur.archlinux.org/&lt;package&gt;
+makepkg --printsrcinfo &gt; .SRCINFO
+git add .SRCINFO
+git push -u origin master
+git commit -a -m 'moved to the AUR, added .SRCINFO'
+git push -u origin master
+</code></pre>
+
 
 _SECTION_HEADER(h2,_MISSING_PACKAGE_REPO)
 _TABLE_START()