remove iceweasel-safe.desktop

1 files changed, 11 insertions, 12 deletions

diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD
index a05f1bd08..f2c2091a9 100644
--- a/libre/iceweasel/PKGBUILD
+++ b/libre/iceweasel/PKGBUILD
@@ -40,7 +40,7 @@ optdepends=('networkmanager: Location detection via available WiFi networks'
             'gst-plugins-good: h.264 video'
             'gst-libav: h.264 video')
 url="http://packages.debian.org/experimental/${pkgname}"
-install=iceweasel.install
+install=$pkgname.install
 replaces=('firefox' "${pkgname}-libre")
 conflicts=('firefox' "${pkgname}-libre")
 provides=('firefox')
@@ -52,11 +52,11 @@ source=("$_parabolarepo/$_debname-libre_$_debver.orig.tar.bz2"
         non-openh264.patch
         libre.patch
         gnu_headshadow.png
-        iceweasel.desktop
-        iceweasel-install-dir.patch
+        $pkgname.desktop
+        $pkgname-install-dir.patch
         vendor.js
         rhbz-966424.patch
-        iceweasel-fixed-loading-icon.png)
+        $pkgname-fixed-loading-icon.png)
 mkmd5sums=('5288af8026ff814fc4d769fed69865f7')
 md5sums=('fb98f648a43df8b54bbfeec3602cf3aa'
          'b80c7833dc8aaba3ff394c13532895b8'
@@ -65,7 +65,7 @@ md5sums=('fb98f648a43df8b54bbfeec3602cf3aa'
          'dea78e67cbda6811905e6c7b1e72df88'
          '615e983df37cdee26095df4d645cd2ab'
          'b03a979a78484503ba8dddad4f2c96d1'
-         '7b9e5996dd9fe0b186a43a297db1c6b5'
+         'fd8f61f2ae44e5b0e0b2c7b433695980'
          '1c42509891cf6843660a5f3c69896e80'
          'fe1b3c1026f0071c9755daea2ab95928'
          '16a112aaeee34ff3cae1fc1a521448a0'
@@ -102,8 +102,8 @@ prepare() {
   # Remove nonfree OpenH264 references
   patch -Np1 -i "$srcdir/non-openh264.patch"
 
-  # Install to /usr/lib/iceweasel
-  patch -Np1 -i "$srcdir/iceweasel-install-dir.patch"
+  # Install to /usr/lib/$pkgname
+  patch -Np1 -i "$srcdir/$pkgname-install-dir.patch"
 
   # https://bugs.archlinux.org/task/41689
   patch -Np1 -i "$srcdir/rhbz-966424.patch"
@@ -179,7 +179,7 @@ prepare() {
   # https://bugzilla.mozilla.org/show_bug.cgi?id=841734
   # TODO: Remove this; Iceweasel 36 might use CSS animations for the loading icon
   # https://bugzilla.mozilla.org/show_bug.cgi?id=759252
-  cp "$srcdir/iceweasel-fixed-loading-icon.png" \
+  cp "$srcdir/$pkgname-fixed-loading-icon.png" \
     browser/themes/linux/tabbrowser/loading.png
 
   # Remove non-existent file on Makefile.in
@@ -212,7 +212,6 @@ package() {
 
   install -Dm644 ../vendor.js "$pkgdir/usr/lib/$pkgname/browser/defaults/preferences/vendor.js"
 
-  # I don't even know why we're hitting the objdir, and ConnOS didn't
   _brandingdir=debian/branding
   brandingdir=moz-objdir/$_brandingdir
   icondir="$pkgdir/usr/share/icons/hicolor"
@@ -221,17 +220,17 @@ package() {
   done
   install -Dm644 "$brandingdir/mozicon128.png" \
     "$icondir/128x128/apps/$pkgname.png"
-  install -Dm644 "$_brandingdir/iceweasel_icon.svg" \
+  install -Dm644 "$_brandingdir/$pkgname_icon.svg" \
     "$icondir/scalable/apps/$pkgname.svg"
  
   install -d "$pkgdir/usr/share/applications"
-  install -m644  "$srcdir/iceweasel.desktop" \
+  install -m644  "$srcdir/$pkgname.desktop" \
     "$pkgdir/usr/share/applications"
 
   # Use system-provided dictionaries
   rm -rf "$pkgdir/usr/lib/$pkgname/"{dictionaries,hyphenation}
   ln -s /usr/share/hunspell "$pkgdir/usr/lib/$pkgname/dictionaries"
-  ln -s /usr/share/hyphen "$pkgdir/usr/lib/$pkgname/hyphenation"
+  ln -s /usr/share/hyphen   "$pkgdir/usr/lib/$pkgname/hyphenation"
 
   rm -rf "$pkgdir/usr/lib/$pkgname/browser/"{searchplugins,plugins}
   ln -sf /usr/lib/mozilla/plugins       "$pkgdir/usr/lib/$pkgname/browser/plugins"