Closed Bug 537396 Opened 15 years ago Closed 15 years ago

Tracking bug for renaming fennec -> firefox

Categories

(Release Engineering :: General, defect)

defect
Not set
normal

Tracking

(Not tracked)

RESOLVED FIXED

People

(Reporter: mozilla, Assigned: mozilla)

References

Details

Attachments

(1 file, 1 obsolete file)

I'm not sure what the full extent is; tracking here. * Stuart wants the fennec*.deb to be renamed to firefox*.deb ** stub fennec*.deb to update the previously installed fennecs ** is this permanent, or only at release time? ** is this just a filename change, or will the browser think of itself as firefox in the backend? (for objections to fully renaming the product, see bug 515748 , esp comments 2,4,5,6,7,8,9,10)
This will probably also affect winmo. There are also rumblings of putting xulrunner inside of the same deb/tarball/exe. If we do the full rename: * maemo ** builds/packaging/package-tests/upload ** l10n repacks ** unit tests + talos : downloading/extracting the tarball ** update repo generation ** release factories * winmo ** builds/packaging/upload ** l10n repacks ** aus -- we need to make sure any solution doesn't cause conflicts with Firefox * win32/osx/linux desktop fennec ** builds/packaging/upload ** l10n repacks We also need to check for updating from Fennec -> Firefox (mobile), and how Firefox (browser) and Firefox (mobile) coexist in the same machine/platform. Once all the above patches are written, full end-to-end testing. Not a small project.
Marking this as blocking Fennec1.0 release, per irc discussion. Stuart: can you specify *exactly* what changes you want, so we can scope out how much work is involved before the next RC?
Blocks: 536233
It's my understanding that the only reason this rename is an issue is the text displayed in the Maemo (Hildon) Application Manager during the install process shows "fennec-1.0", which is the package name. This seems to happen even though we have settings to display the friendly text "Firefox" (or "Fennec" if a nightly). I think we should try to figure out why the friendly text is not displayed instead of trying to rename the deb package.
I think I might have stumbled on to something. The repos have a "Packages.gz" file in them. This archive contains a mini control file for each package in the repo. This file looks like this: eval eval /builds/scratchbox/sbin/chroot-uid /builds/scratchbox/users/cltbld /scratchbox/tools/bin/env - $SBENV /scratchbox/tools/bin/bash -l /scratchbox/tools/bin/exec.sh sign-debs/1.9.2_multi dpkg-scanpackages dists/chinook/extras/binary-armel/ /dev/null Package: fennec Version: 1.0b6pre Priority: extra Section: user/internet Maintainer: Mozilla Mobile <mobile@mozilla.com> Depends: libasound2 (>> 1.0.14), libc6 (>= 2.5.0-1), libdbus-1-3 (>= 0.94), libdbus-glib-1-2 (>= 0.74), libgcc1 (>= 1:3.4.4), libglib2.0-0 (>= 2.12.12-1osso3), libstdc++6 (>= 3.4.4), xulrunner (>= 1.9.2b6pre-20091231010452) Architecture: armel Filename: dists/chinook/extras/binary-armel//fennec_1.0b6pre_armel.deb Size: 1860960 Installed-Size: 6308 MD5sum: 8318dcb6f0e19e9ff523ef28dbab7d22 Description: Mozilla's mobile browser This browser is the full rendering engine of Mozilla Firefox combined with a user interface designed to make browsing the web on a mobile device a rich and uncompromised experience. Package: xulrunner Version: 1.9.2b6pre-20091231010452 Priority: extra Section: user/internet Maintainer: Mozilla xulrunner <blassey@mozilla.com> Depends: libasound2 (>> 1.0.14), libatk1.0-0 (>= 1.12.2), libc6 (>= 2.5.0-1), libcairo2 (>= 1.4.10), libdbus-1-3 (>= 0.94), libdbus-glib-1-2 (>= 0.74), libfontconfig1 (>= 2.4.1), libfreetype6 (>= 2.2.1), libgcc1 (>= 1:3.4.4), libgconf2-6 (>= 2.13.5), libglib2.0-0 (>= 2.12.12-1osso3), libgtk2.0-0 (>= 2:2.10.12-0osso15), libhildon1 (>= 1.0.11), libhildonmime0 (>= 1.10.0), liblocation0, libosso-gnomevfs2-0, libosso1 (>= 2.13), libpango1.0-0 (>= 1.16.4), libstdc++6 (>= 3.4.4), libx11-6, libxrender1, libxt6, zlib1g (>= 1:1.2.1) Architecture: armel Filename: dists/chinook/extras/binary-armel//xulrunner_1.9.2b6pre-20091231010452_armel.deb Size: 10996276 Installed-Size: 28740 MD5sum: 7512d0bf5269dcc88320bc3faee3641c Description: XUL runtime package A runtime package used to create XUL-based applications or embed Mozilla's Gecko engine into other applications I'd bet real money we'd need to add the "Maemo-Display-Name: Firefox" field in here too. I can't test it though.
I can confirm that the maemo.org Packages.gz has the Maemo-Display-Name and Maemo-Icon-26 fields present for packages that support them: http://repository.maemo.org/extras/dists/fremantle/free/binary-armel/Packages.gz
We have a XB-Maemo-Display-Name in http://hg.mozilla.org/mobile-browser/file/default/installer/debian/control.in#l14 and it appears MOZ_APP_DISPLAYNAME is Firefox in the release build due to branding. Do we need to remove the "XB-" ? Or is something else wrong?
"XB-" prefix is needed in that file. After the control.in is processed and used to make a deb package, the "XB-" is removed by one of the dh-* tools
... So in the Packages.gz file, we need the "XB-" to be removed. Example: Package: recorder Priority: optional Section: user/multimedia Installed-Size: 224 Maintainer: Marko Nykanen <marko.ja.nykanen@nokia.com> Architecture: armel Version: 0.3.1 Replaces: maemo-recorder Depends: libatk1.0-0 (>= 1.24.0), libc6 (>= 2.5.0-1), libcairo2, libdbus-1-3 (>= 1.1.4), libdbus-glib-1-2 (>= 0.76), libfontconfig1 (>= 2.6.0), libfreetype6 (>= 2.3.9), libgconf2-6 (>= 2.13.5), libglib2.0-0 (>= 2.20.0), libgstreamer0.10-0 (>= 0.10.23), libgtk2.0-0 (>= 2:2.12.9-0osso1), libhildon1, libhildonfm2 (>= 1:2.28+0m5), libmodest-dbus-client, libosso-gnomevfs2-0, libosso1 (>= 2.23), libpango1.0-0, libpixman-1-0 (>= 0.13.2), libpng12-0 (>= 1.2.13-4), libx11-6, libxml2 (>= 2.6.32), libxrender1, zlib1g (>= 1:1.2.1) Filename: pool/fremantle/free/r/recorder/recorder_0.3.1_armel.deb Size: 72944 MD5sum: 492838c3adff9915076edc8bf3ed391d SHA1: 77621fac9c206e50a506f8c67762c5e597474faf SHA256: 8fceae434ddaaa4f16a96f4653872d1bf169d9adf25cfdd7f1cf633c15980126 Description: Voice Recorder A simple graphical utility for recording audio from microphone. Maemo-Display-Name: Recorder Maemo-Icon-26: iVBORw0KGgoAAAANSUhEUgAAABoAAAAaCAYAAACpSkzOAAAABmJLR0QA/wD/ ... ...
The above example is from the Packages.gz file hosted by Maemo Garage
We currently use a script like this to create the Packages.gz file: --- #!/bin/sh DIST_DIR=`pwd` cd $DIST_DIR dpkg-scanpackages dists/chinook/release/binary-armel/ /dev/null | gzip -9c > dists/chinook/release/binary-armel/Packages.gz cd $DIST_DIR/dists/chinook/release/binary-armel apt-ftparchive release . > Release && yes | gpg -abs -o Release.gpg Release cd $DIST_DIR/dists/chinook/release apt-ftparchive release . > Release && yes | gpg -abs -o Release.gpg Release cd $DIST_DIR/dists/chinook apt-ftparchive release . > Release && yes | gpg -abs -o Release.gpg Release cd $DIST_DIR/ --- Let's change the first command to: apt-ftparchive packages dists/chinook/release/binary-armel /dev/null | gzip -9c > dists/chinook/release/binary-armel/Packages.gz
By "first command" are you referring to the first dpkg-scanpackages command, or the first apt-ftparchive command? (Currently reading as, change apt-ftparchive release . > Release && yes | gpg -abs -o Release.gpg Release cd $DIST_DIR/dists/chinook/release to apt-ftparchive packages dists/chinook/release/binary-armel /dev/null | gzip -9c > dists/chinook/release/binary-armel/Packages.gz is that correct ?)
Sorry. Nope, the dpkg-scanpackages line. Here is the updated version: #!/bin/sh DIST_DIR=`pwd` cd $DIST_DIR apt-ftparchive packages dists/chinook/release/binary-armel | gzip -9c > dists/chinook/release/binary-armel/Packages.gz cd $DIST_DIR/dists/chinook/release/binary-armel apt-ftparchive release . > Release && yes | gpg -abs -o Release.gpg Release cd $DIST_DIR/dists/chinook/release apt-ftparchive release . > Release && yes | gpg -abs -o Release.gpg Release cd $DIST_DIR/dists/chinook apt-ftparchive release . > Release && yes | gpg -abs -o Release.gpg Release cd $DIST_DIR/
Attached patch apply mfinkle's fix to signdebs.mk (obsolete) (deleted) — Splinter Review
I can test this once my loaner laptop comes up (shouldn't be too long).
I tried my patch, and I'm getting $ cat Packages eval eval /builds/scratchbox/sbin/chroot-uid /builds/scratchbox/users/cltbld /scratchbox/tools/bin/env - $SBENV /scratchbox/tools/bin/bash -l /scratchbox/tools/bin/exec.sh sign-debs-staging/1.9.2_en-US apt-ftparchive dists/chinook/extras/binary-armel $ ... there seem to be no contents ?
Comment on attachment 420010 [details] [diff] [review] apply mfinkle's fix to signdebs.mk >diff -r 2bdb13bb6c5a release/signing/signdebs.mk >+ $(SBOX_PATH) -p -d $(SBOX_WORKDIR) apt-ftparchive dists/$(MAEMO_VERSION) you forgot the "packages" command. should be: >+ $(SBOX_PATH) -p -d $(SBOX_WORKDIR) apt-ftparchive packages dists/$(MAEMO_VERSION)
Attachment #420010 - Flags: review-
Attached patch oops (deleted) — Splinter Review
Ok, with that I ran the repo creation in staging and got Maemo-Display-Name: Firefox in the Packages.gz file.
Attachment #420010 - Attachment is obsolete: true
Attachment #420040 - Flags: review?(mark.finkle)
Comment on attachment 420040 [details] [diff] [review] oops That should do the trick
Attachment #420040 - Flags: review?(mark.finkle) → review+
Attachment #420040 - Flags: checked-in+
This is checked in. I'll re-run the repo updates once bug 537786 is r'ed and fixed.
These are running. I looked at the trunk_multi extras Packages.gz file, and it contains the Maemo-Display-Name. Marking fixed.
Status: NEW → RESOLVED
Closed: 15 years ago
Resolution: --- → FIXED
Product: mozilla.org → Release Engineering
You need to log in before you can comment on or make changes to this bug.

Attachment

General

Created:
Updated:
Size: