diff options
| author | crystal <crystal@noreply.codeberg.org> | 2024-04-29 04:30:06 -0600 |
|---|---|---|
| committer | crystal <crystal@noreply.codeberg.org> | 2024-07-07 11:23:16 -0600 |
| commit | b5914277d3021ce5b73ce1f4fb8ec16257e614f2 (patch) | |
| tree | 50fab45c5bcc8d6323bb0fb231ee7eaa569c3719 /deb | |
| parent | 7fcc7721f8d9dc44f79451841abde6ccd450a114 (diff) | |
[squash] split common data
instead of building the packaged binaries with the `bindata` tag, this
introduces a new forgejo-common package which contains common assets and
architecture independent files.
This is the first of a handful of PRs that will ultimately enable
building packages for multiple architectures.
Diffstat (limited to 'deb')
| -rw-r--r-- | deb/.forgejo-bin.control | 4 | ||||
| -rw-r--r-- | deb/debian/NEWS | 2 | ||||
| -rw-r--r-- | deb/debian/changelog | 4 | ||||
| -rw-r--r-- | deb/debian/control | 18 | ||||
| -rw-r--r-- | deb/debian/forgejo-common.install | 5 | ||||
| -rw-r--r-- | deb/debian/forgejo-common.preinst (renamed from deb/debian/forgejo.preinst) | 0 | ||||
| -rw-r--r-- | deb/debian/forgejo-sqlite.install | 2 | ||||
| l--------- | deb/debian/forgejo-sqlite.preinst | 1 | ||||
| -rw-r--r-- | deb/debian/forgejo.install | 2 |
9 files changed, 24 insertions, 14 deletions
diff --git a/deb/.forgejo-bin.control b/deb/.forgejo-bin.control index 5c093a2..ead2966 100644 --- a/deb/.forgejo-bin.control +++ b/deb/.forgejo-bin.control @@ -1,8 +1,8 @@ Package: forgejo-bin Architecture: amd64 Priority: optional -Provides: forgejo,gitea +Provides: forgejo, gitea Depends: adduser (>= 3.11), git -Conflicts: forgejo,forgejo-sqlite,forgejo-common +Conflicts: forgejo, forgejo-sqlite, forgejo-common Description: Forgejo: Beyond Coding. We Forge. (binary) The official Forgejo release binary in a Debian package diff --git a/deb/debian/NEWS b/deb/debian/NEWS index ef3b3ff..e24bf94 100644 --- a/deb/debian/NEWS +++ b/deb/debian/NEWS @@ -1,4 +1,4 @@ -forgejo (7.0.1-1) unstable; urgency=medium +forgejo (7.0.1-2) unstable; urgency=medium WARNING: Forgejo will be upgraded to v7.0.1 LTS diff --git a/deb/debian/changelog b/deb/debian/changelog index f383adc..da71ac3 100644 --- a/deb/debian/changelog +++ b/deb/debian/changelog @@ -2,13 +2,15 @@ forgejo (7.0.5-1) unstable; urgency=medium * Forgejo version 7.0.5 * See https://codeberg.org/forgejo/forgejo/src/branch/forgejo/RELEASE-NOTES.md#7-0-5 + * Split `forgejo-common` package for extra data - -- mkobel <moritz@kobelnet.ch> Fri, 05 July 2024 22:03:00 +0200 + -- crystal <crystal@noreply.codeberg.org> Sun, 07 July 2024 17:22:00 +0000 forgejo (7.0.1-1) unstable; urgency=medium * Forgejo version 7.0.1 * See https://codeberg.org/forgejo/forgejo/src/branch/forgejo/RELEASE-NOTES.md#7-0-1 + * Forgejo Actions based build process -- crystal <crystal@noreply.codeberg.org> Sat, 27 Apr 2024 15:35:00 +0000 diff --git a/deb/debian/control b/deb/debian/control index 323d688..ae16460 100644 --- a/deb/debian/control +++ b/deb/debian/control @@ -8,16 +8,24 @@ Package: forgejo Architecture: amd64 Priority: optional Provides: gitea -Depends: adduser (>= 3.11),git -Conflicts: forgejo-sqlite,forgejo-bin +Depends: forgejo-common (= ${source:Version}), adduser (>= 3.11), git +Conflicts: forgejo-sqlite, forgejo-bin Description: Forgejo: Beyond Coding. We Forge. Forgejo with bindata ONLY - Use this package for MySQL or PostgreSQL setup Package: forgejo-sqlite Architecture: amd64 Priority: optional -Provides: forgejo,gitea -Depends: adduser (>= 3.11),git -Conflicts: forgejo,forgejo-bin +Provides: forgejo, gitea +Depends: forgejo-common (= ${source:Version}), adduser (>= 3.11), git +Conflicts: forgejo, forgejo-bin Description: Forgejo: Beyond Coding. We Forge. (SQLite) Forgejo with bindata and SQLite support - Use this package to get started immediately + +Package: forgejo-common +Architecture: all +Priority: optional +Depends: forgejo | forgejo-sqlite (= ${source:Version}) +Conflicts: forgejo-bin +Description: Common files for Forgejo + Common data used for all Forgejo packages and architectures. diff --git a/deb/debian/forgejo-common.install b/deb/debian/forgejo-common.install new file mode 100644 index 0000000..5904930 --- /dev/null +++ b/deb/debian/forgejo-common.install @@ -0,0 +1,5 @@ +public/ /usr/share/forgejo +templates/ /usr/share/forgejo +options/ /usr/share/forgejo +forgejo.service /usr/lib/systemd/system +app.ini /etc/forgejo diff --git a/deb/debian/forgejo.preinst b/deb/debian/forgejo-common.preinst index ccd9cd2..ccd9cd2 100644 --- a/deb/debian/forgejo.preinst +++ b/deb/debian/forgejo-common.preinst diff --git a/deb/debian/forgejo-sqlite.install b/deb/debian/forgejo-sqlite.install index 7a55675..106c3c8 100644 --- a/deb/debian/forgejo-sqlite.install +++ b/deb/debian/forgejo-sqlite.install @@ -1,3 +1 @@ forgejo-sqlite-bin/forgejo /usr/bin -forgejo.service /usr/lib/systemd/system -app.ini /etc/forgejo diff --git a/deb/debian/forgejo-sqlite.preinst b/deb/debian/forgejo-sqlite.preinst deleted file mode 120000 index c9dce9a..0000000 --- a/deb/debian/forgejo-sqlite.preinst +++ /dev/null @@ -1 +0,0 @@ -forgejo.preinst
\ No newline at end of file diff --git a/deb/debian/forgejo.install b/deb/debian/forgejo.install index 6440cb3..db18dc4 100644 --- a/deb/debian/forgejo.install +++ b/deb/debian/forgejo.install @@ -1,3 +1 @@ forgejo-bin/forgejo /usr/bin -forgejo.service /usr/lib/systemd/system -app.ini /etc/forgejo |
