[X2Go-Commits] [x2goclient] 02/02: debian/README.build-master-qt5: add instructions for generating the debian/control file.

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch build-master-qt5
in repository x2goclient.

commit b9f6dad4830320788750c44169ff681fbea90433
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Wed May 12 13:42:40 2021 +0200

    debian/README.build-master-qt5: add instructions for generating the debian/control file.
---
 debian/README.build-master-qt5 | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/debian/README.build-master-qt5 b/debian/README.build-master-qt5
new file mode 100644
index 0000000..48dc066
--- /dev/null
+++ b/debian/README.build-master-qt5
@@ -0,0 +1,20 @@
+This branch should ONLY ever include this README file and the debian/control
+file that has been generated for Qt5 usage.
+
+Likewise, this branch should ONLY ever be used for building packages on
+launchpad - it's supposed to be merged into the master branch. Since the master
+branch MUST NOT contain any of these files, a merge should always happen
+conflict-free.
+
+Steps to generate the debian/control file:
+  - git checkout master
+  - touch debian/control.in
+  - debian/rules FORCE_VENDOR='ubuntu' FORCE_RELEASE_VER='20.04' \
+    'debian/control' (though any version >= 20.0 will do for now)
+  - git add -f debian/control
+  - git stash
+  - git checkout build-master-qt5
+  - git stash apply
+  - git checkout --theirs debian/control
+  - git add debian/control
+  - git commit ...

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git