rearrange -stackrpms suffix

   Move the stackrpms to part of the version-release and not
   the package name. it was tripping the insane templating used
   by the Firefox package.

4 files changed, 7 insertions, 9 deletions

diff --git a/librewolf/debian/bgstack15-librewolf-prefs.js b/librewolf/debian/bgstack15-librewolf-prefs.js
index 947eac6..022646d 100644
--- a/librewolf/debian/bgstack15-librewolf-prefs.js
+++ b/librewolf/debian/bgstack15-librewolf-prefs.js
@@ -1,5 +1,5 @@
 // file: /usr/lib/librewolf/browser/defaults/preferences/bgstack15-newmoon-prefs.js
-// deployed with librewolf-stackrpms package (rpm or dpkg) built by bgstack15
+// deployed with librewolf (stackrpms) package (rpm or dpkg) built by bgstack15
 // last modified 2022-01-05
 // reference:
 //    https://support.mozilla.org/en-US/kb/customizing-firefox-using-autoconfig
diff --git a/librewolf/debian/browser.install.in b/librewolf/debian/browser.install.in
index 3e5f612..0e4462c 100644
--- a/librewolf/debian/browser.install.in
+++ b/librewolf/debian/browser.install.in
@@ -40,7 +40,7 @@ usr/lib/@browser@/libmozsandbox.so
 
 usr/lib/@browser@/defaults/pref/channel-prefs.js
 
-usr/lib/@browser@/librewolf usr/lib/@browser@
+usr/lib/@browser@/@browser@ usr/lib/@browser@
 
 usr/lib/@browser@/browser/defaults/preferences usr/share/@browser@/browser/defaults
 usr/lib/@browser@/browser/chrome usr/share/@browser@/browser
@@ -58,7 +58,7 @@ debian/vendor.js usr/share/@browser@/browser/defaults/preferences
 usr/lib/@browser@/browser/features usr/lib/@browser@/browser
 
 %if browser != librewolf
-debian/librewolf-stackrpms usr/bin
+debian/librewolf usr/bin
 %endif
 
 usr/lib/@browser@/gmp-clearkey/0.1/manifest.json
@@ -77,7 +77,7 @@ usr/lib/@browser@/pingsender
 
 debian/@browser@-symbolic.svg usr/share/icons/hicolor/symbolic/apps
 
-debian/librewolf_settings/librewolf.cfg usr/share/@browser@
+debian/librewolf_settings/@browser@.cfg usr/share/@browser@
 debian/librewolf_settings/defaults/pref/local-settings.js usr/share/@browser@/defaults/pref
 debian/librewolf_settings/distribution/policies.json usr/share/@browser@/distribution
 debian/bgstack15-librewolf-prefs.js usr/lib/@browser@/defaults/pref
diff --git a/librewolf/debian/changelog b/librewolf/debian/changelog
index daf39b0..900e7ab 100644
--- a/librewolf/debian/changelog
+++ b/librewolf/debian/changelog
@@ -1,4 +1,4 @@
-librewolf-stackrpms (95.0.1-1) unstable; urgency=low
+librewolf (95.0.1-1+stackrpms) unstable; urgency=low
 
   * Fork to stackrpms release of LibreWolf.
   * USE AT YOUR OWN RISK! This is a customized package for
diff --git a/librewolf/debian/control b/librewolf/debian/control
index 19ac46c..3737e6d 100644
--- a/librewolf/debian/control
+++ b/librewolf/debian/control
@@ -1,4 +1,4 @@
-Source: librewolf-stackrpms
+Source: librewolf
 Section: web
 Priority: optional
 Maintainer: B. Stack <bgstack15@gmail.com>
@@ -49,7 +49,7 @@ Build-Conflicts: graphicsmagick-imagemagick-compat,
                  libosso-dev
 Standards-Version: 3.9.8.0
 
-Package: librewolf-stackrpms
+Package: librewolf
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
@@ -65,8 +65,6 @@ Suggests: fonts-stix | otf-stix,
           libcanberra0,
 Provides: www-browser,
           gnome-www-browser
-Replaces: librewolf (<= %{binary:Version})
-Conflicts: librewolf (<= %{binary:Version})
 Description: LibreWolf for Stackrpms
  LibreWolf is a build of Firefox that seeks to protect user privacy,
  security, and freedom.