зеркало из https://github.com/mozilla/gecko-dev.git
Backed out 3 changesets (bug 1905073, bug 1876701, bug 1863757) for causing mbu failures at test_deb.py CLOSED TREE
Backed out changeset 989113ca866f (bug 1863757) Backed out changeset 6d2df6fd6f11 (bug 1876701) Backed out changeset 576f4de811d7 (bug 1905073)
This commit is contained in:
Родитель
8418327ae8
Коммит
31d462d101
|
@ -7,5 +7,4 @@ Build-Depends: debhelper (>= 9)
|
|||
Package: ${DEB_PKG_NAME}
|
||||
Architecture: ${DEB_ARCH_NAME}
|
||||
Depends: ${DEB_DEPENDS}
|
||||
Provides: gnome-www-browser, www-browser
|
||||
Description: ${DEB_DESCRIPTION}
|
||||
|
|
|
@ -1,104 +0,0 @@
|
|||
.TH ${DISPLAY_NAME} 1 "${DEB_MANPAGE_DATE}" ${DEB_PKG_NAME} "Linux User's Manual"
|
||||
.SH NAME
|
||||
${DEB_PKG_NAME} - ${DISPLAY_NAME} offers safe and easy web browsing
|
||||
|
||||
.SH SYNOPSIS
|
||||
.B ${DEB_PKG_NAME}
|
||||
[\fIOPTIONS\fR] [\fIURL\fR]
|
||||
|
||||
.B /usr/lib/${DEB_PKG_NAME}/${DEB_PKG_NAME}
|
||||
[\fIOPTIONS\fR] [\fIURL\fR]
|
||||
|
||||
.SH DESCRIPTION
|
||||
\fB${DISPLAY_NAME}\fR is an open-source web browser, designed for
|
||||
standards compliance, performance and portability.
|
||||
|
||||
.SH USAGE
|
||||
If there is an ${DISPLAY_NAME} browser already running, \fB${DEB_PKG_NAME}\fR will
|
||||
arrange for it to create a new browser window; otherwise it will start
|
||||
a new instance.
|
||||
|
||||
.SH OPTIONS
|
||||
A summary of the options supported by \fB${DEB_PKG_NAME}\fR is included below.
|
||||
|
||||
.SS "X11 options"
|
||||
.TP
|
||||
.BI \-\-display= DISPLAY
|
||||
X display to use
|
||||
.TP
|
||||
.B \-\-sync
|
||||
Make X calls synchronous
|
||||
.TP
|
||||
.B \-\-no\-xshm
|
||||
Don't use X shared memory extension
|
||||
.TP
|
||||
.BI \-\-xim\-preedit= STYLE
|
||||
.TP
|
||||
.BI \-\-xim\-status= STYLE
|
||||
.TP
|
||||
.B \-\-g\-fatal\-warnings
|
||||
Make all warnings fatal
|
||||
|
||||
.SS "Mozilla options"
|
||||
.TP
|
||||
.B \-h, \-help
|
||||
Show summary of options.
|
||||
.TP
|
||||
.B \-v, \-version
|
||||
Print ${DISPLAY_NAME} version.
|
||||
.TP
|
||||
\fB\-P\fR [\fIprofile\fR]
|
||||
Start with \fIprofile\fR. When no profile is given, displays the Profile Manager. May require \fB\-no\-remote\fR, see below.
|
||||
.TP
|
||||
.B \-migration
|
||||
Start with migration wizard. May require \fB\-no\-remote\fR, see below.
|
||||
.TP
|
||||
.B \-ProfileManager
|
||||
Start with profile manager. May require \fB\-no\-remote\fR, see below.
|
||||
.TP
|
||||
.B \-no\-remote
|
||||
Don't connect to a running ${DISPLAY_NAME} instance. This option can be necessary
|
||||
in conjunction to several of the options above, that won't have any effect
|
||||
when an ${DISPLAY_NAME} instance is running unless \fB\-no\-remote\fR is used at
|
||||
the same time.
|
||||
.TP
|
||||
\fB\-UILocale\fR \fIlocale\fR
|
||||
Start with \fIlocale\fR resources as User Interface locale. By default, it is
|
||||
guessed from environment and available locales for ${DISPLAY_NAME}.
|
||||
.TP
|
||||
.B \-safe\-mode
|
||||
Starts ${DISPLAY_NAME} in safe mode, i.e. disabling all extensions and
|
||||
showing a bit more debugging messages.
|
||||
.TP
|
||||
.B \-jsconsole
|
||||
Start with Javascript Console
|
||||
.TP
|
||||
\fB\-new-window\fR \fIURL\fR
|
||||
Open \fIURL\fR in a new window in an already running ${DISPLAY_NAME} process.
|
||||
.TP
|
||||
\fB\-new-tab\fR \fIURL\fR
|
||||
Open \fIURL\fR in a new tab in an already running ${DISPLAY_NAME} process.
|
||||
.TP
|
||||
\fB\-chrome\fR \fIurl\fR
|
||||
Load the specified chrome.
|
||||
|
||||
.SH ENVIRONMENT
|
||||
\fIMOZILLA_DISABLE_PLUGINS\fR - when set, totally disables loading browser plugins
|
||||
(the ones that appear at the about:plugins url)
|
||||
|
||||
.SH FILES
|
||||
\fI/usr/bin/${DEB_PKG_NAME}\fR - symbolic link to \fB/usr/lib/${DEB_PKG_NAME}/${DEB_PKG_NAME}\fR.
|
||||
.br
|
||||
|
||||
\fI/usr/lib/${DEB_PKG_NAME}/${DEB_PKG_NAME}\fR - ${DISPLAY_NAME} executable.
|
||||
|
||||
\fI/usr/lib/${DEB_PKG_NAME}/firefox\-bin\fR - Legacy executable.
|
||||
.br
|
||||
|
||||
.SH BUGS
|
||||
To report a bug, please visit \fIhttp://bugzilla.mozilla.org/\fR
|
||||
|
||||
.SH AUTHORS
|
||||
.TP
|
||||
.B The Mozilla Organization
|
||||
.I https://www.mozilla.org/en-US/about/
|
|
@ -1 +0,0 @@
|
|||
debian/${DEB_PKG_NAME}.1
|
|
@ -1,13 +0,0 @@
|
|||
#!/bin/sh -e
|
||||
|
||||
if [ "$$1" = "configure" ] || [ "$$1" = "abort-upgrade" ] || [ "$$1" = "abort-remove" ] ; then
|
||||
update-alternatives --install /usr/bin/gnome-www-browser \
|
||||
gnome-www-browser /usr/bin/${DEB_PKG_NAME} 100 \
|
||||
--slave /usr/share/man/man1/gnome-www-browser.1.gz \
|
||||
gnome-www-browser.1.gz /usr/share/man/man1/${DEB_PKG_NAME}.1.gz
|
||||
|
||||
update-alternatives --install /usr/bin/x-www-browser \
|
||||
x-www-browser /usr/bin/${DEB_PKG_NAME} 100 \
|
||||
--slave /usr/share/man/man1/x-www-browser.1.gz \
|
||||
x-www-browser.1.gz /usr/share/man/man1/${DEB_PKG_NAME}.1.gz
|
||||
fi
|
|
@ -1,6 +0,0 @@
|
|||
#!/bin/sh -e
|
||||
|
||||
if [ "$$1" = "remove" ] || [ "$$1" = "deconfigure" ] ; then
|
||||
update-alternatives --remove x-www-browser /usr/bin/${DEB_PKG_NAME}
|
||||
update-alternatives --remove gnome-www-browser /usr/bin/${DEB_PKG_NAME}
|
||||
fi
|
|
@ -121,7 +121,6 @@ def repackage_deb(
|
|||
fluent_localization,
|
||||
fluent_resource_loader,
|
||||
)
|
||||
_mv_manpage_files(source_dir, build_variables)
|
||||
_inject_deb_prefs_file(source_dir, app_name, template_dir)
|
||||
_generate_deb_archive(
|
||||
source_dir,
|
||||
|
@ -294,10 +293,8 @@ def _get_build_variables(
|
|||
"DEB_DISPLAY_NAME": application_ini_data["display_name"],
|
||||
"DEB_PKG_VERSION": application_ini_data["deb_pkg_version"],
|
||||
"DEB_CHANGELOG_DATE": format_datetime(application_ini_data["timestamp"]),
|
||||
"DEB_MANPAGE_DATE": application_ini_data["timestamp"].strftime("%B %d, %Y"),
|
||||
"DEB_ARCH_NAME": _DEB_ARCH[arch],
|
||||
"DEB_DEPENDS": depends,
|
||||
"DISPLAY_NAME": application_ini_data["display_name"],
|
||||
}
|
||||
|
||||
|
||||
|
@ -374,17 +371,6 @@ def _inject_deb_prefs_file(source_dir, app_name, template_dir):
|
|||
shutil.copy(src, dst)
|
||||
|
||||
|
||||
def _mv_manpage_files(source_dir, build_variables):
|
||||
src = mozpath.join(source_dir, "debian", "manpage.1")
|
||||
dst = mozpath.join(source_dir, "debian", f"{build_variables['DEB_PKG_NAME']}.1")
|
||||
shutil.move(src, dst)
|
||||
src = mozpath.join(source_dir, "debian", "manpages")
|
||||
dst = mozpath.join(
|
||||
source_dir, "debian", f"{build_variables['DEB_PKG_NAME']}.manpages"
|
||||
)
|
||||
shutil.move(src, dst)
|
||||
|
||||
|
||||
def _inject_deb_desktop_entry_file(
|
||||
log,
|
||||
source_dir,
|
||||
|
|
Загрузка…
Ссылка в новой задаче