diff --git a/debian/control b/debian/control index b9c5aa1e3e9e2a035cab1480f63b63d045472787..5e085ed637cc7da1f3cda52987dad2105299f210 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 b2c2407d38f081d9018bb5a6b4c34a8979fab05b..b7a9e5ece5755336188ad4229b5fe77cde8add4a 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 4b4a8ef5f06d3ab807a47183c04aae2d6cd7e0f7..6ba8e3912571e794462e5c7ce28a937b14097d10 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