diff -u sugar-hulahop-0.4.8~dfsg/debian/control.in sugar-hulahop-0.4.8~dfsg/debian/control.in --- sugar-hulahop-0.4.8~dfsg/debian/control.in +++ sugar-hulahop-0.4.8~dfsg/debian/control.in @@ -26,0 +27,7 @@ + +Package: hulahop +Architecture: all +Depends: python-hulahop +Description: Sugar graphical shell - gecko-based web engine (transitional package) + This is a transitional package to assist with upgrading from older + versions of hulahop. It can be safely removed. diff -u sugar-hulahop-0.4.8~dfsg/debian/control sugar-hulahop-0.4.8~dfsg/debian/control --- sugar-hulahop-0.4.8~dfsg/debian/control +++ sugar-hulahop-0.4.8~dfsg/debian/control @@ -3,7 +3,7 @@ Priority: optional Maintainer: Debian OLPC Uploaders: Jonas Smedegaard -Build-Depends: cdbs (>= 0.4.39), autotools-dev, devscripts (>= 2.10.7), quilt, patchutils (>= 0.2.25), python-all-dev (>= 2.3.5-11), python-central (>= 0.5.6), debhelper (>= 5.0.44), dh-buildinfo, python-xpcom (>= 1.9~rc2), xulrunner-dev (>= 1.9~rc2), python-gtk2-dev +Build-Depends: cdbs (>= 0.4.39), autotools-dev, devscripts (>= 2.10.7), quilt, patchutils (>= 0.2.25), python-all-dev (>= 2.3.5-11), python-central (>= 0.5.6), debhelper (>= 5.0.44), dh-buildinfo, xulrunner-1.9-dev (>= 1.9~rc2), python-gtk2-dev Standards-Version: 3.7.3 Vcs-Git: git://git.debian.org/git/collab-maint/sugar-hulahop.git Vcs-Browser: http://git.debian.org/?p=collab-maint/sugar-hulahop.git;a=summary @@ -16,6 +16,8 @@ Suggests: sugar-web-activity Provides: ${python:Provides} XB-Python-Version: ${python:Versions} +Conflicts: hulahop (<< 0.4.6-0ubuntu2) +Replaces: hulahop (<< 0.4.6-0ubuntu2) Description: Sugar graphical shell - gecko-based web engine Sugar is a graphical user interface aimed at children. . @@ -26,0 +29,7 @@ + +Package: hulahop +Architecture: all +Depends: python-hulahop +Description: Sugar graphical shell - gecko-based web engine (transitional package) + This is a transitional package to assist with upgrading from older + versions of hulahop. It can be safely removed. diff -u sugar-hulahop-0.4.8~dfsg/debian/changelog sugar-hulahop-0.4.8~dfsg/debian/changelog --- sugar-hulahop-0.4.8~dfsg/debian/changelog +++ sugar-hulahop-0.4.8~dfsg/debian/changelog @@ -1,3 +1,16 @@ +sugar-hulahop (0.4.8~dfsg-3ubuntu1) jaunty; urgency=low + + * Merge from debian unstable, remaining changes: + - Fix build dependencies for Ubuntu: change xulrunner-dev to + xulrunner-1.9-dev, remove python-xpcom (built into xulrunner-1.9-dev) + - Add hulahop transitional package for upgrades (should be kept until + after the next LTS) (LP: #286764) + - Add Conflicts/Replaces to make the transitional package work + correctly. + * Drop debian patch 1001 & 2001 as it is Debian specific. + + -- Stefan Lesicnik Thu, 08 Jan 2009 16:32:54 +0200 + sugar-hulahop (0.4.8~dfsg-3) unstable; urgency=low * Add patches 1001 and 2001 to fix hardcoded libxul path. Closes: @@ -20,6 +33,19 @@ -- Jonas Smedegaard Thu, 04 Dec 2008 02:45:12 +0100 +sugar-hulahop (0.4.7~dfsg-1ubuntu1) jaunty; urgency=low + + * Merge from Debian unstable, remaining changes: + - Fix build dependencies for Ubuntu: change xulrunner-dev to + xulrunner-1.9-dev, remove python-xpcom + - Add hulahop transitional package for upgrades (should be kept until + after the next LTS) (LP: #286764) + * Improve the short description of the hulahop package to at least give + a hint what the package is related to. + * Add Conflicts/Replaces to make the transitional package work correctly. + + -- James Westby Thu, 20 Nov 2008 22:21:52 +0000 + sugar-hulahop (0.4.7~dfsg-1) unstable; urgency=low * New upstream version @@ -32,6 +58,19 @@ -- Jonas Smedegaard Tue, 11 Nov 2008 22:32:55 +0100 +sugar-hulahop (0.4.6-0ubuntu2) intrepid; urgency=low + + * Add hulahop transitional package for upgrades (LP: #286764) + + -- Morgan Collett Thu, 23 Oct 2008 15:19:08 +0200 + +sugar-hulahop (0.4.6-0ubuntu1) intrepid; urgency=low + + * New upstream bugfix release. + - Allows sugar-web-activity to work again (LP: #282883) + + -- Morgan Collett Wed, 15 Oct 2008 20:19:44 +0200 + sugar-hulahop (0.4.5-1) unstable; urgency=low * New upstream release. @@ -60,6 +99,13 @@ -- Jonas Smedegaard Sat, 16 Aug 2008 11:16:56 +0200 +sugar-hulahop (0.4.1-1ubuntu1) intrepid; urgency=low + + * Fix build dependencies for Ubuntu: change xulrunner-dev to + xulrunner-1.9-dev, remove python-xpcom + + -- Morgan Collett Wed, 08 Oct 2008 23:16:26 +0200 + sugar-hulahop (0.4.1-1) unstable; urgency=low * New upstream release. @@ -113,0 +160 @@ + diff -u sugar-hulahop-0.4.8~dfsg/debian/patches/series sugar-hulahop-0.4.8~dfsg/debian/patches/series --- sugar-hulahop-0.4.8~dfsg/debian/patches/series +++ sugar-hulahop-0.4.8~dfsg/debian/patches/series @@ -2,2 +1,0 @@ -1001_hardcode_LIBXUL_DIR.patch -2001_hardcode_LIBXUL_DIR_automade.patch only in patch2: unchanged: --- sugar-hulahop-0.4.8~dfsg.orig/debian/python-hulahop.install +++ sugar-hulahop-0.4.8~dfsg/debian/python-hulahop.install @@ -0,0 +1 @@ +debian/tmp/usr/*