From b7d6c6fa6baf8a85d7181ee889808df155352f1d Mon Sep 17 00:00:00 2001
From: Thibault Cohen <thibault.cohen@savoirfairelinux.com>
Date: Thu, 30 Apr 2015 14:33:40 -0400
Subject: [PATCH] packaging: merge repository package in daemon package
Refs #72145
Change-Id: Ic1356de65290d414fca075b091a77e0c53d25ed0
---
debian/control | 7 -------
debian/rules | 4 ++--
ring-daemon.spec | 12 +-----------
3 files changed, 3 insertions(+), 20 deletions(-)
diff --git a/debian/control b/debian/control
index b9c5aa1e3e..5e085ed637 100644
--- a/debian/control
+++ b/debian/control
@@ -15,13 +15,6 @@ Build-Depends: debhelper (>= 9),
libspeexdsp-dev, autotools-dev, chrpath, check, astyle,
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
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
diff --git a/debian/rules b/debian/rules
index b2c2407d38..b7a9e5ece5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -44,8 +44,8 @@ override_dh_auto_install:
mv $(CURDIR)/debian/ring-daemon/usr/include/dring/* $(CURDIR)/debian/ring-daemon-dev/usr/include/dring
rm -rf $(CURDIR)/debian/ring-daemon/usr/include/
# Add repository file
- mkdir -p $(CURDIR)/debian/ring-repository/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
+ 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-daemon/etc/apt/sources.list.d/ring-nightly.list
dh_auto_install
get-orig-source:
diff --git a/ring-daemon.spec b/ring-daemon.spec
index 4b4a8ef5f0..6ba8e39125 100644
--- a/ring-daemon.spec
+++ b/ring-daemon.spec
@@ -30,14 +30,6 @@ Group: Applications/Internet
Ring is free software for distributed and secured communication.
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
%setup -q
git init
@@ -85,6 +77,7 @@ echo 'gpgcheck=0' >> %{buildroot}/%{_sysconfdir}/yum.repos.d/ring-nightly.repo
%{_datadir}/ring/ringtones
%{_datadir}/dbus-1/services/cx.ring.Ring.service
%doc %{_mandir}/man1/dring*
+%config %{_sysconfdir}/yum.repos.d/ring-nightly.repo
%files devel
%defattr(-,root,root,-)
@@ -92,9 +85,6 @@ echo 'gpgcheck=0' >> %{buildroot}/%{_sysconfdir}/yum.repos.d/ring-nightly.repo
%{_libdir}/libring.a
/usr/include/dring/
-%files repository
-%config %{_sysconfdir}/yum.repos.d/ring-nightly.repo
-
%changelog
* Tue Apr 14 2015 Thibault Cohen <thibault.cohen@savoirfairelinux.com> - 2.1.0-1
- New upstream version
--
GitLab