[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#831447: firefox-branding-iceweasel 0.4.0 MIGRATED to testing



See the attached files.

nord-stream
diff -Nru firefox-branding-iceweasel-0.3.2/debian/changelog firefox-branding-iceweasel-0.4.0/debian/changelog
--- firefox-branding-iceweasel-0.3.2/debian/changelog	2016-06-02 14:05:58.000000000 +0000
+++ firefox-branding-iceweasel-0.4.0/debian/changelog	2016-06-27 13:02:45.000000000 +0000
@@ -1,3 +1,10 @@
+firefox-branding-iceweasel (0.4.0) unstable; urgency=low
+
+  * Register a .desktop file and icons.
+  * Marked as multiprocess-compatible.
+
+ -- nord-stream <nord-stream@ochaken.jp.eu.org>  Sun, 26 Jun 2016 07:20:16 +0000
+
 firefox-branding-iceweasel (0.3.2) unstable; urgency=low
 
   * Initial Debian packaging.  (Closes: #821210)
diff -Nru firefox-branding-iceweasel-0.3.2/debian/control firefox-branding-iceweasel-0.4.0/debian/control
--- firefox-branding-iceweasel-0.3.2/debian/control	2016-06-02 14:05:58.000000000 +0000
+++ firefox-branding-iceweasel-0.4.0/debian/control	2016-06-27 13:02:45.000000000 +0000
@@ -8,6 +8,7 @@
  librsvg2-bin,
  xsltproc,
  imagemagick
+Build-Conflicts: graphicsmagick-imagemagick-compat
 Standards-Version: 3.9.8
 Homepage: https://notabug.org/desktopd/iceweasel-branding
 Vcs-Git: https://anonscm.debian.org/git/pkg-mozext/iceweasel-branding.git
@@ -26,10 +27,9 @@
  ${xpi:Provides}
 Breaks:
  ${xpi:Breaks}
+Conflicts: iceweasel (<< 45.0)
 Description: Branding for Firefox to apply Iceweasel name and images
  This package preserves and restores the look and feel of Iceweasel, the Debian-
  rebranded version of Firefox distributed before Firefox came back to Debian.
  Most files were just copied from the original Iceweasel package, including the
  famous about:iceweasel page of historic value.
- .
- It does not change the desktop icon (yet).
diff -Nru firefox-branding-iceweasel-0.3.2/debian/install firefox-branding-iceweasel-0.4.0/debian/install
--- firefox-branding-iceweasel-0.3.2/debian/install	1970-01-01 00:00:00.000000000 +0000
+++ firefox-branding-iceweasel-0.4.0/debian/install	2016-06-27 13:02:45.000000000 +0000
@@ -0,0 +1,2 @@
+iceweasel.desktop usr/share/applications
+firefox-esr.desktop usr/share/applications
diff -Nru firefox-branding-iceweasel-0.3.2/debian/postrm firefox-branding-iceweasel-0.4.0/debian/postrm
--- firefox-branding-iceweasel-0.3.2/debian/postrm	1970-01-01 00:00:00.000000000 +0000
+++ firefox-branding-iceweasel-0.4.0/debian/postrm	2016-06-27 13:02:45.000000000 +0000
@@ -0,0 +1,9 @@
+#!/bin/sh -e
+
+package=xul-ext-iceweasel-branding
+if [ "$1" = "remove" ]; then
+    dpkg-divert --package "$package" --rename --remove /usr/share/applications/iceweasel.desktop
+    dpkg-divert --package "$package" --rename --remove /usr/share/applications/firefox-esr.desktop
+fi
+
+#DEBHELPER#
diff -Nru firefox-branding-iceweasel-0.3.2/debian/preinst firefox-branding-iceweasel-0.4.0/debian/preinst
--- firefox-branding-iceweasel-0.3.2/debian/preinst	1970-01-01 00:00:00.000000000 +0000
+++ firefox-branding-iceweasel-0.4.0/debian/preinst	2016-06-27 13:02:45.000000000 +0000
@@ -0,0 +1,9 @@
+#!/bin/sh -e
+
+package=xul-ext-iceweasel-branding
+if [ "$1" = "upgrade" ] || [ "$1" = "install" ] ; then
+    dpkg-divert --package "$package" --divert /usr/share/applications/iceweasel.desktop.diverted --rename /usr/share/applications/iceweasel.desktop
+    dpkg-divert --package "$package" --divert /usr/share/applications/firefox-esr.desktop.diverted --rename /usr/share/applications/firefox-esr.desktop
+fi
+
+#DEBHELPER#
diff -Nru firefox-branding-iceweasel-0.3.2/debian/xul-ext-iceweasel-branding.lintian-overrides firefox-branding-iceweasel-0.4.0/debian/xul-ext-iceweasel-branding.lintian-overrides
--- firefox-branding-iceweasel-0.3.2/debian/xul-ext-iceweasel-branding.lintian-overrides	1970-01-01 00:00:00.000000000 +0000
+++ firefox-branding-iceweasel-0.4.0/debian/xul-ext-iceweasel-branding.lintian-overrides	2016-06-27 13:02:45.000000000 +0000
@@ -0,0 +1,2 @@
+# Provided by firefox-esr
+xul-ext-iceweasel-branding binary: desktop-command-not-in-package
diff -Nru firefox-branding-iceweasel-0.3.2/firefox-esr.desktop firefox-branding-iceweasel-0.4.0/firefox-esr.desktop
--- firefox-branding-iceweasel-0.3.2/firefox-esr.desktop	1970-01-01 00:00:00.000000000 +0000
+++ firefox-branding-iceweasel-0.4.0/firefox-esr.desktop	2016-06-27 13:02:45.000000000 +0000
@@ -0,0 +1,105 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=Iceweasel
+Name[bg]=Iceweasel
+Name[ca]=Iceweasel
+Name[cs]=Iceweasel
+Name[el]=Iceweasel
+Name[es]=Iceweasel
+Name[fa]=Iceweasel
+Name[fi]=Iceweasel
+Name[fr]=Iceweasel
+Name[hu]=Iceweasel
+Name[it]=Iceweasel
+Name[ja]=Iceweasel
+Name[ko]=Iceweasel
+Name[nb]=Iceweasel
+Name[nl]=Iceweasel
+Name[nn]=Iceweasel
+Name[no]=Iceweasel
+Name[pl]=Iceweasel
+Name[pt]=Iceweasel
+Name[pt_BR]=Iceweasel
+Name[ru]=Iceweasel
+Name[sk]=Iceweasel
+Name[sv]=Iceweasel
+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[bg]=Интернет браузър
+GenericName[ca]=Navegador web
+GenericName[cs]=Webový prohlížeč
+GenericName[de]=Webbrowser
+GenericName[el]=Περιηγητής ιστού
+GenericName[es]=Navegador web
+GenericName[fa]=مرورگر اینترنتی
+GenericName[fi]=WWW-selain
+GenericName[fr]=Navigateur Web
+GenericName[hu]=Webböngésző
+GenericName[it]=Browser Web
+GenericName[ja]=ウェブ・ブラウザ
+GenericName[ko]=웹 브라우저
+GenericName[nb]=Nettleser
+GenericName[nl]=Webbrowser
+GenericName[nn]=Nettlesar
+GenericName[no]=Nettleser
+GenericName[pl]=Przeglądarka WWW
+GenericName[pt]=Navegador Web
+GenericName[pt_BR]=Navegador Web
+GenericName[ru]=Интернет-браузер
+GenericName[sk]=Internetový prehliadač
+GenericName[sv]=Webbläsare
+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=iceweasel --class Iceweasel %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
diff -Nru firefox-branding-iceweasel-0.3.2/iceweasel.desktop firefox-branding-iceweasel-0.4.0/iceweasel.desktop
--- firefox-branding-iceweasel-0.3.2/iceweasel.desktop	1970-01-01 00:00:00.000000000 +0000
+++ firefox-branding-iceweasel-0.4.0/iceweasel.desktop	2016-06-27 13:02:45.000000000 +0000
@@ -0,0 +1,105 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=Iceweasel
+Name[bg]=Iceweasel
+Name[ca]=Iceweasel
+Name[cs]=Iceweasel
+Name[el]=Iceweasel
+Name[es]=Iceweasel
+Name[fa]=Iceweasel
+Name[fi]=Iceweasel
+Name[fr]=Iceweasel
+Name[hu]=Iceweasel
+Name[it]=Iceweasel
+Name[ja]=Iceweasel
+Name[ko]=Iceweasel
+Name[nb]=Iceweasel
+Name[nl]=Iceweasel
+Name[nn]=Iceweasel
+Name[no]=Iceweasel
+Name[pl]=Iceweasel
+Name[pt]=Iceweasel
+Name[pt_BR]=Iceweasel
+Name[ru]=Iceweasel
+Name[sk]=Iceweasel
+Name[sv]=Iceweasel
+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[bg]=Интернет браузър
+GenericName[ca]=Navegador web
+GenericName[cs]=Webový prohlížeč
+GenericName[de]=Webbrowser
+GenericName[el]=Περιηγητής ιστού
+GenericName[es]=Navegador web
+GenericName[fa]=مرورگر اینترنتی
+GenericName[fi]=WWW-selain
+GenericName[fr]=Navigateur Web
+GenericName[hu]=Webböngésző
+GenericName[it]=Browser Web
+GenericName[ja]=ウェブ・ブラウザ
+GenericName[ko]=웹 브라우저
+GenericName[nb]=Nettleser
+GenericName[nl]=Webbrowser
+GenericName[nn]=Nettlesar
+GenericName[no]=Nettleser
+GenericName[pl]=Przeglądarka WWW
+GenericName[pt]=Navegador Web
+GenericName[pt_BR]=Navegador Web
+GenericName[ru]=Интернет-браузер
+GenericName[sk]=Internetový prehliadač
+GenericName[sv]=Webbläsare
+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=iceweasel --class Iceweasel %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
diff -Nru firefox-branding-iceweasel-0.3.2/Makefile firefox-branding-iceweasel-0.4.0/Makefile
--- firefox-branding-iceweasel-0.3.2/Makefile	2016-06-02 14:05:58.000000000 +0000
+++ firefox-branding-iceweasel-0.4.0/Makefile	2016-06-27 13:02:45.000000000 +0000
@@ -81,6 +81,12 @@
 	@echo "The 'install' target is only for Debian packaging!"
 	xpi-pack $(objdir) $(basedir)/build.xpi
 	install-xpi $(basedir)/build.xpi
+	$(INSTALL) -Dm 0644 $(srcdir)/icon16.png $(DESTDIR)/usr/share/icons/hicolor/16x16/apps/iceweasel.png
+	$(INSTALL) -Dm 0644 $(srcdir)/icon32.png $(DESTDIR)/usr/share/icons/hicolor/32x32/apps/iceweasel.png
+	$(INSTALL) -Dm 0644 $(srcdir)/icon48.png $(DESTDIR)/usr/share/icons/hicolor/48x48/apps/iceweasel.png
+	$(INSTALL) -Dm 0644 $(srcdir)/icon64.png $(DESTDIR)/usr/share/icons/hicolor/64x64/apps/iceweasel.png
+	$(INSTALL) -Dm 0644 $(srcdir)/icon128.png $(DESTDIR)/usr/share/icons/hicolor/128x128/apps/iceweasel.png
+	$(INSTALL) -Dm 0644 $(srcdir)/iceweasel/iceweasel_icon.svg $(DESTDIR)/usr/share/icons/hicolor/scalable/apps/iceweasel.svg
 
 GENERATED += $(basedir)/build.xpi
 
diff -Nru firefox-branding-iceweasel-0.3.2/README.markdown firefox-branding-iceweasel-0.4.0/README.markdown
--- firefox-branding-iceweasel-0.3.2/README.markdown	2016-06-02 14:05:58.000000000 +0000
+++ firefox-branding-iceweasel-0.4.0/README.markdown	2016-06-27 13:02:45.000000000 +0000
@@ -13,4 +13,4 @@
  Iceweasel, and Iceweasel does have a historical value. So this rebranding
  package was created to restore Iceweasel branding for Firefox. Most files were
  just copied from the original Iceweasel package.
- 
+
diff -Nru firefox-branding-iceweasel-0.3.2/src/xpi/install.rdf firefox-branding-iceweasel-0.4.0/src/xpi/install.rdf
--- firefox-branding-iceweasel-0.3.2/src/xpi/install.rdf	2016-06-02 14:05:58.000000000 +0000
+++ firefox-branding-iceweasel-0.4.0/src/xpi/install.rdf	2016-06-27 13:02:45.000000000 +0000
@@ -7,9 +7,10 @@
   <Description about="urn:mozilla:install-manifest">
     <em:id>iceweasel-branding@mozilla.debian.net</em:id>
     <em:name>Iceweasel Branding</em:name>
-    <em:version>0.3.2</em:version>
+    <em:version>0.3.3</em:version>
     <em:type>2</em:type>
     <em:unpack>true</em:unpack>
+    <em:multiprocessCompatible>true</em:multiprocessCompatible>
     <em:creator>Desktopd Project</em:creator>
     <em:developer>Debian Mozilla Extension Maintainers</em:developer>
     <em:contributor>Unicko</em:contributor> <!-- Artwork -->

Attachment: firefox-branding-iceweasel_0.3.2.tar.xz
Description: application/xz

Attachment: signature.asc
Description: OpenPGP digital signature


Reply to: