Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
jami-project
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Requirements
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
savoirfairelinux
jami-project
Commits
f236d5f6
Unverified
Commit
f236d5f6
authored
3 years ago
by
Maxim Cournoyer
Browse files
Options
Downloads
Patches
Plain Diff
packaging: Do not install a ring.cx symbolic link.
Change-Id: Ib5ad6c091560f7fc4ee9734ca283e78c90d9d769
parent
c9803565
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
packaging/rules/debian/rules
+0
-4
0 additions, 4 deletions
packaging/rules/debian/rules
packaging/rules/rpm/jami-gnome.spec
+0
-1
0 additions, 1 deletion
packaging/rules/rpm/jami-gnome.spec
with
0 additions
and
5 deletions
packaging/rules/debian/rules
+
0
−
4
View file @
f236d5f6
...
...
@@ -204,8 +204,6 @@ override_dh_auto_install:
cd
client-qt/build
&&
\
make
DESTDIR
=
$(
CURDIR
)
/debian/
$(
JAMI_CLIENT_PKG_NAME
)
install
ln
-sf
/usr/bin/jami
$(CURDIR)/debian/jami/usr/bin/ring.cx
## Custom Qt package for Jami (libqt-jami)
## Copy our own Qt library package content into the OCI package.
for
file_name
in
$$(dpkg-query
-L
libqt-jami);
do
\
...
...
@@ -238,8 +236,6 @@ override_dh_auto_install:
cd
client-qt/build
&&
\
make
DESTDIR
=
$(
CURDIR
)
/debian/
$(
JAMI_ALL_IN_ONE_PKG_NAME
)
install
ln
-sf
/usr/bin/jami
$(CURDIR)/debian/$(JAMI_ALL_IN_ONE_PKG_NAME)/usr/bin/ring.cx
override_dh_shlibdeps
:
dh_shlibdeps
--
-x
$(
JAMI_ALL_IN_ONE_PKG_NAME
)
...
...
This diff is collapsed.
Click to expand it.
packaging/rules/rpm/jami-gnome.spec
+
0
−
1
View file @
f236d5f6
...
...
@@ -65,7 +65,6 @@ make -C %{_builddir}/ring-project/client-gnome/build \
DESTDIR=%{buildroot} make -C %{_builddir}/ring-project/client-gnome/build install
# Only keep /bin/jami-gnome for the GNOME client.
rm -rfv %{buildroot}/%{_bindir}/jami
rm -rfv %{buildroot}/%{_bindir}/ring.cx
%files
%defattr(-,root,root,-)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment