Skip to content
Snippets Groups Projects
Commit b7d6c6fa authored by Thibault Cohen's avatar Thibault Cohen Committed by Thibault COHEN
Browse files

packaging: merge repository package in daemon package 

Refs #72145

Change-Id: Ic1356de65290d414fca075b091a77e0c53d25ed0
parent ec06a0ad
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
debian/control
+ 0
− 7
View file @ b7d6c6fa
...@@ -15,13 +15,6 @@ Build-Depends: debhelper (>= 9), ...@@ -15,13 +15,6 @@ Build-Depends: debhelper (>= 9),
libspeexdsp-dev, autotools-dev, chrpath, check, astyle, libspeexdsp-dev, autotools-dev, chrpath, check, astyle,
uuid-dev, libudev-dev, libgnutls28-dev, uuid-dev, libudev-dev, libgnutls28-dev,
Package: ring-repository
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: Ring repository
Ring is free software for distributed and secured communication.
Package: ring-daemon Package: ring-daemon
Architecture: any Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends} Depends: ${shlibs:Depends}, ${misc:Depends}
......
debian/rules
+ 2
− 2
View file @ b7d6c6fa
...@@ -44,8 +44,8 @@ override_dh_auto_install: ...@@ -44,8 +44,8 @@ override_dh_auto_install:
mv $(CURDIR)/debian/ring-daemon/usr/include/dring/* $(CURDIR)/debian/ring-daemon-dev/usr/include/dring mv $(CURDIR)/debian/ring-daemon/usr/include/dring/* $(CURDIR)/debian/ring-daemon-dev/usr/include/dring
rm -rf $(CURDIR)/debian/ring-daemon/usr/include/ rm -rf $(CURDIR)/debian/ring-daemon/usr/include/
# Add repository file # Add repository file
mkdir -p $(CURDIR)/debian/ring-repository/etc/apt/sources.list.d/ mkdir -p $(CURDIR)/debian/ring-daemon/etc/apt/sources.list.d/
echo "deb [arch=amd64] http://nightly.apt.ring.cx/$(DISTRIB_ID)_$(DISTRIB_VERSION_ID) ring main" > $(CURDIR)/debian/ring-repository/etc/apt/sources.list.d/ring-nightly.list echo "deb [arch=amd64] http://nightly.apt.ring.cx/$(DISTRIB_ID)_$(DISTRIB_VERSION_ID) ring main" > $(CURDIR)/debian/ring-daemon/etc/apt/sources.list.d/ring-nightly.list
dh_auto_install dh_auto_install
get-orig-source: get-orig-source:
......
ring-daemon.spec
+ 1
− 11
View file @ b7d6c6fa
...@@ -30,14 +30,6 @@ Group: Applications/Internet ...@@ -30,14 +30,6 @@ Group: Applications/Internet
Ring is free software for distributed and secured communication. Ring is free software for distributed and secured communication.
This is the daemon headers. This is the daemon headers.
%package repository
Summary: Free software for distributed and secured communication.
Group: Applications/Internet
%description repository
Ring is free software for distributed and secured communication.
This is the ring repository
%prep %prep
%setup -q %setup -q
git init git init
...@@ -85,6 +77,7 @@ echo 'gpgcheck=0' >> %{buildroot}/%{_sysconfdir}/yum.repos.d/ring-nightly.repo ...@@ -85,6 +77,7 @@ echo 'gpgcheck=0' >> %{buildroot}/%{_sysconfdir}/yum.repos.d/ring-nightly.repo
%{_datadir}/ring/ringtones %{_datadir}/ring/ringtones
%{_datadir}/dbus-1/services/cx.ring.Ring.service %{_datadir}/dbus-1/services/cx.ring.Ring.service
%doc %{_mandir}/man1/dring* %doc %{_mandir}/man1/dring*
%config %{_sysconfdir}/yum.repos.d/ring-nightly.repo
%files devel %files devel
%defattr(-,root,root,-) %defattr(-,root,root,-)
...@@ -92,9 +85,6 @@ echo 'gpgcheck=0' >> %{buildroot}/%{_sysconfdir}/yum.repos.d/ring-nightly.repo ...@@ -92,9 +85,6 @@ echo 'gpgcheck=0' >> %{buildroot}/%{_sysconfdir}/yum.repos.d/ring-nightly.repo
%{_libdir}/libring.a %{_libdir}/libring.a
/usr/include/dring/ /usr/include/dring/
%files repository
%config %{_sysconfdir}/yum.repos.d/ring-nightly.repo
%changelog %changelog
* Tue Apr 14 2015 Thibault Cohen <thibault.cohen@savoirfairelinux.com> - 2.1.0-1 * Tue Apr 14 2015 Thibault Cohen <thibault.cohen@savoirfairelinux.com> - 2.1.0-1
- New upstream version - New upstream version
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment