diff -u conkeror-0.9.2+git100804/debian/changelog conkeror-0.9.2+git100804/debian/changelog --- conkeror-0.9.2+git100804/debian/changelog +++ conkeror-0.9.2+git100804/debian/changelog @@ -1,3 +1,10 @@ +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 @@ -5,6 +12,20 @@ -- 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 @@ -65,6 +86,31 @@ -- 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 @@ -139,6 +185,19 @@ -- 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 @@ -221,0 +281 @@ + diff -u conkeror-0.9.2+git100804/debian/control conkeror-0.9.2+git100804/debian/control --- conkeror-0.9.2+git100804/debian/control +++ conkeror-0.9.2+git100804/debian/control @@ -1,7 +1,8 @@ Source: conkeror Section: web Priority: extra -Maintainer: Axel Beckert +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Axel Beckert Build-Depends: debhelper (>= 7.2.3~), quilt Standards-Version: 3.9.1 Homepage: http://conkeror.org/ @@ -10,7 +11,7 @@ Package: conkeror Architecture: all -Depends: xulrunner-1.9.1 | xulrunner-1.9.2 | xulrunner-1.9 | xulrunner (>= 1.9~), ${misc:Depends} +Depends: xulrunner-1.9.2, ${misc:Depends} Recommends: conkeror-spawn-process-helper Breaks: conkeror-spawn-process-helper (<< 0.9~git080901-1) Suggests: emacs | emacsen