From 888d92d920617851e7eb099c59f7b583f8e88636 Mon Sep 17 00:00:00 2001 From: "coadde [Márcio Alexandre Silva Delgado]" Date: Tue, 21 Oct 2014 17:42:00 -0200 Subject: remove iceweasel-safe.desktop --- libre/iceweasel/PKGBUILD | 23 +++-- libre/iceweasel/iceweasel-safe.desktop | 149 --------------------------------- 2 files changed, 11 insertions(+), 161 deletions(-) delete mode 100644 libre/iceweasel/iceweasel-safe.desktop 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" diff --git a/libre/iceweasel/iceweasel-safe.desktop b/libre/iceweasel/iceweasel-safe.desktop deleted file mode 100644 index 7634c92e6..000000000 --- a/libre/iceweasel/iceweasel-safe.desktop +++ /dev/null @@ -1,149 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Name=Iceweasel - Safe Mode -Name[bg]=Iceweasel - Safe Mode -Name[ca]=Iceweasel - Safe Mode -Name[cs]=Iceweasel - Safe Mode -Name[el]=Iceweasel - Safe Mode -Name[es]=Iceweasel - Safe Mode -Name[fa]=Iceweasel - Safe Mode -Name[fi]=Iceweasel - Safe Mode -Name[fr]=Iceweasel - Safe Mode -Name[hu]=Iceweasel - Safe Mode -Name[it]=Iceweasel - Safe Mode -Name[ja]=Iceweasel - Safe Mode -Name[ko]=Iceweasel - Safe Mode -Name[nb]=Iceweasel - Safe Mode -Name[nl]=Iceweasel - Safe Mode -Name[nn]=Iceweasel - Safe Mode -Name[no]=Iceweasel - Safe Mode -Name[pl]=Iceweasel - Safe Mode -Name[pt]=Iceweasel - Safe Mode -Name[pt_BR]=Iceweasel - Safe Mode -Name[ru]=Iceweasel - Safe Mode -Name[sk]=Iceweasel - Safe Mode -Name[sv]=Iceweasel - Safe Mode -Comment=Browse the World Wide Web -Comment[bg]=Сърфиране в Мрежата -Comment[ca]=Navegueu per el web -Comment[cs]=Prohlížení stránek World Wide Webu -Comment[de]=Im Internet surfen -Comment[el]=Περιηγηθείτε στον παγκόσμιο ιστό -Comment[es]=Navegue por la web -Comment[fa]=صفحات شبکه جهانی اینترنت را مرور نمایید -Comment[fi]=Selaa Internetin WWW-sivuja -Comment[fr]=Navigue sur Internet -Comment[hu]=A világháló böngészése -Comment[it]=Esplora il web -Comment[ja]=ウェブを閲覧します -Comment[ko]=웹을 돌아 다닙니다 -Comment[nb]=Surf på nettet -Comment[nl]=Verken het internet -Comment[nn]=Surf på nettet -Comment[no]=Surf på nettet -Comment[pl]=Przeglądanie stron WWW -Comment[pt]=Navegue na Internet -Comment[pt_BR]=Navegue na Internet -Comment[ru]=Обозреватель Всемирной Паутины -Comment[sk]=Prehliadanie internetu -Comment[sv]=Surfa på webben -GenericName=Web Browser -GenericName[af]=Web Blaaier -GenericName[ar]=متصفح ويب -GenericName[az]=Veb Səyyahı -GenericName[bg]=Интернет браузър -GenericName[bn]=ওয়েব ব্রাউজার -GenericName[br]=Furcher ar Gwiad -GenericName[bs]=WWW Preglednik -GenericName[ca]=Navegador web -GenericName[cs]=Webový prohlížeč -GenericName[cy]=Porydd Gwe -GenericName[da]=Browser -GenericName[de]=Webbrowser -GenericName[el]=Περιηγητής ιστού -GenericName[eo]=TTT-legilo -GenericName[es]=Navegador web -GenericName[et]=Veebilehitseja -GenericName[eu]=Web arakatzailea -GenericName[fa]=مرورگر اینترنتی -GenericName[fi]=WWW-selain -GenericName[fo]=Alnótsfar -GenericName[fr]=Navigateur Web -GenericName[gl]=Navegador Web -GenericName[he]=דפדפן אינטרנט -GenericName[hi]=वेब ब्राउज़र -GenericName[hr]=Web preglednik -GenericName[hu]=Webböngésző -GenericName[is]=Vafri -GenericName[it]=Browser Web -GenericName[ja]=ウェブ・ブラウザ -GenericName[ko]=웹 브라우저 -GenericName[lo]=ເວັບບຣາວເຊີ -GenericName[lt]=Žiniatinklio naršyklė -GenericName[lv]=Web Pārlūks -GenericName[mk]=Прелистувач на Интернет -GenericName[mn]=Веб-Хөтөч -GenericName[nb]=Nettleser -GenericName[nds]=Nettkieker -GenericName[nl]=Webbrowser -GenericName[nn]=Nettlesar -GenericName[no]=Nettleser -GenericName[nso]=Seinyakisi sa Web -GenericName[pa]=ਵੈਬ ਝਲਕਾਰਾ -GenericName[pl]=Przeglądarka WWW -GenericName[pt]=Navegador Web -GenericName[pt_BR]=Navegador Web -GenericName[ro]=Navigator de web -GenericName[ru]=Интернет-браузер -GenericName[se]=Fierpmádatlogan -GenericName[sk]=Internetový prehliadač -GenericName[sl]=Spletni brskalnik -GenericName[sr]=Веб претраживач -GenericName[sr@Latn]=Veb pretraživač -GenericName[ss]=Ibrawuza yeWeb -GenericName[sv]=Webbläsare -GenericName[ta]=வலை உலாவி -GenericName[tg]=Тафсиргари вэб -GenericName[th]=เว็บบราวเซอร์ -GenericName[tr]=Web Tarayıcı -GenericName[uk]=Навігатор Тенет -GenericName[uz]=Веб-браузер -GenericName[ven]=Buronza ya Webu -GenericName[vi]=Trình duyệt Web -GenericName[wa]=Betchteu waibe -GenericName[xh]=Umkhangeli zincwadi we Web -GenericName[zh_CN]=网页浏览器 -GenericName[zh_TW]=網頁瀏覽器 -GenericName[zu]=Umcingi we-Web -X-GNOME-FullName=Iceweasel Web Browser -X-GNOME-FullName[bg]=Интернет браузър (Iceweasel) -X-GNOME-FullName[ca]=Navegador web Iceweasel -X-GNOME-FullName[cs]=Iceweasel Webový prohlížeč -X-GNOME-FullName[el]=Περιηγήτης Ιστού Iceweasel -X-GNOME-FullName[es]=Navegador web Iceweasel -X-GNOME-FullName[fa]=مرورگر اینترنتی Iceweasel -X-GNOME-FullName[fi]=Iceweasel-selain -X-GNOME-FullName[fr]=Navigateur Web Iceweasel -X-GNOME-FullName[hu]=Iceweasel webböngésző -X-GNOME-FullName[it]=Iceweasel Browser Web -X-GNOME-FullName[ja]=Iceweasel ウェブ・ブラウザ -X-GNOME-FullName[ko]=Iceweasel 웹 브라우저 -X-GNOME-FullName[nb]=Iceweasel Nettleser -X-GNOME-FullName[nl]=Iceweasel webbrowser -X-GNOME-FullName[nn]=Iceweasel Nettlesar -X-GNOME-FullName[no]=Iceweasel Nettleser -X-GNOME-FullName[pl]=Przeglądarka WWW Iceweasel -X-GNOME-FullName[pt]=Iceweasel Navegador Web -X-GNOME-FullName[pt_BR]=Navegador Web Iceweasel -X-GNOME-FullName[ru]=Интернет-браузер Iceweasel -X-GNOME-FullName[sk]=Internetový prehliadač Iceweasel -X-GNOME-FullName[sv]=Webbläsaren Iceweasel -Exec=/usr/lib/iceweasel/iceweasel -safe-mode %u -Terminal=false -X-MultipleArgs=false -Type=Application -Icon=iceweasel -Categories=Network;WebBrowser; -MimeType=text/html;text/xml;application/xhtml+xml;application/xml;application/vnd.mozilla.xul+xml;application/rss+xml;application/rdf+xml;image/gif;image/jpeg;image/png;x-scheme-handler/http;x-scheme-handler/https; -StartupWMClass=Iceweasel -StartupNotify=true -- cgit v1.2.3-54-g00ecf