--- conkeror-0.9.3+git101015.orig/debian/README.source +++ conkeror-0.9.3+git101015/debian/README.source @@ -0,0 +1,31 @@ +Packaging Conkeror for Debian +----------------------------- + +Since end of 2008, the Conkeror Debian packaging code is hosted in the +upstream git repository at http://repo.or.cz/w/conkeror.git. + +Generating the Debian source package from a git working copy is done +by the script in contrib/debian/update.sh. It + +* pulls all changes from the git repository at + http://repo.or.cz/w/conkeror.git, +* renames the directory of the working copy according to the current + date and +* generates a source package which then includes everything except the + .git directories and the debian directories. + +Packages built that way and released into the public (either as +official debian package or via some personal but public repository) +should be tagged in the git repository appropriately: + + * Official Debian packages should be tagged "debian-$debian_package_version" + * Other package should be tagged "$person-$package_version" + * Tilde ("~") is not a valid character in Git tag names, so it + should be replaced by two dashes ("--") in tag names. + * Automatically built daily snapshots shouldn't be tagged in the + repository as they include enough information to determine what + state they're based upon. + +That way we can always easily identify which state has been packaged. + + -- Axel Beckert Sun, 01 Feb 2009 21:01:15 +0100 --- conkeror-0.9.3+git101015.orig/debian/conkeror.desktop +++ conkeror-0.9.3+git101015/debian/conkeror.desktop @@ -0,0 +1,77 @@ +[Desktop Entry] +Name=Conkeror Web Browser +Name[bg]=Интернет браузър (Conkeror) +Name[ca]=Navegador web Conkeror +Name[cs]=Conkeror Webový prohlížeč +Name[el]=Περιηγήτης Ιστού Conkeror +Name[es]=Navegador web Conkeror +Name[fa]=مرورگر اینترنتی Conkeror +Name[fi]=Conkeror-webselain +Name[fr]=Navigateur Web Conkeror +Name[hu]=Conkeror webböngésző +Name[it]=Conkeror Browser Web +Name[ja]=Conkeror ウェブ・ブラウザ +Name[ko]=Conkeror 웹 브라우저 +Name[nb]=Conkeror Nettleser +Name[nl]=Conkeror webbrowser +Name[nn]=Conkeror Nettlesar +Name[no]=Conkeror Nettleser +Name[pl]=Przeglądarka WWW Conkeror +Name[pt]=Conkeror Navegador Web +Name[pt_BR]=Navegador Web Conkeror +Name[sk]=Internetový prehliadač Conkeror +Name[sv]=Webbläsaren Conkeror +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[sk]=Prehliadanie internetu +Comment[sv]=Surfa på webben +GenericName=Web Browser +GenericName[bg]=Интернет браузър +GenericName[ca]=Navegador web +GenericName[cs]=Webový prohlížeč +GenericName[el]=Περιηγητής ιστού +GenericName[es]=Navegador web +GenericName[fa]=مرورگر اینترنتی +GenericName[fi]=Webselain +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č +GenericName[sv]=Webbläsare +Exec=conkeror %u +Terminal=false +X-MultipleArgs=false +Type=Application +Icon=browser +Categories=Network;WebBrowser; +MimeType=text/html;text/xml;application/xhtml+xml;application/xml;image/gif;image/jpeg;image/png; +StartupWMClass=Conkeror +StartupNotify=true --- conkeror-0.9.3+git101015.orig/debian/conkeror-spawn-process-helper.dirs +++ conkeror-0.9.3+git101015/debian/conkeror-spawn-process-helper.dirs @@ -0,0 +1,2 @@ +usr/share/conkeror +usr/lib/conkeror --- conkeror-0.9.3+git101015.orig/debian/conkeror.manpages +++ conkeror-0.9.3+git101015/debian/conkeror.manpages @@ -0,0 +1 @@ +contrib/man/conkeror.1 --- conkeror-0.9.3+git101015.orig/debian/rules +++ conkeror-0.9.3+git101015/debian/rules @@ -0,0 +1,122 @@ +#!/usr/bin/make -f +# -*- makefile -*- +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +# This has to be exported to make some magic below work. +export DH_OPTIONS + +# Generating a xulrunner build id and other strings +DEBIAN_VERSION := $(shell echo -n `head -1 debian/changelog | sed -e 's/^.*(\(.*\)).*$$/\\1/'`) + +BUILDID := $(shell echo -n `whoami`@`hostname`)_$(shell date +%s) + +include /usr/share/quilt/quilt.make + +configure: configure-stamp +configure-stamp: $(QUILT_STAMPFN) + dh_testdir + # Add here commands to configure the package. + + touch configure-stamp + +# Architecture +build: build-arch build-indep + +build-arch: build-arch-stamp +build-arch-stamp: configure-stamp + # Add here commands to compile the arch part of the package. + make + + touch $@ + +build-indep: build-indep-stamp +build-indep-stamp: configure-stamp + # Add here commands to compile the indep part of the package. + #$(MAKE) doc + + touch $@ + +clean: unpatch + dh_testdir + dh_testroot + rm -f build-arch-stamp build-indep-stamp configure-stamp + + # Add here commands to clean up after the build process. + $(MAKE) clean + + dh_clean + +install: install-indep install-arch +install-indep: + dh_testdir + dh_testroot + dh_prep -i + dh_installdirs -i + + # Add here commands to install the indep part of the package into + # debian/ + cp -pr branding chrome chrome.manifest components content defaults \ + locale modules search-engines help style \ + $(CURDIR)/debian/conkeror/usr/share/conkeror/ + mkdir -p $(CURDIR)/debian/conkeror/usr/share/conkeror/contrib/ + cp -pr contrib/xrev contrib/art contrib/modules \ + $(CURDIR)/debian/conkeror/usr/share/conkeror/contrib/ + # Add generated Build ID and Debian version to version output + sed -e 's/BuildID=git/BuildID=${BUILDID}/;s/^Version=\(.*\)$$/Version=\1 (Debian-${DEBIAN_VERSION})/' application.ini \ + > $(CURDIR)/debian/conkeror/usr/share/conkeror/application.ini + # Use Debian version for M-x version output + sed -e 's/Version=\(.*\)/Version=\1 (Debian-${DEBIAN_VERSION})/' components/application.js \ + > $(CURDIR)/debian/conkeror/usr/share/conkeror/components/application.js + cp -p debian/conkeror.bin $(CURDIR)/debian/conkeror/usr/bin/conkeror + cp -p debian/conkeror.desktop $(CURDIR)/debian/conkeror/usr/share/applications/ + + dh_install -i + +install-arch: + dh_testdir + dh_testroot + dh_prep -s + dh_installdirs -s + + # Add here commands to install the arch part of the package into + # debian/tmp. + cp -p conkeror-spawn-helper $(CURDIR)/debian/conkeror-spawn-process-helper/usr/lib/conkeror/ + ln -s /usr/lib/conkeror/conkeror-spawn-helper $(CURDIR)/debian/conkeror-spawn-process-helper/usr/share/conkeror/ + + dh_install -s + +# Must not depend on anything. This is to be called by +# binary-arch/binary-indep in another 'make' thread. +binary-common: + dh_testdir + dh_testroot + dh_installchangelogs + dh_installdocs +# dh_installexamples + dh_installmenu +# dh_installemacsen + dh_installman + dh_bugfiles + dh_lintian + dh_link + dh_strip + dh_compress + dh_fixperms + dh_makeshlibs + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +# Build architecture independant packages using the common target. +binary-indep: build-indep install-indep + $(MAKE) -f debian/rules DH_OPTIONS=-i binary-common + +# Build architecture dependant packages using the common target. +binary-arch: build-arch install-arch + $(MAKE) -f debian/rules DH_OPTIONS=-s binary-common + +binary: binary-arch binary-indep +.PHONY: build clean binary-indep binary-arch binary install install-indep install-arch configure --- conkeror-0.9.3+git101015.orig/debian/conkeror.menu +++ conkeror-0.9.3+git101015/debian/conkeror.menu @@ -0,0 +1,3 @@ +?package(conkeror):needs="X11" section="Applications/Network/Web Browsing"\ + longtitle="Conkeror, a keyboard-focused web browser modelled after Emacs and Lynx"\ + title="Conkeror" command="/usr/bin/conkeror" --- conkeror-0.9.3+git101015.orig/debian/conkeror.dirs +++ conkeror-0.9.3+git101015/debian/conkeror.dirs @@ -0,0 +1,4 @@ +usr/bin +usr/share/conkeror +usr/share/applications +usr/share/man/man1 --- conkeror-0.9.3+git101015.orig/debian/copyright +++ conkeror-0.9.3+git101015/debian/copyright @@ -0,0 +1,40 @@ +This package was debianized by Axel Beckert on +Sat, 19 Apr 2008 03:39:31 +0200. + +It was downloaded from its GIT repository at +http://repo.or.cz/w/conkeror.git + +Upstream Authors: + + Jeremy Maitin-Shepard + John Foerch + Shawn Betts + + See the CREDITS file for more details on contributors. + +Copyright: + + Copyright (C) 2004-2009 Shawn Betts + Copyright (C) 2006-2008 Martin Stubenschrott + Copyright (C) 2006 Sylvain Pasche + Copyright (C) 2007-2009 John J. Foerch + Copyright (C) 2007-2009 Jeremy Maitin-Shepard + Copyright (C) 2007 Doug Kearns + Copyright (C) 2008 Ævar Arnfjörð Bjarmason + Copyright (C) 2008 David Glasser + Copyright (C) 2008 Eli Naeher + Copyright (C) 2008 Martin Dybdal + Copyright (C) 2008 Nelson Elhage + Copyright (C) 2008 Will Farrington + Copyright (C) 2008 David Kettler + +License: + + Conkeror is triple-licensed under MPL 1.1 (see file MPL in the + same directory), GPL 2 (see `/usr/share/common-licenses/GPL-2') or + LGPL 2.1 (see `/usr/share/common-licenses/LGPL-2.1') at your + option. + +The Debian packaging is Copyright 2008-2009 by Axel Beckert + and is licensed under the same terms as Conkeror +itself. --- conkeror-0.9.3+git101015.orig/debian/changelog +++ conkeror-0.9.3+git101015/debian/changelog @@ -0,0 +1,323 @@ +conkeror (0.9.3+git101015-1ubuntu2) natty; urgency=low + + * Update binary dependency to xulrunner-2.0 + - update debian/control + * Install top-level chrome.manifest to work properly with xulrunner 2.0 + - update debian/rules + * Update launcher script to use xulrunner-2.0 + - update debian/conkeror.bin + + -- Chris Coulson Mon, 29 Nov 2010 01:27:41 +0000 + +conkeror (0.9.3+git101015-1ubuntu1) natty; urgency=low + + * Merge from debian experimental. Remaining changes: + - debian/control: Change Depends to xulrunner-1.9.2 only + + -- Micah Gersten Thu, 28 Oct 2010 00:12:35 -0400 + +conkeror (0.9.3+git101015-1) experimental; urgency=low + + * New upstream snapshot + * Also ship contrib/modules with the binary package to allow usage of + the mode line buttons module. + + -- Axel Beckert Fri, 15 Oct 2010 00:27:47 +0200 + +conkeror (0.9.3-1) experimental; urgency=low + + * New upstream milestone + - Supports XULRunner 2 + - New minibuffer handling, no more input-modes + - Offers a Twitter page mode + * Fix (.deb package specific) ubuntubugs webjump + * debian/patches/deb-webumps.diff no more modifies + defaults/preferences/default-modules.js but creates a new file named + defaults/preferences/debian-default-modules.js instead. This should + make the patch much more robust against changes in upstream's default + modules list. Thanks to John J. Foerch for the suggestion. + + -- Axel Beckert Wed, 06 Oct 2010 20:59:43 +0200 + +conkeror (0.9.2+git100804-1ubuntu1) maverick; urgency=low + + * Merge from debian unstable. Remaining changes (LP: #614784): + - debian/control: Change Depends to xulrunner-1.9.2 only + + -- Artur Rona Sat, 07 Aug 2010 18:54:40 +0200 + +conkeror (0.9.2+git100804-1) unstable; urgency=low + + * New upstream snapshot + * Bump Standards-Version to 3.9.1 + - Use "Breaks" instead of "Conflicts". + + -- Axel Beckert Wed, 04 Aug 2010 23:04:35 +0200 + +conkeror (0.9.2+git100420-2ubuntu1) maverick; urgency=low + + * Merge from debian unstable. Remaining changes (LP: #602513): + - debian/control: Change Depends to xulrunner-1.9.2 only + - Drop patches included upstream: + - debian/patches/0001-buffer-set_input_mode-on-blur-event.patch + - debian/patches/0002-fix-issue1-issue38-issue243-issue259.patch + - debian/patches/0003-fix-issue215.patch + - debian/patches/0004-hint_manager.generate_hints-don-t-assume-area-elemen.patch + - debian/patches/0005-fix-focus-problem-http-bugs.conkeror.org-issue263.patch + - debian/patches/0006-fix-focus-problem-http-bugs.conkeror.org-issue263-tr.patch + + -- Micah Gersten Tue, 06 Jul 2010 21:19:31 -0500 + +conkeror (0.9.2+git100420-2) unstable; urgency=low + + * The "forgotten details" upload + * Add appropriate NEWS entry with breaking changes for last upload. + * Renamed NEWS.Debian in the source package so that it will be + automatically installed as NEWS.Debian. + * Add "mentions Conkeror in the user agent string" to last changelog entry. + + -- Axel Beckert Tue, 20 Apr 2010 23:34:00 +0200 + +conkeror (0.9.2+git100420-1) unstable; urgency=low + + * New upstream snapshot + - many xulrunner 1.9.2 compatibility fixes + - minibuffer overhaul + - mentions "Conkeror" in the user agent string + + -- Axel Beckert Tue, 20 Apr 2010 17:42:01 +0200 + +conkeror (0.9.2+git100324-2) unstable; urgency=low + + * Further adaptions of the debian webjumps to the new module system as + suggested by John J. Foerch. Includes renaming the webjumps' file from + modules/debian/webjumps.js to modules/debian/debian-webjumps.js. + + -- Axel Beckert Wed, 24 Mar 2010 23:45:50 +0100 + +conkeror (0.9.2+git100324-1) unstable; urgency=low + + * New upstream snapshot + - some minor bug fixes + * Refresh quilt patches (should have been done already for the last + upload) + * Adapt debian webjumps module to new module system (fixes lost default + webjumps in the previous upload). Thanks to gzeus for noticing! + * Add debian/source/format to silence lintian. + + -- Axel Beckert Wed, 24 Mar 2010 01:27:57 +0100 + +conkeror (0.9.2-1) unstable; urgency=low + + * New upstream release + - Contains a new module system providing the capability for modules to + have their own namespace. + + -- Axel Beckert Mon, 22 Mar 2010 19:11:32 +0100 + +conkeror (0.9.1+git100317-1) unstable; urgency=low + + * New upstream snapshot + - venkman support + - noscript support overhaul, now enabled by default + - fixes building conkeror-spawn-process-helper with clang compiler + - several new page modes + - many cosmetic changes and minor bugfixes + - outdated emacswiki webjump removed + * [debian/rules] Also install contrib/art + + -- Axel Beckert Wed, 17 Mar 2010 01:49:54 +0100 + +conkeror (0.9.1+git100220-1ubuntu3) lucid; urgency=low + + * Fix focus issues related to xulrunner-1.9.2 (LP: #568610) + - add debian/patches0005-fix-focus-problem-http-bugs.conkeror.org-issue263.patch + - add debian/patches0006-fix-focus-problem-http-bugs.conkeror.org-issue263-tr.patch + + -- Micah Gersten Thu, 22 Apr 2010 11:36:19 -0500 + +conkeror (0.9.1+git100220-1ubuntu2) lucid; urgency=low + + * Backport fixes from upstream git related to xulrunner-1.9.2 (LP: #561708) + - add debian/patches/0001-buffer-set_input_mode-on-blur-event.patch + - add debian/patches/0002-fix-issue1-issue38-issue243-issue259.patch + - add debian/patches/0003-fix-issue215.patch + - add debian/patches/0004-hint_manager.generate_hints-don-t-assume-area-elemen.patch + + -- Micah Gersten Mon, 12 Apr 2010 12:07:52 -0500 + +conkeror (0.9.1+git100220-1ubuntu1) lucid; urgency=low + + * Merge from debian testing. Remaining changes: + - debian/control: Change Depends to xulrunner-1.9.2 only (LP #537900) + + -- Micah Gersten Fri, 26 Mar 2010 18:55:20 -0500 + +conkeror (0.9.1+git100220-1) unstable; urgency=low + + * New upstream snapshot + - Honors cmdline.preventDefault as used since xulrunner 1.9.1.6-2 + * Add support for the reportbug-helper-script of Debian's xulrunner + - Raise build-deps to debhelper >= 7.2.3~ due to dh_bugfiles + * Add alternative dependency on upcoming experimental xulrunner-1.9.2. + * Reorder xulrunner dependencies to have the current and preferred + versions first instead of sorting by package name. (Fixes piuparts + warning "dependency-does-not-exist".) + * Add a lintian override for the non-standard Xb-Xul-AppId header + * Removed Luca from the uploaders list (on his request) + + -- Axel Beckert Sat, 20 Feb 2010 01:07:48 +0100 + +conkeror (0.9.1+git100131-1) unstable; urgency=low + + * New upstream snapshot + * Make package working on Ubuntu again by reverting debian/conkeror.bin + to not using xulrunner-stub symbolic links anymore since Ubuntu doesn't + support this feature. Meh. + * Fix new Lintian 2.3.x warnings: + - debhelper-but-no-misc-depends + - obsolete-relation-form-in-source + * Add new Debian related webjumps: + - debpopcon + - buildd + - buildd-ports + - debqa + * Add Xb-Xul-AppId header to conkeror binary package for use with + mozilla-devscripts. (Closes: #562986) + * Bumped Standards-Version to 3.8.4 (no changes) + * Changed my e-mail address to my debian.org address + + -- Axel Beckert Sun, 31 Jan 2010 17:52:43 +0100 + +conkeror (0.9.1-1) unstable; urgency=low + + * New upstream version + + Closes: #542252 (YouTube download broken) + * Added alternative dependency on xulrunner-1.9.1 + * Moved from directly calling "xulrunner application.ini" to calling a + symlinked xulrunner-stub (symlinking xulrunner-stub only works with + Debian's xulrunner-stub, thanks Mike Hommey :-), so that xulrunner can + decide which version of xulrunner is actually used. + * Refreshed debian/patches/sensible-editor.diff after upstream + whitespace changes. + * Changed debian/rules to not use the old $CONKEROR_VERSION$ macro + anymore. + * Do not include the whole contrib subdirectory in the binary + package. (Closes: #547896) Only include the xrev debugging tool for + now. + * A few Debian and Ubuntu webjumps have been added and enabled by + default. (Closes: #547908) + * Bumped Standards-Version to 3.8.3 (no changes) + + -- Axel Beckert Thu, 24 Sep 2009 02:35:02 +0200 + +conkeror (0.9~git090624-1) unstable; urgency=low + + * Based on new snapshot (tagged with debian-0.9--git090624-1) + - Session saving support has been added, but not loaded by default + - Theming support has been removed (native GUI theming should be used + instead, e.g. GTK theming) + * Bumped Standards-Version to 3.8.2 (no changes) + * Replaced deprecated dh_clean -k by dh_prep and bumped debhelper + compatibility to 7. + * Removed deprecated dh_desktop. May cause not immediately registered + .desktop files on Debian Lenny. + * Moved MPL from debian/copyright to debian/MPL to allow compression in + the installed binary packages (as with the xulrunner-1.9 packages) + + -- Axel Beckert Thu, 25 Jun 2009 01:02:45 +0200 + +conkeror (0.9~git090223-1ubuntu2) lucid; urgency=low + + * Bump xulrunner depends for conkeror to xulrunner-1.9.2 + - update debian/control + + -- Micah Gersten Wed, 17 Feb 2010 01:08:46 -0600 + +conkeror (0.9~git090223-1ubuntu1) karmic; urgency=low + + * fix Depends to pull in the right xulrunner (LP: #455517) + + -- Alexander Sack Fri, 23 Oct 2009 14:32:05 +0200 + +conkeror (0.9~git090223-1) unstable; urgency=low + + * Debian packaging is now hosted in the upstream repository at + http://repo.or.cz/w/conkeror.git: + - Adjusted the Vcs-* headers in debian/control. + - Changed the build id to contain username and hostname instead of + commit id. + * Based on new snapshot (tagged with debian-0.9--git090223-1) + - spawn-process-helper has been renamed upstream to + conkeror-spawn-helper -- package names remain unchanged, conflict to + earlier versions of conkeror-spawn-process-helper + - Links on mouse over images now shown + - command switch -uu for universal-arg of following -f command + * Added NEWS.Debian to list changes relevant for users. + * Added README.source which documents how to build a Debian (source) + package from a Git working copy. + * Changed licencing of packaging from GPLv2 to the same licencing terms + as Conkeror itself. + * Updated debian/copyright to reflect current state of the project + * man page conkeror.1 now part of upstream. + * Added a call to dh_desktop (Thanks, Lintian 2.x!) + * Added a description to patches/sensible-editor.diff (Thanks, Lintian 2.x!) + * Replaced lintian overrides by an empty watch file with comment. + + -- Axel Beckert Mon, 23 Feb 2009 19:19:19 +0100 + +conkeror (0.9~git080629-2) unstable; urgency=low + + * Don't suppress conkeror's output if we don't have to change it in the + wrapper [conkeror.bin]. (Closes: #498515) + + -- Axel Beckert Thu, 25 Sep 2008 01:40:07 +0200 + +conkeror (0.9~git080629-1) unstable; urgency=low + + * Based on new snapshot (commit + 6944096a1af033d0aa70d8b4cc19b271e0d832b1) + * Uses now quilt for patch management, added appropriate build-deps. + * Use sensible-editor instead of emacs by default. + * Changed default desktop icon from "web-browser.png" to + "browser". (Closes: #491880; fixes a desktop-file-validate warning) + * Made M-x conkeror-version show the Debian version instead of + '$CONKEROR_VERSION$'. + * Remove suggestion of zile since conkeror currently can't handle + text-mode only editors. Suggest the virtual package emacsen instead. + * Depends now on "xulrunner (>= 1.9~) | xulrunner-1.9" instead of solely + "xulrunner-1.9". + * Added a lintian override for debian-watch-file-is-missing since there + are no upstream releases to watch (yet). + + -- Axel Beckert Thu, 24 Jul 2008 00:49:28 +0200 + +conkeror (0.9~git080522-2) unstable; urgency=low + + * Initial release for Debian (Closes: #394566) + * Cleaned up and removed files and directories not in the upstream git + repository. + * Unified file names in the debian directory. + * Bumped standards version to 3.8.0. + * Removed -height and -width options from man page and --help since them + being documented but not working is an open bug in Mozilla since 2000. + (See #267344 and https://bugzilla.mozilla.org/show_bug.cgi?id=50201) + * Added some more details to the man page. + * Added a CREDITS.Debian file. + * Added an automatically generated build id to application.ini. (See + http://developer.mozilla.org/en/docs/application.ini#The_.5BApp.5D_section) + * Added the Debian version to the version string in application.ini. + * Added a desktop file for conkeror. + * Made several several cosmetic changes to docs, etc. + * Added Luca Capello as co-maintainer. + * conkeror-spawn-process-helper now suggests conkeror. + + -- Axel Beckert Thu, 26 Jun 2008 01:31:32 +0200 + +conkeror (0.9~git080522-1) unstable; urgency=low + + * Initial release for beta testers + * Based on commit fead87b7fa1156e750dcb01f903e6b8a35e43a37 + + -- Axel Beckert Sun, 08 Jun 2008 23:08:34 +0200 + --- conkeror-0.9.3+git101015.orig/debian/conkeror.prerm +++ conkeror-0.9.3+git101015/debian/conkeror.prerm @@ -0,0 +1,10 @@ +#!/bin/sh +set -e + +if [ "$1" = "remove" -o "$1" = "deconfigure" ] ; then + update-alternatives --remove x-www-browser /usr/bin/conkeror +fi + +#DEBHELPER# + +exit 0 --- conkeror-0.9.3+git101015.orig/debian/MPL +++ conkeror-0.9.3+git101015/debian/MPL @@ -0,0 +1,567 @@ + MOZILLA PUBLIC LICENSE + Version 1.1 + + --------------- + +1. Definitions. + + 1.0.1. "Commercial Use" means distribution or otherwise making the + Covered Code available to a third party. + + 1.1. "Contributor" means each entity that creates or contributes to + the creation of Modifications. + + 1.2. "Contributor Version" means the combination of the Original + Code, prior Modifications used by a Contributor, and the Modifications + made by that particular Contributor. + + 1.3. "Covered Code" means the Original Code or Modifications or the + combination of the Original Code and Modifications, in each case + including portions thereof. + + 1.4. "Electronic Distribution Mechanism" means a mechanism generally + accepted in the software development community for the electronic + transfer of data. + + 1.5. "Executable" means Covered Code in any form other than Source + Code. + + 1.6. "Initial Developer" means the individual or entity identified + as the Initial Developer in the Source Code notice required by Exhibit + A. + + 1.7. "Larger Work" means a work which combines Covered Code or + portions thereof with code not governed by the terms of this License. + + 1.8. "License" means this document. + + 1.8.1. "Licensable" means having the right to grant, to the maximum + extent possible, whether at the time of the initial grant or + subsequently acquired, any and all of the rights conveyed herein. + + 1.9. "Modifications" means any addition to or deletion from the + substance or structure of either the Original Code or any previous + Modifications. When Covered Code is released as a series of files, a + Modification is: + A. Any addition to or deletion from the contents of a file + containing Original Code or previous Modifications. + + B. Any new file that contains any part of the Original Code or + previous Modifications. + + 1.10. "Original Code" means Source Code of computer software code + which is described in the Source Code notice required by Exhibit A as + Original Code, and which, at the time of its release under this + License is not already Covered Code governed by this License. + + 1.10.1. "Patent Claims" means any patent claim(s), now owned or + hereafter acquired, including without limitation, method, process, + and apparatus claims, in any patent Licensable by grantor. + + 1.11. "Source Code" means the preferred form of the Covered Code for + making modifications to it, including all modules it contains, plus + any associated interface definition files, scripts used to control + compilation and installation of an Executable, or source code + differential comparisons against either the Original Code or another + well known, available Covered Code of the Contributor's choice. The + Source Code can be in a compressed or archival form, provided the + appropriate decompression or de-archiving software is widely available + for no charge. + + 1.12. "You" (or "Your") means an individual or a legal entity + exercising rights under, and complying with all of the terms of, this + License or a future version of this License issued under Section 6.1. + For legal entities, "You" includes any entity which controls, is + controlled by, or is under common control with You. For purposes of + this definition, "control" means (a) the power, direct or indirect, + to cause the direction or management of such entity, whether by + contract or otherwise, or (b) ownership of more than fifty percent + (50%) of the outstanding shares or beneficial ownership of such + entity. + +2. Source Code License. + + 2.1. The Initial Developer Grant. + The Initial Developer hereby grants You a world-wide, royalty-free, + non-exclusive license, subject to third party intellectual property + claims: + (a) under intellectual property rights (other than patent or + trademark) Licensable by Initial Developer to use, reproduce, + modify, display, perform, sublicense and distribute the Original + Code (or portions thereof) with or without Modifications, and/or + as part of a Larger Work; and + + (b) under Patents Claims infringed by the making, using or + selling of Original Code, to make, have made, use, practice, + sell, and offer for sale, and/or otherwise dispose of the + Original Code (or portions thereof). + + (c) the licenses granted in this Section 2.1(a) and (b) are + effective on the date Initial Developer first distributes + Original Code under the terms of this License. + + (d) Notwithstanding Section 2.1(b) above, no patent license is + granted: 1) for code that You delete from the Original Code; 2) + separate from the Original Code; or 3) for infringements caused + by: i) the modification of the Original Code or ii) the + combination of the Original Code with other software or devices. + + 2.2. Contributor Grant. + Subject to third party intellectual property claims, each Contributor + hereby grants You a world-wide, royalty-free, non-exclusive license + + (a) under intellectual property rights (other than patent or + trademark) Licensable by Contributor, to use, reproduce, modify, + display, perform, sublicense and distribute the Modifications + created by such Contributor (or portions thereof) either on an + unmodified basis, with other Modifications, as Covered Code + and/or as part of a Larger Work; and + + (b) under Patent Claims infringed by the making, using, or + selling of Modifications made by that Contributor either alone + and/or in combination with its Contributor Version (or portions + of such combination), to make, use, sell, offer for sale, have + made, and/or otherwise dispose of: 1) Modifications made by that + Contributor (or portions thereof); and 2) the combination of + Modifications made by that Contributor with its Contributor + Version (or portions of such combination). + + (c) the licenses granted in Sections 2.2(a) and 2.2(b) are + effective on the date Contributor first makes Commercial Use of + the Covered Code. + + (d) Notwithstanding Section 2.2(b) above, no patent license is + granted: 1) for any code that Contributor has deleted from the + Contributor Version; 2) separate from the Contributor Version; + 3) for infringements caused by: i) third party modifications of + Contributor Version or ii) the combination of Modifications made + by that Contributor with other software (except as part of the + Contributor Version) or other devices; or 4) under Patent Claims + infringed by Covered Code in the absence of Modifications made by + that Contributor. + +3. Distribution Obligations. + + 3.1. Application of License. + The Modifications which You create or to which You contribute are + governed by the terms of this License, including without limitation + Section 2.2. The Source Code version of Covered Code may be + distributed only under the terms of this License or a future version + of this License released under Section 6.1, and You must include a + copy of this License with every copy of the Source Code You + distribute. You may not offer or impose any terms on any Source Code + version that alters or restricts the applicable version of this + License or the recipients' rights hereunder. However, You may include + an additional document offering the additional rights described in + Section 3.5. + + 3.2. Availability of Source Code. + Any Modification which You create or to which You contribute must be + made available in Source Code form under the terms of this License + either on the same media as an Executable version or via an accepted + Electronic Distribution Mechanism to anyone to whom you made an + Executable version available; and if made available via Electronic + Distribution Mechanism, must remain available for at least twelve (12) + months after the date it initially became available, or at least six + (6) months after a subsequent version of that particular Modification + has been made available to such recipients. You are responsible for + ensuring that the Source Code version remains available even if the + Electronic Distribution Mechanism is maintained by a third party. + + 3.3. Description of Modifications. + You must cause all Covered Code to which You contribute to contain a + file documenting the changes You made to create that Covered Code and + the date of any change. You must include a prominent statement that + the Modification is derived, directly or indirectly, from Original + Code provided by the Initial Developer and including the name of the + Initial Developer in (a) the Source Code, and (b) in any notice in an + Executable version or related documentation in which You describe the + origin or ownership of the Covered Code. + + 3.4. Intellectual Property Matters + (a) Third Party Claims. + If Contributor has knowledge that a license under a third party's + intellectual property rights is required to exercise the rights + granted by such Contributor under Sections 2.1 or 2.2, + Contributor must include a text file with the Source Code + distribution titled "LEGAL" which describes the claim and the + party making the claim in sufficient detail that a recipient will + know whom to contact. If Contributor obtains such knowledge after + the Modification is made available as described in Section 3.2, + Contributor shall promptly modify the LEGAL file in all copies + Contributor makes available thereafter and shall take other steps + (such as notifying appropriate mailing lists or newsgroups) + reasonably calculated to inform those who received the Covered + Code that new knowledge has been obtained. + + (b) Contributor APIs. + If Contributor's Modifications include an application programming + interface and Contributor has knowledge of patent licenses which + are reasonably necessary to implement that API, Contributor must + also include this information in the LEGAL file. + + (c) Representations. + Contributor represents that, except as disclosed pursuant to + Section 3.4(a) above, Contributor believes that Contributor's + Modifications are Contributor's original creation(s) and/or + Contributor has sufficient rights to grant the rights conveyed by + this License. + + 3.5. Required Notices. + You must duplicate the notice in Exhibit A in each file of the Source + Code. If it is not possible to put such notice in a particular Source + Code file due to its structure, then You must include such notice in a + location (such as a relevant directory) where a user would be likely + to look for such a notice. If You created one or more Modification(s) + You may add your name as a Contributor to the notice described in + Exhibit A. You must also duplicate this License in any documentation + for the Source Code where You describe recipients' rights or ownership + rights relating to Covered Code. You may choose to offer, and to + charge a fee for, warranty, support, indemnity or liability + obligations to one or more recipients of Covered Code. However, You + may do so only on Your own behalf, and not on behalf of the Initial + Developer or any Contributor. You must make it absolutely clear than + any such warranty, support, indemnity or liability obligation is + offered by You alone, and You hereby agree to indemnify the Initial + Developer and every Contributor for any liability incurred by the + Initial Developer or such Contributor as a result of warranty, + support, indemnity or liability terms You offer. + + 3.6. Distribution of Executable Versions. + You may distribute Covered Code in Executable form only if the + requirements of Section 3.1-3.5 have been met for that Covered Code, + and if You include a notice stating that the Source Code version of + the Covered Code is available under the terms of this License, + including a description of how and where You have fulfilled the + obligations of Section 3.2. The notice must be conspicuously included + in any notice in an Executable version, related documentation or + collateral in which You describe recipients' rights relating to the + Covered Code. You may distribute the Executable version of Covered + Code or ownership rights under a license of Your choice, which may + contain terms different from this License, provided that You are in + compliance with the terms of this License and that the license for the + Executable version does not attempt to limit or alter the recipient's + rights in the Source Code version from the rights set forth in this + License. If You distribute the Executable version under a different + license You must make it absolutely clear that any terms which differ + from this License are offered by You alone, not by the Initial + Developer or any Contributor. You hereby agree to indemnify the + Initial Developer and every Contributor for any liability incurred by + the Initial Developer or such Contributor as a result of any such + terms You offer. + + 3.7. Larger Works. + You may create a Larger Work by combining Covered Code with other code + not governed by the terms of this License and distribute the Larger + Work as a single product. In such a case, You must make sure the + requirements of this License are fulfilled for the Covered Code. + +4. Inability to Comply Due to Statute or Regulation. + + If it is impossible for You to comply with any of the terms of this + License with respect to some or all of the Covered Code due to + statute, judicial order, or regulation then You must: (a) comply with + the terms of this License to the maximum extent possible; and (b) + describe the limitations and the code they affect. Such description + must be included in the LEGAL file described in Section 3.4 and must + be included with all distributions of the Source Code. Except to the + extent prohibited by statute or regulation, such description must be + sufficiently detailed for a recipient of ordinary skill to be able to + understand it. + +5. Application of this License. + + This License applies to code to which the Initial Developer has + attached the notice in Exhibit A and to related Covered Code. + +6. Versions of the License. + + 6.1. New Versions. + Netscape Communications Corporation ("Netscape") may publish revised + and/or new versions of the License from time to time. Each version + will be given a distinguishing version number. + + 6.2. Effect of New Versions. + Once Covered Code has been published under a particular version of the + License, You may always continue to use it under the terms of that + version. You may also choose to use such Covered Code under the terms + of any subsequent version of the License published by Netscape. No one + other than Netscape has the right to modify the terms applicable to + Covered Code created under this License. + + 6.3. Derivative Works. + If You create or use a modified version of this License (which you may + only do in order to apply it to code which is not already Covered Code + governed by this License), You must (a) rename Your license so that + the phrases "Mozilla", "MOZILLAPL", "MOZPL", "Netscape", + "MPL", "NPL" or any confusingly similar phrase do not appear in your + license (except to note that your license differs from this License) + and (b) otherwise make it clear that Your version of the license + contains terms which differ from the Mozilla Public License and + Netscape Public License. (Filling in the name of the Initial + Developer, Original Code or Contributor in the notice described in + Exhibit A shall not of themselves be deemed to be modifications of + this License.) + +7. DISCLAIMER OF WARRANTY. + + COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS, + WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, + WITHOUT LIMITATION, WARRANTIES THAT THE COVERED CODE IS FREE OF + DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. + THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED CODE + IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT, + YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE + COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER + OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF + ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER. + +8. TERMINATION. + + 8.1. This License and the rights granted hereunder will terminate + automatically if You fail to comply with terms herein and fail to cure + such breach within 30 days of becoming aware of the breach. All + sublicenses to the Covered Code which are properly granted shall + survive any termination of this License. Provisions which, by their + nature, must remain in effect beyond the termination of this License + shall survive. + + 8.2. If You initiate litigation by asserting a patent infringement + claim (excluding declatory judgment actions) against Initial Developer + or a Contributor (the Initial Developer or Contributor against whom + You file such action is referred to as "Participant") alleging that: + + (a) such Participant's Contributor Version directly or indirectly + infringes any patent, then any and all rights granted by such + Participant to You under Sections 2.1 and/or 2.2 of this License + shall, upon 60 days notice from Participant terminate prospectively, + unless if within 60 days after receipt of notice You either: (i) + agree in writing to pay Participant a mutually agreeable reasonable + royalty for Your past and future use of Modifications made by such + Participant, or (ii) withdraw Your litigation claim with respect to + the Contributor Version against such Participant. If within 60 days + of notice, a reasonable royalty and payment arrangement are not + mutually agreed upon in writing by the parties or the litigation claim + is not withdrawn, the rights granted by Participant to You under + Sections 2.1 and/or 2.2 automatically terminate at the expiration of + the 60 day notice period specified above. + + (b) any software, hardware, or device, other than such Participant's + Contributor Version, directly or indirectly infringes any patent, then + any rights granted to You by such Participant under Sections 2.1(b) + and 2.2(b) are revoked effective as of the date You first made, used, + sold, distributed, or had made, Modifications made by that + Participant. + + 8.3. If You assert a patent infringement claim against Participant + alleging that such Participant's Contributor Version directly or + indirectly infringes any patent where such claim is resolved (such as + by license or settlement) prior to the initiation of patent + infringement litigation, then the reasonable value of the licenses + granted by such Participant under Sections 2.1 or 2.2 shall be taken + into account in determining the amount or value of any payment or + license. + + 8.4. In the event of termination under Sections 8.1 or 8.2 above, + all end user license agreements (excluding distributors and resellers) + which have been validly granted by You or any distributor hereunder + prior to termination shall survive termination. + +9. LIMITATION OF LIABILITY. + + UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT + (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL + DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED CODE, + OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR + ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY + CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL, + WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER + COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN + INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF + LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY + RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW + PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE + EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO + THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU. + +10. U.S. GOVERNMENT END USERS. + + The Covered Code is a "commercial item," as that term is defined in + 48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial computer + software" and "commercial computer software documentation," as such + terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48 + C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995), + all U.S. Government End Users acquire Covered Code with only those + rights set forth herein. + +11. MISCELLANEOUS. + + This License represents the complete agreement concerning subject + matter hereof. If any provision of this License is held to be + unenforceable, such provision shall be reformed only to the extent + necessary to make it enforceable. This License shall be governed by + California law provisions (except to the extent applicable law, if + any, provides otherwise), excluding its conflict-of-law provisions. + With respect to disputes in which at least one party is a citizen of, + or an entity chartered or registered to do business in the United + States of America, any litigation relating to this License shall be + subject to the jurisdiction of the Federal Courts of the Northern + District of California, with venue lying in Santa Clara County, + California, with the losing party responsible for costs, including + without limitation, court costs and reasonable attorneys' fees and + expenses. The application of the United Nations Convention on + Contracts for the International Sale of Goods is expressly excluded. + Any law or regulation which provides that the language of a contract + shall be construed against the drafter shall not apply to this + License. + +12. RESPONSIBILITY FOR CLAIMS. + + As between Initial Developer and the Contributors, each party is + responsible for claims and damages arising, directly or indirectly, + out of its utilization of rights under this License and You agree to + work with Initial Developer and Contributors to distribute such + responsibility on an equitable basis. Nothing herein is intended or + shall be deemed to constitute any admission of liability. + +13. MULTIPLE-LICENSED CODE. + + Initial Developer may designate portions of the Covered Code as + "Multiple-Licensed". "Multiple-Licensed" means that the Initial + Developer permits you to utilize portions of the Covered Code under + Your choice of the NPL or the alternative licenses, if any, specified + by the Initial Developer in the file described in Exhibit A. + +EXHIBIT A -Mozilla Public License. + + ``The contents of this file are subject to the Mozilla Public License + Version 1.1 (the "License"); you may not use this file except in + compliance with the License. You may obtain a copy of the License at + http://www.mozilla.org/MPL/ + + Software distributed under the License is distributed on an "AS IS" + basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the + License for the specific language governing rights and limitations + under the License. + + The Original Code is ______________________________________. + + The Initial Developer of the Original Code is ________________________. + Portions created by ______________________ are Copyright (C) ______ + _______________________. All Rights Reserved. + + Contributor(s): ______________________________________. + + Alternatively, the contents of this file may be used under the terms + of the _____ license (the "[___] License"), in which case the + provisions of [______] License are applicable instead of those + above. If you wish to allow use of your version of this file only + under the terms of the [____] License and not to allow others to use + your version of this file under the MPL, indicate your decision by + deleting the provisions above and replace them with the notice and + other provisions required by the [___] License. If you do not delete + the provisions above, a recipient may use your version of this file + under either the MPL or the [___] License." + + [NOTE: The text of this Exhibit A may differ slightly from the text of + the notices in the Source Code files of the Original Code. You should + use the text of this Exhibit A rather than the text found in the + Original Code Source Code for Your Modifications.] + + ---------------------------------------------------------------------- + + AMENDMENTS + + The Netscape Public License Version 1.1 ("NPL") consists of the + Mozilla Public License Version 1.1 with the following Amendments, + including Exhibit A-Netscape Public License. Files identified with + "Exhibit A-Netscape Public License" are governed by the Netscape + Public License Version 1.1. + + Additional Terms applicable to the Netscape Public License. + I. Effect. + These additional terms described in this Netscape Public + License -- Amendments shall apply to the Mozilla Communicator + client code and to all Covered Code under this License. + + II. "Netscape's Branded Code" means Covered Code that Netscape + distributes and/or permits others to distribute under one or more + trademark(s) which are controlled by Netscape but which are not + licensed for use under this License. + + III. Netscape and logo. + This License does not grant any rights to use the trademarks + "Netscape", the "Netscape N and horizon" logo or the "Netscape + lighthouse" logo, "Netcenter", "Gecko", "Java" or "JavaScript", + "Smart Browsing" even if such marks are included in the Original + Code or Modifications. + + IV. Inability to Comply Due to Contractual Obligation. + Prior to licensing the Original Code under this License, Netscape + has licensed third party code for use in Netscape's Branded Code. + To the extent that Netscape is limited contractually from making + such third party code available under this License, Netscape may + choose to reintegrate such code into Covered Code without being + required to distribute such code in Source Code form, even if + such code would otherwise be considered "Modifications" under + this License. + + V. Use of Modifications and Covered Code by Initial Developer. + V.1. In General. + The obligations of Section 3 apply to Netscape, except to + the extent specified in this Amendment, Section V.2 and V.3. + + V.2. Other Products. + Netscape may include Covered Code in products other than the + Netscape's Branded Code which are released by Netscape + during the two (2) years following the release date of the + Original Code, without such additional products becoming + subject to the terms of this License, and may license such + additional products on different terms from those contained + in this License. + + V.3. Alternative Licensing. + Netscape may license the Source Code of Netscape's Branded + Code, including Modifications incorporated therein, without + such Netscape Branded Code becoming subject to the terms of + this License, and may license such Netscape Branded Code on + different terms from those contained in this License. + + VI. Litigation. + Notwithstanding the limitations of Section 11 above, the + provisions regarding litigation in Section 11(a), (b) and (c) of + the License shall apply to all disputes relating to this License. + + EXHIBIT A-Netscape Public License. + + "The contents of this file are subject to the Netscape Public + License Version 1.1 (the "License"); you may not use this file + except in compliance with the License. You may obtain a copy of + the License at http://www.mozilla.org/NPL/ + + Software distributed under the License is distributed on an "AS + IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or + implied. See the License for the specific language governing + rights and limitations under the License. + + The Original Code is Mozilla Communicator client code, released + March 31, 1998. + + The Initial Developer of the Original Code is Netscape + Communications Corporation. Portions created by Netscape are + Copyright (C) 1998-1999 Netscape Communications Corporation. All + Rights Reserved. + + Contributor(s): ______________________________________. + + Alternatively, the contents of this file may be used under the + terms of the _____ license (the "[___] License"), in which case + the provisions of [______] License are applicable instead of + those above. If you wish to allow use of your version of this + file only under the terms of the [____] License and not to allow + others to use your version of this file under the NPL, indicate + your decision by deleting the provisions above and replace them + with the notice and other provisions required by the [___] + License. If you do not delete the provisions above, a recipient + may use your version of this file under either the NPL or the + [___] License." --- conkeror-0.9.3+git101015.orig/debian/CREDITS.Debian +++ conkeror-0.9.3+git101015/debian/CREDITS.Debian @@ -0,0 +1,5 @@ +Thanks for many suggestions, hints and ideas about how to package +Conkeror for Debian go to: + + + Jeremy Maitin-Shepard (current upstream maintainer) + + Luca Capello (upload sponsor and conkeror user) --- conkeror-0.9.3+git101015.orig/debian/compat +++ conkeror-0.9.3+git101015/debian/compat @@ -0,0 +1 @@ +7 --- conkeror-0.9.3+git101015.orig/debian/conkeror.lintian-overrides +++ conkeror-0.9.3+git101015/debian/conkeror.lintian-overrides @@ -0,0 +1,4 @@ +# Non-standard Xul-AppId header needed for mozilla-devscripts (see bug +# #562986 and http://wiki.debian.org/mozilla-devscripts) +conkeror binary: unknown-field-in-control xul-appid + --- conkeror-0.9.3+git101015.orig/debian/watch +++ conkeror-0.9.3+git101015/debian/watch @@ -0,0 +1 @@ +# We track Conkeror Git revisions, thus no need for a watch file. --- conkeror-0.9.3+git101015.orig/debian/control +++ conkeror-0.9.3+git101015/debian/control @@ -0,0 +1,45 @@ +Source: conkeror +Section: web +Priority: extra +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Axel Beckert +Build-Depends: debhelper (>= 7.2.3~), quilt +Standards-Version: 3.9.1 +Homepage: http://conkeror.org/ +Vcs-Browser: http://repo.or.cz/w/conkeror.git +Vcs-Git: git://repo.or.cz/conkeror.git + +Package: conkeror +Architecture: all +Depends: xulrunner-2.0, ${misc:Depends} +Recommends: conkeror-spawn-process-helper +Breaks: conkeror-spawn-process-helper (<< 0.9~git080901-1) +Suggests: emacs | emacsen +Provides: www-browser +Xb-Xul-AppId: {a79fe89b-6662-4ff4-8e88-09950ad4dfde} +Description: keyboard focused web browser with Emacs look and feel + Conkeror is a highly-programmable web browser based on Mozilla + XULRunner. It has a sophisticated keyboard system for running + commands and interacting with web page content, modelled after Emacs + and Lynx. It is self-documenting and extensible with JavaScript. + . + It comes with builtin support for several Web 2.0 sites like several + Google services (Search, Gmail, Maps, Reader, etc.), Del.icio.us, + Reddit, Last.fm and YouTube. For easier editing of form fields, it + can spawn external editors. For this feature the recommended + conkeror-spawn-process-helper package needs to be installed. + . + Despite its very similar sounding name, Conkeror is not related to + the KDE web browser and file manager Konqueror in any way. + +Package: conkeror-spawn-process-helper +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Suggests: conkeror +Breaks: conkeror (<< 0.9~git080901-1) +Description: spawn external processes in Conkeror + This helper tool named conkeror-spawn-helper is necessary to let the + Conkeror web browser spawn external process, e.g. to edit form fields + in an external program. It was previously named spawn-process-helper. + . + Maybe helpful for other XULRunner based applications, too. --- conkeror-0.9.3+git101015.orig/debian/conkeror.postinst +++ conkeror-0.9.3+git101015/debian/conkeror.postinst @@ -0,0 +1,12 @@ +#!/bin/sh + +set -e + +update-alternatives --install /usr/bin/x-www-browser \ + x-www-browser /usr/bin/conkeror 20 \ + --slave /usr/share/man/man1/x-www-browser.1.gz \ + x-www-browser.1.gz /usr/share/man/man1/conkeror.1.gz + +#DEBHELPER# + +exit 0 --- conkeror-0.9.3+git101015.orig/debian/conkeror.docs +++ conkeror-0.9.3+git101015/debian/conkeror.docs @@ -0,0 +1,3 @@ +debian/MPL +debian/CREDITS.Debian +CREDITS --- conkeror-0.9.3+git101015.orig/debian/conkeror-spawn-process-helper.docs +++ conkeror-0.9.3+git101015/debian/conkeror-spawn-process-helper.docs @@ -0,0 +1,5 @@ +debian/MPL +debian/README.Debian +debian/CREDITS.Debian +CREDITS + --- conkeror-0.9.3+git101015.orig/debian/README.Debian +++ conkeror-0.9.3+git101015/debian/README.Debian @@ -0,0 +1,13 @@ +conkeror for Debian +------------------- + +The conkeror package is split up into two packages: + ++ conkeror including all the non-architecture-specific files. This + package is sufficient to run conkeror but you may not be able to + spawn external commands like editors, etc. + ++ conkeror-spawn-process-helper including the helper binary + conkeror-spawn-helper (formerly spawn-process-helper) + + -- Axel Beckert , Sun, 1 Feb 2009 20:48:59 +0100 --- conkeror-0.9.3+git101015.orig/debian/conkeror.bin +++ conkeror-0.9.3+git101015/debian/conkeror.bin @@ -0,0 +1,38 @@ +#!/bin/sh +# Wrapper around xulrunner to start the xulrunner application conkeror +# Written by Axel Beckert for the Debian Project + +# Find an appropriate xulrunner binary +XULRUNNER='' +for xr in xulrunner-2.0 xulrunner; do + XRTMP=`which $xr` + if [ -n "$XRTMP" -a -x "$XRTMP" ]; then + if expr `$XRTMP --gre-version | cut -d . -f 1,2` '>=' 1.9 > /dev/null; then + # xulrunner is version 1.9 or higher, take it + XULRUNNER=$XRTMP + break + else + # xulrunner is older than version 1.9, forget it + XRTMP=/usr/lib/$xr/xulrunner + if [ -x $XRTMP ]; then + if expr `$XRTMP --gre-version | cut -d . -f 1,2` '>=' 1.9 > /dev/null; then + # xulrunner is a 1.9 version, take it + XULRUNNER=$XRTMP + break + fi + fi + fi + fi +done + +if [ -z "$XULRUNNER" ]; then + echo "xulrunner version 1.9 required, but not found. Bailing out." 1>&2 + exit 1; +fi + +if [ "$*" = "--help" ]; then + errormsg="`exec $XULRUNNER /usr/share/conkeror/application.ini \"$@\" 2>&1`" + echo "$errormsg" | sed -e "s:/[^ ]*/xulrunner-bin:$0:; /-\(width\|height\)/d" 1>&2 +else + exec $XULRUNNER /usr/share/conkeror/application.ini "$@" +fi --- conkeror-0.9.3+git101015.orig/debian/NEWS +++ conkeror-0.9.3+git101015/debian/NEWS @@ -0,0 +1,237 @@ +conkeror (0.9.3+git101015-1) experimental; urgency=low + + * The eval-expression command (M-:) now evaluates directly in + application scope. This lets you do things like set user variables and + define functions without fully qualifying names with "conkeror.". + + * Page-modes no longer bind alternative keys for keys that they shadow + in the normal keymaps. These were bindings like 'C-c f' for follow, + etc. The key C-z can now be used as a prefix to access bindings that + are shadowed by a page-mode keymap. + + -- Axel Beckert Fri, 15 Oct 2010 00:29:44 +0200 + +conkeror (0.9.3-1) experimental; urgency=low + + * Input-modes removed. Instead of an input-mode display in the + minibuffer, there is now a keymaps-display. + + - quote-next-input-mode renamed to quote-next-mode + - gmail_edit_keymap removed (no longer necessary) + - buffer-reset-input-mode command removed (no longer necessary) + + * overlink_mode rewritten + + - content_buffer_overlink_change_hook removed + - current_content_buffer_overlink_change_hook removed + + * Hinting now performs a case-sensitive match if the user's text + includes upper-case letters. + + * stackoverflow-mode has been renamed to stackexchange-mode. + + -- Axel Beckert Wed, 06 Oct 2010 21:02:21 +0200 + +conkeror (0.9.2+git100804-1) unstable; urgency=low + + * Editing in the minibuffer is now done with the normal editing commands + instead of a special set of editing commands. All of the editing + commands which begin with the prefix "minibuffer-" have been + removed. Also, editing commands are now bound in the keymap + text_keymap instead of content_buffer_text_keymap and + minibuffer_base_keymap. If you have written custom bindings for + editing in your rc, you will need to change [pairs of] bindings like + this: + + define_key(minibuffer_base_keymap, "C-l", "minibuffer-forward-char"); + define_key(content_buffer_text_keymap, "C-l", "forward-char"); + + to this: + + define_key(text_keymap, "C-l", "forward-char"); + + * In hinting mode, right and left are no longer bound to + next/previous-hint. Hinting mode now supports editing in the + minibuffer, so right and left move the cursor. Down, up, C-n, C-p, + C-s, and C-r are all bound to next/previous-hint. + + * Due to a change in Mozilla as of XULRunner 1.9.3a5pre, Conkeror's + feature of automatically loading glue code for extensions is no longer + possible. This means that when you have one of the previously + supported extensions installed, you will no longer automatically have + Conkeror commands for using the extension. The extensions that were + previously supported in this way were adblockplus, dom-inspector, + noscript, and venkman. If you have any of these extensions installed, + you will now have to load the glue module from your rc, with a line + like the following, substituting in the appropriate module name: + + require("dom-inspector"); + + With some of these modules, loading the module when the extension is + not installed could result in an error, so to be safe, you could wrap + the call to 'require' in a try/catch block: + + try { require("dom-inspector"); } catch (e) {} + + Further information: http://bugs.conkeror.org/issue272 + + * The variable download_buffer_automatic_open_target can no longer be an + array of two targets. This is a reversion from 2009-06-07 back to how + it was before. The behavior of the download-show command is now + configured independently of this variable. To configure download-show, + use set_handler and alternates. The following handlers are provided: + download_show_new_window, download_show_new_buffer, + download_show_new_buffer_background. The default handler of + download_show is alternates(download_show_new_buffer, + download_show_new_window). + + -- Axel Beckert Wed, 04 Aug 2010 23:04:22 +0200 + +conkeror (0.9.2+git100420-2) unstable; urgency=low + + * Function load_rc no longer supports loading arbitrary js files. Use + load instead. + + * Function load_rc_file removed. Use load instead. + + * call_after_load now takes a feature name, not a filename. In general + this simply means trimming off any ".js" extension. + + * Modules API overhaul (already included in 0.9.2-1 and caused the + uploads 0.9.2+git100324-1 and -2): + - Modules should have an in_module assertion as their first + expression. For modules to be loaded directly into application + scope, it should be in_module(null); + - Modules should have as their last expression a provide call, like + provide("feature"); where "feature" is the name of the feature + provided by the module. + + -- Axel Beckert Tue, 20 Apr 2010 23:38:49 +0200 + +conkeror (0.9.1+git100317-1) unstable; urgency=low + + * emacswiki webjump removed. better version posted on + http://conkeror.org/Webjumps + + * M-< and home keys now scroll to the top left corner of the buffer. + + * minibuffer.read_url now returns a load_spec instead of a simple + string. + + * The command confirm-quit has been removed. To have a quit + confirmation, see the code example on + http://conkeror.org/BreakingChanges + + -- Axel Beckert Wed, 17 Mar 2010 02:04:20 +0100 + +conkeror (0.9.1+git100131-1) unstable; urgency=low + + Please see http://conkeror.org/BreakingChanges for the complete list of + breaking changes. Just the most important ones are listed here. + + * mime_type_external_handlers removed. Replaced by + external_content_handlers. + + * define_buffer_mode, define_input_mode, and define_page_mode no longer + take display_name or doc as positional arguments. They are now given + as keyword arguments: $display_name and $doc. + + * The variable browser_automatic_form_focus_window_duration was renamed + to block_content_focus_change_duration. + + * The commands follow-current, follow-current-new-buffer, + follow-current-new-buffer-background, and follow-current-new-window + have been removed. + + * browser_prevent_automatic_form_focus_mode has been renamed and put in + its own file. To use this mode, simply do this: + require("block-content-focus-change.js"); + + * The default of hints_auto_exit_delay has been changed to 0. + + This change means that by default, the user has to hit return to exit + the hints interaction. This change makes Conkeror's UI more + predictable for new users, less prone to run unintended commands + because of extra keystrokes outside the timeout window, and removes + assumptions about people's typing speed, browsing style, and focus of + attention when using the hints system. + + To use the hints-auto-exit feature, put a line like the following in + your rc, adjusting the number to suit your preference. 500 was the old + default. + + hints_auto_exit_delay = 500; + + -- Axel Beckert Sun, 31 Jan 2010 17:55:04 +0100 + +conkeror (0.9~git090708-1) unstable; urgency=low + + The conkeror Debian package now works with the upcoming experimental + xulrunner-1.9.1 packages (see http://glandium.org/blog/?p=370) in + Debian, too. + + Since conkeror still throws much more warnings with xulrunner 1.9.1 than + with 1.9.0.x, for now the package currently prefers 1.9.0.x over 1.9.1 + if both are installed. + + Call "xulrunner-1.9.1 /usr/share/conkeror/application.ini" if you have + xulrunner-1.9 and xulrunner-1.9.1 installed and want to checkout + conkeror in combination with xulrunner 1.9.1. + + -- Axel Beckert Wed, 08 Jul 2009 20:48:36 +0200 + +conkeror (0.9~git090617-1) unstable; urgency=low + + There were a few changes since the last conkeror version in Debian which + may cause troubles to users of the previous version. + + Short summary follows: + * The key bindings `<<` and `>>` are now simply `<` and `>`. + * page-mode keymaps are now declared in the `define_page_mode` form with + a new keyword argument, `$keymaps`. See + http://conkeror.org/WritingPageModes for more information about the + new style. + * `default_directory` and `set_default_directory` have been removed and + replaced by the variable `cwd`. + * buffer-local variables are now indexed by `buffer.local.foo`. + page-local variables are indexed by `buffer.page.local.foo`. + * The command `send-ret` was removed since it is redundant of the + module `global-overlay-keymap`. + * Buffer-local cwd is no longer set or inherited automatically. + * `download-cancel` is now bound to `d` instead of `C-g`, and it asks + for confirmation. + * In order to make Conkeror compatible with native toolkit theming, + Conkeror's themes have undergone a big rewrite: + - Conkeror no longer specifies its own gui colors. + - The blackened theme no longer exists. + - It is no longer possible to theme scrollbars. + From now on, the right way to change Conkeror's gui colors is to do so + at the OS level, for example, with a GTK theme. + * Conkeror has now session saving support. See + http://conkeror.org/Sessions for details. + + See http://article.gmane.org/gmane.comp.mozilla.conkeror/1547 and + http://thread.gmane.org/gmane.comp.mozilla.conkeror/1451 for the + details and what to change in case you run over some removed or renamed + functions or variables. + + -- Axel Beckert Wed, 17 Jun 2009 00:04:58 +0200 + +conkeror (0.9~git090223-1) unstable; urgency=low + + There were a few changes since the last conkeror version in Debian which + may cause troubles to users of the previous version: + * Changes to the behaviour of the universal argument C-u. + * Loads now ~/.conkerorrc as the default rc file + * Many simple webjumps previously enabled by default have been removed + from upstream. Non-default webjumps are now collected and shared at + http://conkeror.org/Webjumps + * Many additional keybindings, e.g. + - pasting current paste buffer content bound to `C-y' + - new command `submit-form' bound to `C-c C-c' in forms + * Incremental search for URLs in the mini-buffer can currently include + _either_ the history or the bookmarks, but not both at the same + time. See http://bugs.conkeror.org/issue10 for details on choosing + which one to use. + + -- Axel Beckert Mon, 23 Feb 2009 21:04:41 +0100 --- conkeror-0.9.3+git101015.orig/debian/conkeror.bug-script +++ conkeror-0.9.3+git101015/debian/conkeror.bug-script @@ -0,0 +1,9 @@ +#!/bin/sh + +if [ -x /usr/lib/xulrunner-1.9.1/reportbug-helper-script ]; then + /usr/lib/xulrunner-1.9.1/reportbug-helper-script conkeror +fi + +if [ -x /usr/lib/xulrunner-1.9.2/reportbug-helper-script ]; then + /usr/lib/xulrunner-1.9.2/reportbug-helper-script conkeror +fi --- conkeror-0.9.3+git101015.orig/debian/source/format +++ conkeror-0.9.3+git101015/debian/source/format @@ -0,0 +1 @@ +1.0 --- conkeror-0.9.3+git101015.orig/debian/patches/deb-webjumps.diff +++ conkeror-0.9.3+git101015/debian/patches/deb-webjumps.diff @@ -0,0 +1,44 @@ +Adds and enables some Debian and Ubuntu related webjumps which should +not be inlcuded in upstream by default. + +Index: conkeror/modules/debian/debian-webjumps.js +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ conkeror/modules/debian/debian-webjumps.js 2010-09-29 07:55:36.000000000 +0200 +@@ -0,0 +1,30 @@ ++/** ++ * (C) Copyright 2008-2010 Axel Beckert ++ * ++ * Use, modification, and distribution are subject to the terms specified in the ++ * COPYING file. ++ * ++ * Webjumps to interact with Debian and Ubuntu websites ++**/ ++ ++in_module(null); ++ ++require("webjump.js"); ++ ++// Debian // ++define_webjump("debpkg", "http://packages.debian.org/%s"); ++define_webjump("debfile", "http://packages.debian.org/?searchon=contents&keywords=%s&mode=path&suite=unstable&arch=any"); ++define_webjump("debbugs", "http://bugs.debian.org/%s"); ++define_webjump("debpts", "http://packages.qa.debian.org/%s"); ++define_webjump("debpopcon", "http://qa.debian.org/popcon.php?package=%s"); ++define_webjump("buildd", "https://buildd.debian.org/%s"); ++define_webjump("buildd-ports", "http://buildd.debian-ports.org/build.php?pkg=%s"); ++define_webjump("debqa", "http://qa.debian.org/developer.php?login=%s"); ++ ++// Ubuntu // ++define_webjump("ubuntupkg", "http://packages.ubuntu.com/%s"); ++define_webjump("ubuntufile", "http://packages.ubuntu.com/search?searchon=contents&keywords=%s&mode=path&arch=any"); ++define_webjump("ubuntubugs", "http://bugs.launchpad.net/ubuntu/+source/%s"); ++define_webjump("launchpad", "https://launchpad.net/+search?field.text=%s"); ++ ++provide("debian-webjumps"); +Index: conkeror/defaults/preferences/debian-default-modules.js +=================================================================== +--- conkeror.orig/defaults/preferences/debian-default-modules.js 2010-09-28 01:47:21.000000000 +0200 ++++ conkeror/defaults/preferences/debian-default-modules.js 2010-09-29 07:57:40.000000000 +0200 +@@ -0,0 +1,1 @@ ++pref("conkeror.load.debian/debian-webjumps", 1); --- conkeror-0.9.3+git101015.orig/debian/patches/series +++ conkeror-0.9.3+git101015/debian/patches/series @@ -0,0 +1,2 @@ +sensible-editor.diff +deb-webjumps.diff --- conkeror-0.9.3+git101015.orig/debian/patches/sensible-editor.diff +++ conkeror-0.9.3+git101015/debian/patches/sensible-editor.diff @@ -0,0 +1,14 @@ +Let Debian's sensible-editor guess the editor. +Index: conkeror-0.9.2+git100324/modules/external-editor.js +=================================================================== +--- conkeror-0.9.2+git100324.orig/modules/external-editor.js 2010-03-24 01:15:32.000000000 +0100 ++++ conkeror-0.9.2+git100324/modules/external-editor.js 2010-03-24 01:17:57.000000000 +0100 +@@ -7,7 +7,7 @@ + + in_module(null); + +-define_variable("editor_shell_command", getenv("VISUAL") || getenv("EDITOR") || "emacs", ++define_variable("editor_shell_command", "/usr/bin/sensible-editor", + "Shell command used to invoke an external editor.\n" + + "This defaults to the value of the EDITOR environment variable. If " + + "`run_external_editor_function' is non-null, it is used instead to " +