Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Open sidebar
savoirfairelinux
jami-project
Commits
c9a431e9
Unverified
Commit
c9a431e9
authored
Apr 15, 2019
by
Sébastien Blin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
packaging: debian update descriptions
Change-Id: I5b89c33b6fb8b85df3307d517c0d55e35c5f02e2
parent
cf2bc388
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
29 additions
and
29 deletions
+29
-29
packaging/rules/debian-one-click-install/README.Debian
packaging/rules/debian-one-click-install/README.Debian
+4
-4
packaging/rules/debian-one-click-install/control
packaging/rules/debian-one-click-install/control
+5
-5
packaging/rules/debian-one-click-install/copyright
packaging/rules/debian-one-click-install/copyright
+5
-5
packaging/rules/debian-one-click-install/ring-all.postinst
packaging/rules/debian-one-click-install/ring-all.postinst
+1
-1
packaging/rules/debian-one-click-install/watch
packaging/rules/debian-one-click-install/watch
+1
-1
packaging/rules/debian/README.Debian
packaging/rules/debian/README.Debian
+3
-3
packaging/rules/debian/control
packaging/rules/debian/control
+8
-8
packaging/rules/debian/copyright
packaging/rules/debian/copyright
+1
-1
packaging/rules/debian/watch
packaging/rules/debian/watch
+1
-1
No files found.
packaging/rules/debian-one-click-install/README.Debian
View file @
c9a431e9
# ring-all package for
ring.cx
website
# ring-all package for
jami.net
website
This source package provides a single ring-all binary package.
This binary package is the same as the mainline ring-all, apart from
the fact that it installs release keys and
ring.cx
package repository
as trusted peers so
Ring
can be updated from
ring.cx
along with
the fact that it installs release keys and
jami.net
package repository
as trusted peers so
Jami
can be updated from
jami.net
along with
system updates.
# Notes
...
...
@@ -13,7 +13,7 @@ system updates.
1- Prepare the new changelog entry mentioning the new version.
(the version on the changelog will be used to determine what to download).
Releases are available here: https://dl.
ring.cx
/ring-release/tarballs/
Releases are available here: https://dl.
jami.net
/ring-release/tarballs/
2- Run debian/rules get-orig-source
...
...
packaging/rules/debian-one-click-install/control
View file @
c9a431e9
...
...
@@ -55,9 +55,9 @@ Build-Depends: debhelper (>= 9),
# other
yasm,
Standards-Version: 4.1.5
Homepage: https://
ring.cx
Vcs-Git: https://git.
ring.cx
/savoirfairelinux/ring-project.git
Vcs-Browser: https://git.
ring.cx
/savoirfairelinux/ring-project
Homepage: https://
jami.net
Vcs-Git: https://git.
jami.net
/savoirfairelinux/ring-project.git
Vcs-Browser: https://git.
jami.net
/savoirfairelinux/ring-project
Package: ring-all
Architecture: any
...
...
@@ -72,8 +72,8 @@ Conflicts: ring,
ring-gnome,
ring-daemon
Description: Secure and distributed voice, video and chat platform - all in one package
Ring (ring.cx
) is a secure and distributed voice, video and chat communication
Jami (jami.net
) is a secure and distributed voice, video and chat communication
platform that requires no centralized server and leaves the power of privacy
in the hands of the user.
.
This package contains the GNOME desktop client and dring, the
Ring
daemon.
This package contains the GNOME desktop client and dring, the
Jami
daemon.
packaging/rules/debian-one-click-install/copyright
View file @
c9a431e9
Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: ring
Upstream-Contact: Alexandre Viau <alexandre.viau@savoirfairelinux.net>
Source: https://dl.
ring.cx
/ring-release/tarballs/
Source: https://dl.
jami.net
/ring-release/tarballs/
Files-Excluded: client-electron/*
client-uwp/*
client-windows/*
...
...
@@ -24,15 +24,15 @@ License: GPL-3+
Comment: Upstream embeds everything that is needed to build ring inside the release tarball.
Everything that is already in Debian has been removed.
.
OpenDHT was kept and not packaged independently. OpenDHT was written for
Ring
and is a moving
OpenDHT was kept and not packaged independently. OpenDHT was written for
Jami
and is a moving
target. It is best to wait until it is more mature before packaging it separately.
.
Msgpack was kept because the version available in Debian is currently too old for
Ring
to build.
Msgpack was kept because the version available in Debian is currently too old for
Jami
to build.
The Debian version of Msgpack cannot be updated at the moment because of reverse dependencies which
are not ready.
.
Pjproject was kept because it is heavily patched by
Ring
developers. None of the patches were merged
upstream and
Ring
developers are still waiting for a reaction from Pjproject developers.
Pjproject was kept because it is heavily patched by
Jami
developers. None of the patches were merged
upstream and
Jami
developers are still waiting for a reaction from Pjproject developers.
See the relevant threads:
- http://lists.pjsip.org/pipermail/pjsip_lists.pjsip.org/2014-October/017905.html
- http://lists.pjsip.org/pipermail/pjsip_lists.pjsip.org/2015-January/018072.html
...
...
packaging/rules/debian-one-click-install/ring-all.postinst
View file @
c9a431e9
...
...
@@ -26,7 +26,7 @@ set -e
# $RING_REPO = $RING_REPO_BASE/debian_9
#
# To update the appended end tags, modify the switch in [2].
RING_REPO_BASE
=
"https://dl.
ring.cx
/ring-nightly"
RING_REPO_BASE
=
"https://dl.
jami.net
/ring-nightly"
# Ring release key.
RING_KEY_FINGERPRINT
=
"A295D773307D25A33AE72F2F64CD5FA175348F84"
...
...
packaging/rules/debian-one-click-install/watch
View file @
c9a431e9
version=3
opts=dversionmangle=s/\~dfsg\d*$// \
https://dl.
ring.cx
/ring-release/tarballs/ ring_(\d\S*)\.tar\.gz
https://dl.
jami.net
/ring-release/tarballs/ ring_(\d\S*)\.tar\.gz
packaging/rules/debian/README.Debian
View file @
c9a431e9
# Differences and compatibility with official debian.org package
This source package also provides binary package ring-all. ring-all is an
all-in-one package that is it ships both the
Ring
Daemon and the GNOME
all-in-one package that is it ships both the
Jami
Daemon and the GNOME
client. This package is not available in the debian.org repositories (not
needed in the Debian case).
ring-all allows easy installation of
Ring
as a single package from
ring.cx
.
ring-all allows easy installation of
Jami
as a single package from
jami.net
.
The reason is that one cannot register a repository in source.list.d and
directly use it to fetch the dependencies. As a consequence it is not
possible to have a one-click installation with two binary packages. That's
...
...
@@ -20,7 +20,7 @@ same files.
1- Prepare the new changelog entry mentioning the new version.
(the version on the changelog will be used to determine what to download).
Releases are available here: https://dl.
ring.cx
/ring-release/tarballs/
Releases are available here: https://dl.
jami.net
/ring-release/tarballs/
2- Run debian/rules get-orig-source
...
...
packaging/rules/debian/control
View file @
c9a431e9
...
...
@@ -55,9 +55,9 @@ Build-Depends: debhelper (>= 9),
# other
yasm,
Standards-Version: 4.1.5
Homepage: https://
ring.cx
Vcs-Git: https://git.
ring.cx
/savoirfairelinux/ring-project.git
Vcs-Browser: https://git.
ring.cx
/savoirfairelinux/ring-project
Homepage: https://
jami.net
Vcs-Git: https://git.
jami.net
/savoirfairelinux/ring-project.git
Vcs-Browser: https://git.
jami.net
/savoirfairelinux/ring-project
Package: ring-all
Architecture: any
...
...
@@ -72,11 +72,11 @@ Conflicts: ring,
ring-gnome,
ring-daemon
Description: Secure and distributed voice, video and chat platform - all in one package
Ring (ring.cx
) is a secure and distributed voice, video and chat communication
Jami (jami.net
) is a secure and distributed voice, video and chat communication
platform that requires no centralized server and leaves the power of privacy
in the hands of the user.
.
This package contains the GNOME desktop client and dring, the
Ring
daemon.
This package contains the GNOME desktop client and dring, the
Jami
daemon.
Package: ring
Architecture: any
...
...
@@ -87,7 +87,7 @@ Depends: ${shlibs:Depends},
Replaces: ring-gnome
Conflicts: ring-gnome
Description: Secure and distributed voice, video and chat platform - desktop client
Ring (ring.cx
) is a secure and distributed voice, video and chat communication
Jami (jami.net
) is a secure and distributed voice, video and chat communication
platform that requires no centralized server and leaves the power of privacy
in the hands of the user.
.
...
...
@@ -98,8 +98,8 @@ Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends}
Description: Secure and distributed voice, video and chat platform - daemon
Ring (ring.cx
) is a secure and distributed voice, video and chat communication
Jami (jami.net
) is a secure and distributed voice, video and chat communication
platform that requires no centralized server and leaves the power of privacy
in the hands of the user.
.
This package contains the
Ring
daemon: dring.
This package contains the
Jami
daemon: dring.
packaging/rules/debian/copyright
View file @
c9a431e9
Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: ring
Upstream-Contact: Alexandre Viau <alexandre.viau@savoirfairelinux.net>
Source: https://dl.
ring.cx
/ring-release/tarballs/
Source: https://dl.
jami.net
/ring-release/tarballs/
Files-Excluded: client-electron/*
client-uwp/*
client-windows/*
...
...
packaging/rules/debian/watch
View file @
c9a431e9
version=3
opts=dversionmangle=s/\~dfsg\d*$// \
https://dl.
ring.cx
/ring-release/tarballs/ ring_(\d\S*)\.tar\.gz
https://dl.
jami.net
/ring-release/tarballs/ ring_(\d\S*)\.tar\.gz
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment