diff options
| -rw-r--r-- | changelog | 8 | ||||
| -rw-r--r-- | control | 16 | ||||
| -rw-r--r-- | netsurf-gtk.desktop | 4 | ||||
| -rw-r--r-- | netsurf-gtk.install | 2 | ||||
| -rw-r--r-- | netsurf-gtk.manpages | 2 | ||||
| -rw-r--r-- | netsurf-gtk.postinst | 2 | ||||
| -rw-r--r-- | netsurf-gtk.prerm | 2 | ||||
| -rw-r--r-- | netsurf-gtk2.1 (renamed from netsurf-gtk.1) | 0 | ||||
| -rw-r--r-- | netsurf-gtk2.desktop | 68 | ||||
| -rw-r--r-- | netsurf-gtk2.install | 1 | ||||
| -rw-r--r-- | netsurf-gtk2.manpages | 1 | ||||
| -rw-r--r-- | netsurf-gtk2.menu | 3 | ||||
| -rw-r--r-- | netsurf-gtk2.postinst | 8 | ||||
| -rw-r--r-- | netsurf-gtk2.prerm | 8 | ||||
| -rw-r--r-- | netsurf-gtk3.1 | 362 | ||||
| -rwxr-xr-x | rules | 18 |
16 files changed, 491 insertions, 14 deletions
@@ -1,4 +1,10 @@ -netsurf (3.9-1) UNRELEASED; urgency=medium +netsurf (3.9-2) UNRELEASED; urgency=medium + + * Build both gtk2 and gtk3 versions + + -- Vincent Sanders <vince@debian.org> 02 Dec 2019 22:11:04 +0000 + +netsurf (3.9-1) unstable; urgency=medium * New upstream release (Closes: #869600) * Make png generation reproducible. @@ -3,7 +3,7 @@ Section: web Priority: optional Maintainer: Vincent Sanders <vince@debian.org> Uploaders: Daniel Silverstone <dsilvers@digital-scurf.org> -Build-Depends: debhelper (>= 9~), libcurl4-openssl-dev, libpng-dev, libgtk2.0-dev, flex, bison, libhtml-parser-perl, librsvg2-dev, libjpeg-dev, imagemagick, libfreetype6-dev, libvncserver-dev, libsdl1.2-dev, libxcb1-dev, libxcb-icccm4-dev, libxcb-image0-dev, libxcb-keysyms1-dev, libxcb-util0-dev, libssl-dev, gperf, xxd +Build-Depends: debhelper (>= 9~), libcurl4-openssl-dev, libpng-dev, libgtk2.0-dev, libgtk-3-dev, flex, bison, libhtml-parser-perl, librsvg2-dev, libjpeg-dev, imagemagick, libfreetype6-dev, libvncserver-dev, libsdl1.2-dev, libxcb1-dev, libxcb-icccm4-dev, libxcb-image0-dev, libxcb-keysyms1-dev, libxcb-util0-dev, libssl-dev, gperf, xxd Standards-Version: 4.1.4 Homepage: https://www.netsurf-browser.org Vcs-Browser: https://source.netsurf-browser.org/packaging/debian.git/ @@ -32,7 +32,19 @@ Description: small web browser with CSS support for GTK comprehensive rendering of HTML 5 with CSS 2 in a small resource footprint without compromising performance. . - This version uses the GTK+ toolkit. + This version uses the GTK+ 3 toolkit. + +Package: netsurf-gtk2 +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, netsurf-common (=${source:Version}) +Provides: www-browser +Recommends: mime-support +Description: small web browser with CSS support for GTK + NetSurf is a multi-platform lightweight web browser. It aims to provide + comprehensive rendering of HTML 5 with CSS 2 in a small resource footprint + without compromising performance. + . + This version uses the GTK+ 2 toolkit. Package: netsurf-fb Architecture: any diff --git a/netsurf-gtk.desktop b/netsurf-gtk.desktop index 4c21d55..99b7ceb 100644 --- a/netsurf-gtk.desktop +++ b/netsurf-gtk.desktop @@ -57,11 +57,11 @@ GenericName[pl]=Przeglądarka WWW GenericName[pt]=Navegador Web GenericName[pt_BR]=Navegador Web GenericName[sk]=Internetový prehliadač -Exec=netsurf-gtk %u +Exec=netsurf-gtk3 %u Terminal=false X-MultipleArgs=false Type=Application -Icon=netsurf.png +Icon=netsurf3.png Categories=Network; MimeType=text/html;text/xml;application/xhtml+xml;application/xml;image/gif;image/jpeg;image/png StartupWMClass=NetSurf-bin diff --git a/netsurf-gtk.install b/netsurf-gtk.install index 39984a6..4a23411 100644 --- a/netsurf-gtk.install +++ b/netsurf-gtk.install @@ -1 +1 @@ -usr/bin/netsurf-gtk +usr/bin/netsurf-gtk3 diff --git a/netsurf-gtk.manpages b/netsurf-gtk.manpages index a49aae5..6d833ec 100644 --- a/netsurf-gtk.manpages +++ b/netsurf-gtk.manpages @@ -1 +1 @@ -debian/netsurf-gtk.1 +debian/netsurf-gtk3.1 diff --git a/netsurf-gtk.postinst b/netsurf-gtk.postinst index 8686b98..22d8df5 100644 --- a/netsurf-gtk.postinst +++ b/netsurf-gtk.postinst @@ -2,7 +2,7 @@ set -e if [ "$1" = "configure" ]; then - update-alternatives --install /usr/bin/netsurf netsurf-browser /usr/bin/netsurf-gtk 80 --slave /usr/share/man/man1/netsurf.1.gz netsurf-manual /usr/share/man/man1/netsurf-gtk.1.gz + update-alternatives --install /usr/bin/netsurf netsurf-browser /usr/bin/netsurf-gtk3 80 --slave /usr/share/man/man1/netsurf.1.gz netsurf-manual /usr/share/man/man1/netsurf-gtk3.1.gz fi #DEBHELPER# diff --git a/netsurf-gtk.prerm b/netsurf-gtk.prerm index 6294db0..1a4eedc 100644 --- a/netsurf-gtk.prerm +++ b/netsurf-gtk.prerm @@ -2,7 +2,7 @@ set -e if [ "$1" != "upgrade" ]; then - update-alternatives --remove netsurf-browser /usr/bin/netsurf-gtk + update-alternatives --remove netsurf-browser /usr/bin/netsurf-gtk3 fi #DEBHELPER# diff --git a/netsurf-gtk.1 b/netsurf-gtk2.1 index 13a0fa5..13a0fa5 100644 --- a/netsurf-gtk.1 +++ b/netsurf-gtk2.1 diff --git a/netsurf-gtk2.desktop b/netsurf-gtk2.desktop new file mode 100644 index 0000000..2b4e15d --- /dev/null +++ b/netsurf-gtk2.desktop @@ -0,0 +1,68 @@ +[Desktop Entry] +Name=NetSurf Web Browser +Name[ca]=Navegador web NetSurf +Name[cs]=NetSurf Webový prohlížeč +Name[es]=Navegador web NetSurf +Name[fa]=مرورگر اینترنتی NetSurf +Name[fi]=NetSurf-selain +Name[fr]=Navigateur Web NetSurf +Name[hu]=NetSurf webböngésző +Name[it]=NetSurf Browser Web +Name[ja]=NetSurf ウェブ・ブラウザ +Name[ko]=NetSurf 웹 브라우저 +Name[nb]=NetSurf Nettleser +Name[nl]=NetSurf webbrowser +Name[nn]=NetSurf Nettlesar +Name[no]=NetSurf Nettleser +Name[pl]=Przeglądarka WWW NetSurf +Name[pt]=NetSurf Navegador Web +Name[pt_BR]=Navegador Web NetSurf +Name[sk]=Internetový prehliadač NetSurf +Comment=Browse the World Wide Web +Comment[ca]=Navegueu per el web +Comment[cs]=Prohlížení stránek World Wide Webu +Comment[de]=Im Internet surfen +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[sk]=Prehliadanie internetu +GenericName=Web Browser +GenericName[ca]=Navegador web +GenericName[cs]=Webový prohlížeč +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[sk]=Internetový prehliadač +Exec=netsurf-gtk2 %u +Terminal=false +X-MultipleArgs=false +Type=Application +Icon=netsurf2.png +Categories=Network; +MimeType=text/html;text/xml;application/xhtml+xml;application/xml;image/gif;image/jpeg;image/png +StartupWMClass=NetSurf-bin +StartupNotify=true diff --git a/netsurf-gtk2.install b/netsurf-gtk2.install new file mode 100644 index 0000000..70e97da --- /dev/null +++ b/netsurf-gtk2.install @@ -0,0 +1 @@ +usr/bin/netsurf-gtk2 diff --git a/netsurf-gtk2.manpages b/netsurf-gtk2.manpages new file mode 100644 index 0000000..d8a67f3 --- /dev/null +++ b/netsurf-gtk2.manpages @@ -0,0 +1 @@ +debian/netsurf-gtk2.1 diff --git a/netsurf-gtk2.menu b/netsurf-gtk2.menu new file mode 100644 index 0000000..35b70d5 --- /dev/null +++ b/netsurf-gtk2.menu @@ -0,0 +1,3 @@ +?package(netsurf-gtk):needs="X11" section="Applications/Network/Web Browsing"\ + title="Netsurf Web Browser" command="/usr/bin/netsurf-gtk" hints="Web Browsers" \ + icon="/usr/share/pixmaps/netsurf.xpm" diff --git a/netsurf-gtk2.postinst b/netsurf-gtk2.postinst new file mode 100644 index 0000000..71d21f7 --- /dev/null +++ b/netsurf-gtk2.postinst @@ -0,0 +1,8 @@ +#!/bin/sh +set -e + +if [ "$1" = "configure" ]; then + update-alternatives --install /usr/bin/netsurf netsurf-browser /usr/bin/netsurf-gtk2 80 --slave /usr/share/man/man1/netsurf.1.gz netsurf-manual /usr/share/man/man1/netsurf-gtk2.1.gz +fi + +#DEBHELPER# diff --git a/netsurf-gtk2.prerm b/netsurf-gtk2.prerm new file mode 100644 index 0000000..ed25ffa --- /dev/null +++ b/netsurf-gtk2.prerm @@ -0,0 +1,8 @@ +#!/bin/sh +set -e + +if [ "$1" != "upgrade" ]; then + update-alternatives --remove netsurf-browser /usr/bin/netsurf-gtk2 +fi + +#DEBHELPER# diff --git a/netsurf-gtk3.1 b/netsurf-gtk3.1 new file mode 100644 index 0000000..13a0fa5 --- /dev/null +++ b/netsurf-gtk3.1 @@ -0,0 +1,362 @@ +.\" Hey, EMACS: -*- nroff -*- +.\" First parameter, NAME, should be all caps +.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection +.\" other parameters are allowed: see man(7), man(1) +.TH NETSURF 1 "April 19, 2011" +.\" Please adjust this date whenever revising the manpage. +.\" +.\" Some roff macros, for reference: +.\" .nh disable hyphenation +.\" .hy enable hyphenation +.\" .ad l left justify +.\" .ad b justify to both left and right margins +.\" .nf disable filling +.\" .fi enable filling +.\" .br insert line break +.\" .sp <n> insert n+1 empty lines +.\" for manpage-specific macros, see man(7) +.SH NAME +netsurf \- A small fast web browser +.SH SYNOPSIS +.B netsurf +.RI [ options ] +.RI [ url ] +.SH DESCRIPTION +This manual page documents briefly the +.B netsurf +browser. +.PP +.\" TeX users may be more comfortable with the \fB<whatever>\fP and +.\" \fI<whatever>\fP escape sequences to invode bold face and italics, +.\" respectively. +\fBnetsurf\fP is a small fast web browser. This man page only describes how to run the browser. +.SH OPTIONS +This programs follow the usual GNU command line syntax, with long +options starting with two dashes (`-'). +.PP +The command line parameters override any options loaded from the users Choices file. +.PP +A summary of options is included below. +.TP +.B \-v +Enable verbose logging. +.TP +.B \-\-http_proxy +Bboolean indicating if the http proxy is being used. +.TP +.B \-\-http_proxy_host +The http proxy host. +.TP +.B \-\-http_proxy_port +The http proxy port. +.TP +.B \-\-http_proxy_auth +The authentication scheme for the http proxy. +.TP +.B \-\-http_proxy_auth_user +The authentication schemes user. +.TP +.B \-\-http_proxy_auth_pass +The authentication schemes password. +.TP +.B \-\-font_size +The default font size to use. +.TP +.B \-\-font_min_size +The minimum font size to use. +.TP +.B \-\-font_sans +Family name of the sans serrif font. +.TP +.B \-\-font_serif +Family name of the serrif font. +.TP +.B \-\-font_mono +Family name of the monospace font. +.TP +.B \-\-font_cursive +Family name of the cursive font. +.TP +.B \-\-font_fantasy +Family name of the fantasy font. +.TP +.B \-\-accept_language +Languages to accept. +.TP +.B \-\-accept_charset +Character set to accept +.TP +.B \-\-memory_cache_size +Maximum memory cache size. +.TP +.B \-\-disc_cache_age +Maximum disc cache size. +.TP +.B \-\-block_advertisements +Boolean to enable ad blocking. +.TP +.B \-\-minimum_gif_delay +Minimum time between gif frames +.TP +.B \-\-send_referer +Boolean controlling wether referer data should be sent +.TP +.B \-\-animate_images +Boolean controlling wether images should be animated. +.TP +.B \-\-expire_url +expire url +.TP +.B \-\-font_default +Default font. +.TP +.B \-\-ca_bundle +ca bundle +.TP +.B \-\-ca_path +ca path +.TP +.B \-\-cookie_file +cookie file +.TP +.B \-\-cookie_jar +cookie jar +.TP +.B \-\-homepage_url +homepage url +.TP +.B \-\-search_url_bar +search url bar +.TP +.B \-\-search_provider +search provider +.TP +.B \-\-url_suggestion +url suggestion +.TP +.B \-\-window_x +The X co-ordinate of the initial window. +.TP +.B \-\-window_y +The Y co-ordinate of the initial window. +.TP +.B \-\-window_width +The width of the initial window. +.TP +.B \-\-window_height +The height of the initial window. +.TP +.B \-\-window_screen_width +window screen width +.TP +.B \-\-window_screen_height +window screen height +.TP +.B \-\-toolbar_status_size +toolbar status size +.TP +.B \-\-scale +Initial scale factor. +.TP +.B \-\-incremental_reflow +Boolean controlling wether incremental reflow is performed. +.TP +.B \-\-min_reflow_period +Minimum time between incremental reflows +.TP +.B \-\-core_select_menu +core select menu +.TP +.B \-\-max_fetchers +max fetchers +.TP +.B \-\-max_fetchers_per_host +max fetchers per host +.TP +.B \-\-max_cached_fetch_handles +max cached fetch handles +.TP +.B \-\-suppress_curl_debug +suppress curl debug +.TP +.B \-\-target_blank +target blank +.TP +.B \-\-button_2_tab +button 2 tab +.TP +.B \-\-margin_top +margin top +.TP +.B \-\-margin_bottom +margin bottom +.TP +.B \-\-margin_left +margin left +.TP +.B \-\-margin_right +margin right +.TP +.B \-\-export_scale +export scale +.TP +.B \-\-suppress_images +suppress images +.TP +.B \-\-remove_backgrounds +remove backgrounds +.TP +.B \-\-enable_loosening +enable loosening +.TP +.B \-\-enable_PDF_compression +enable PDF compression +.TP +.B \-\-enable_PDF_password +enable_PDF_password +.TP +.B \-\-gui_colour_bg_1 +gui colour bg_1 +.TP +.B \-\-gui_colour_fg_1 +gui colour fg_1 +.TP +.B \-\-gui_colour_fg_2 +gui colour fg_2 +.TP +.B \-\-sys_colour_ActiveBorder +Override CSS sys_colour_ActiveBorder colour. +.TP +.B \-\-sys_colour_ActiveCaption +Override CSS sys_colour_ActiveCaption colour. +.TP +.B \-\-sys_colour_AppWorkspace +Override CSS sys_colour_AppWorkspace colour. +.TP +.B \-\-sys_colour_Background +Override CSS sys_colour_Background colour. +.TP +.B \-\-sys_colour_ButtonFace +Override CSS sys_colour_ButtonFace colour. +.TP +.B \-\-sys_colour_ButtonHighlight +Override CSS sys_colour_ButtonHighlight colour. +.TP +.B \-\-sys_colour_ButtonShadow +Override CSS sys_colour_ButtonShadow colour. +.TP +.B \-\-sys_colour_ButtonText +Override CSS sys_colour_ButtonText colour. +.TP +.B \-\-sys_colour_CaptionText +Override CSS sys_colour_CaptionText colour. +.TP +.B \-\-sys_colour_GrayText +Override CSS sys_colour_GrayText colour. +.TP +.B \-\-sys_colour_Highlight +Override CSS sys_colour_Highlight colour. +.TP +.B \-\-sys_colour_HighlightText +Override CSS sys_colour_HighlightText colour. +.TP +.B \-\-sys_colour_InactiveBorder +Override CSS sys_colour_InactiveBorder colour. +.TP +.B \-\-sys_colour_InactiveCaption +Override CSS sys_colour_InactiveCaption colour. +.TP +.B \-\-sys_colour_InactiveCaptionText +Override CSS sys_colour_InactiveCaptionText colour. +.TP +.B \-\-sys_colour_InfoBackground +Override CSS sys_colour_InfoBackground colour. +.TP +.B \-\-sys_colour_InfoText +Override CSS sys_colour_InfoText colour. +.TP +.B \-\-sys_colour_Menu +Override CSS sys_colour_Menu colour. +.TP +.B \-\-sys_colour_MenuText +Override CSS sys_colour_MenuText colour. +.TP +.B \-\-sys_colour_Scrollbar +Override CSS sys_colour_Scrollbar colour. +.TP +.B \-\-sys_colour_ThreeDDarkShadow +Override CSS sys_colour_ThreeDDarkShadow colour. +.TP +.B \-\-sys_colour_ThreeDFace +Override CSS sys_colour_ThreeDFace colour. +.TP +.B \-\-sys_colour_ThreeDHighlight +Override CSS sys_colour_ThreeDHighlight colour. +.TP +.B \-\-sys_colour_ThreeDLightShadow +Override CSS sys_colour_ThreeDLightShadow colour. +.TP +.B \-\-sys_colour_ThreeDShadow +Override CSS sys_colour_ThreeDShadow colour. +.TP +.B \-\-sys_colour_Window +Override CSS sys_colour_Window colour. +.TP +.B \-\-sys_colour_WindowFrame +Override CSS sys_colour_WindowFrame colour. +.TP +.B \-\-sys_colour_WindowText +Override CSS sys_colour_WindowText colour. +.TP +.B \-\-render_resample +render resample +.TP +.B \-\-downloads_clear +downloads clear +.TP +.B \-\-request_overwrite +request overwrite +.TP +.B \-\-downloads_directory +downloads directory +.TP +.B \-\-url_file +url file +.TP +.B \-\-show_single_tab +Force tabs to always be show. +.TP +.B \-\-button_type +button type +.TP +.B \-\-disable_popups +disable popups +.TP +.B \-\-disable_plugins +disable plugins +.TP +.B \-\-history_age +history age +.TP +.B \-\-hover_urls +hover urls +.TP +.B \-\-focus_new +focus new +.TP +.B \-\-new_blank +new blank +.TP +.B \-\-hotlist_path +hotlist path +.TP +.B \-\-source_tab +source tab +.TP +.B \-\-current_theme +current theme +.SH AUTHOR +netsurf was written by <upstream author>. +.PP +This manual page was written by Vincent Sanders <vince@debian.org>, +for the Debian project (and may be used by others). @@ -12,21 +12,29 @@ export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed dh $@ override_dh_auto_build: - dh_auto_build -- V=1 PREFIX=/usr TARGET=gtk + dh_auto_build -- V=1 PREFIX=/usr TARGET=gtk2 + dh_auto_build -- V=1 PREFIX=/usr TARGET=gtk3 dh_auto_build -- V=1 PREFIX=/usr TARGET=framebuffer override_dh_auto_install: - dh_auto_install -- PREFIX=/usr TARGET=gtk + dh_auto_install -- PREFIX=/usr TARGET=gtk3 mkdir -p debian/netsurf-gtk/usr/share/pixmaps mkdir -p debian/netsurf-gtk/usr/share/applications - convert netsurf/frontends/gtk/res/netsurf.xpm -resize \!32x\!32 debian/netsurf-gtk/usr/share/pixmaps/netsurf.xpm - convert netsurf/frontends/gtk/res/netsurf.xpm +set date:create +set date:modify -define png:exclude-chunk=time debian/netsurf-gtk/usr/share/pixmaps/netsurf.png + convert netsurf/frontends/gtk/res/netsurf.xpm -resize \!32x\!32 debian/netsurf-gtk/usr/share/pixmaps/netsurf3.xpm + convert netsurf/frontends/gtk/res/netsurf.xpm +set date:create +set date:modify -define png:exclude-chunk=time debian/netsurf-gtk/usr/share/pixmaps/netsurf3.png install -m 644 debian/netsurf-gtk.desktop debian/netsurf-gtk/usr/share/applications + dh_auto_install -- PREFIX=/usr TARGET=gtk2 + mkdir -p debian/netsurf-gtk2/usr/share/pixmaps + mkdir -p debian/netsurf-gtk2/usr/share/applications + convert netsurf/frontends/gtk/res/netsurf.xpm -resize \!32x\!32 debian/netsurf-gtk2/usr/share/pixmaps/netsurf2.xpm + convert netsurf/frontends/gtk/res/netsurf.xpm +set date:create +set date:modify -define png:exclude-chunk=time debian/netsurf-gtk2/usr/share/pixmaps/netsurf2.png + install -m 644 debian/netsurf-gtk2.desktop debian/netsurf-gtk2/usr/share/applications dh_auto_install -- PREFIX=/usr TARGET=framebuffer rm debian/tmp/usr/share/netsurf/ca-bundle.txt ln -s /etc/ssl/certs/ca-certificates.crt debian/tmp/usr/share/netsurf/ca-bundle.txt override_dh_auto_clean: - dh_auto_clean -- PREFIX=/usr TARGET=gtk + dh_auto_clean -- PREFIX=/usr TARGET=gtk2 + dh_auto_clean -- PREFIX=/usr TARGET=gtk3 dh_auto_clean -- PREFIX=/usr TARGET=framebuffer |