Provide both firefox and chromium

Signed-off-by: Mubashshir <ahm@jadupc.com>

2 files changed, 42 insertions, 8 deletions

diff --git a/debian/control b/debian/control
index 5e8e832..bdfc460 100644
--- a/debian/control
+++ b/debian/control
@@ -13,10 +13,10 @@ Package: shopno-os-base
 Architecture: all
 Depends:
  python-apt-common-shopno,
- shopno-os-browser
 Recommends:
  shopno-os-libreoffice,
- shopno-os-refresh-menu
+ shopno-os-refresh-menu,
+ shopno-os-browser
 Suggests:
  shopno-os-office,
  shopno-os-games,
@@ -49,14 +49,33 @@ Depends:
 Description: LibreOffice compatibility package (gtk3)
  Installs libreoffice and libreoffice-gtk3 platform
 
+# browser
 Package: shopno-os-browser
 Architecture: all
 Depends:
+ shopno-os-firefox | shopno-os-chromium
+Recommends:
+ shopno-os-firefox,
+ shopno-os-chromium
+Description: Default Browser Meta package
+ Installs Suggested Browsers with extensions
+
+Package: shopno-os-firefox
+Architecture: all
+Depends:
  firefox | firefox-esr,
  webext-ublock-origin-firefox
-Description: Default Browser Meta package
+Description: Firefox Meta package
  Installs Firefox with uBlock Origin adblocker
 
+Package: shopno-os-chromium
+Architecture: all
+Depends:
+ chromium,
+ webext-ublock-origin-chromium
+Description: Chromium Meta package
+ Installs Chromium with uBlock Origin adblocker
+
 # tasks
 Package: shopno-os-office
 Architecture: all
diff --git a/pkgs.dot b/pkgs.dot
index 9441e0d..6c4d08a 100644
--- a/pkgs.dot
+++ b/pkgs.dot
@@ -8,13 +8,16 @@ digraph "packages" {
 		depends [color=purple];
 		optional [color=blue];
 		recommends [color=green];
+		provides [color=cyan]
 		built [color=darkred];
-		depends -> recommends -> optional -> built [style=invis];
+		conflict [color=white];
+
+		conflict -> depends -> recommends -> optional -> provides -> built [style=invis];
 		label = "shopno-os metapackages, @ = shopno-os-"
 	}
 	{
 		node [color=darkred]
-		"@libreoffice" "@refresh-menu" "@browser" "@entertainment"
+		"@libreoffice" "@refresh-menu" "@browser" "@entertainment" "@chromium" "@firefox"
 		"@development" "@base" "@education" "@games" "@office";
 	}
 	{
@@ -22,8 +25,8 @@ digraph "packages" {
 	}
 
 	subgraph "@base" {
-		"@base" -> {"python-apt-common-shopno" "@browser"} [color=purple];
-		"@base" -> {"@libreoffice" "@refresh-menu"} [color=green];
+		"@base" -> {"python-apt-common-shopno"} [color=purple];
+		"@base" -> {"@libreoffice" "@refresh-menu" "@browser"} [color=green];
 		"@base" -> {
 			"@office" "@development"
 			"@entertainment" "@education" "@games"
@@ -62,8 +65,20 @@ digraph "packages" {
 		label = "@games"
 		"@games" -> { supertuxkart "gnome-sudoku" } [color=purple];
 	}
+
+	subgraph "cluster_@browser" {
+		label = "@browser"
+		"@browser" -> {
+			node [shape=point label = "or"];
+			browser_depends_or
+		} -> {
+			"@chromium" "@firefox"
+		} [color=purple];
+		"@browser" -> { "@firefox" "@chromium" } [color=green];
+	}
 	// non-task meta packages
-	"@browser"      -> {"firefox" "webext-ublock-origin-firefox"} [color=purple];
+	"@firefox"      -> { "firefox"  "webext-ublock-origin-firefox" } [color=purple];
+	"@chromium"     -> { "chromium" "webext-ublock-origin-chromium" } [color=purple];
 	"@refresh-menu" -> {"xfdesktop" "thunar"} [color=purple];
 	"@libreoffice" -> {"libreoffice" "libreoffice-gtk"} [color=purple];
 }