From 6527954141a08db3972d6ec6a2382ddc331e4a7b Mon Sep 17 00:00:00 2001
From: Hugo Lefeuvre <hugo.lefeuvre@savoirfairelinux.com>
Date: Tue, 18 Sep 2018 16:43:02 -0400
Subject: [PATCH] oci: use .list format for source.list.d entry

Use .list format instead of .sources. This will allow for better
compatibility with the version from our APT repositories.

Change-Id: I18e1cca6fb9e0e6fa6fa62add0868ea133a37b29
---
 .../rules/debian-one-click-install/ring-all.postinst | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/packaging/rules/debian-one-click-install/ring-all.postinst b/packaging/rules/debian-one-click-install/ring-all.postinst
index c883f3d5..4cb49e79 100755
--- a/packaging/rules/debian-one-click-install/ring-all.postinst
+++ b/packaging/rules/debian-one-click-install/ring-all.postinst
@@ -73,7 +73,7 @@ HUFCGSHO3/kzxSlkE1PBUX3IZ8PSFijyopBnWUhlSXuyRjte8OR7Fl/Rlf0IaOD1
 # In general: you will not need to modify these variables.
 # WARNING: When modifying the paths, keep in mind that the corresponding
 # postrm paths should be modified as well
-APT_FILE="/etc/apt/sources.list.d/ring-main.sources"
+APT_FILE="/etc/apt/sources.list.d/ring-main.list"
 UPDATE_MANAGER_PATH="/etc/update-manager/release-upgrades.d/"
 RING_UPDATE_MANAGER_ID="ring-main"
 
@@ -131,15 +131,7 @@ EOF
             # Add an entry for the package repository to the trusted package
             # sources (DEB822 format)
             cat > $APT_FILE <<EOF
-# This file makes sure that Ring is kept up-to-date
-# as part of regular system upgrades
-
-Types: deb
-URIs: $RING_REPO
-Suites: ring
-Architectures: i386 amd64
-Components: main
-Signed-By: $RING_KEY_FINGERPRINT
+deb ${RING_REPO} ring main
 EOF
 
             # Additionally, if update manager is installed we inform it about
-- 
GitLab