diff -u sugar-hulahop-0.4.9/debian/rules sugar-hulahop-0.4.9/debian/rules --- sugar-hulahop-0.4.9/debian/rules +++ sugar-hulahop-0.4.9/debian/rules @@ -74,7 +74,7 @@ python-xpcom-minver = 1.9~rc2 # Needed both by upstream build and at runtime -CDBS_DEPENDS = python-xpcom (>= $(python-xpcom-minver)) +CDBS_DEPENDS = xulrunner-1.9 (>= $(python-xpcom-minver)) CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), $(CDBS_DEPENDS) # Needed by upstream build process diff -u sugar-hulahop-0.4.9/debian/control.in sugar-hulahop-0.4.9/debian/control.in --- sugar-hulahop-0.4.9/debian/control.in +++ sugar-hulahop-0.4.9/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.9/debian/control sugar-hulahop-0.4.9/debian/control --- sugar-hulahop-0.4.9/debian/control +++ sugar-hulahop-0.4.9/debian/control @@ -1,9 +1,10 @@ Source: sugar-hulahop Section: python Priority: optional -Maintainer: Debian OLPC +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Debian OLPC Uploaders: Jonas Smedegaard -Build-Depends: cdbs (>= 0.4.39), autotools-dev, devscripts (>= 2.10.7), quilt, patchutils (>= 0.2.25), libtool, automake1.10, autoconf, python-all-dev (>= 2.3.5-11), python-central (>= 0.5.6), debhelper (>= 6), 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), libtool, automake1.10, autoconf, python-all-dev (>= 2.3.5-11), python-central (>= 0.5.6), debhelper (>= 6), dh-buildinfo, xulrunner-1.9-dev (>= 1.9~rc2), python-gtk2-dev Standards-Version: 3.8.1 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 +17,8 @@ Suggests: ${cdbs:Suggests} 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 +30,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.9/debian/changelog sugar-hulahop-0.4.9/debian/changelog --- sugar-hulahop-0.4.9/debian/changelog +++ sugar-hulahop-0.4.9/debian/changelog @@ -1,3 +1,20 @@ +sugar-hulahop (0.4.9-1ubuntu1) karmic; urgency=low + + * Merge from debian unstable (LP: #391850), remaining changes: + - debian/rules: Replace dependency on python-xpcom with xulrunner-1.9. + - debian/control: + + Fix build dependencies for Ubuntu: change xulrunner-dev to + xulrunner-1.9-dev, remove python-xpcom (built into xulrunner-1.9-dev) + + Add Conflicts/Replaces to make the transitional package work correctly. + - debian/{control,control.in}, debian/python-hulahop.install: + + Add hulahop transitional package for upgrades (should be kept until + after the next LTS) (LP: #286764) + - Drop debian patch 1001 as it is Debian specific. + * debian/patches/1002_python2.6.patch: + - Added support for python2.6. + + -- Andres Rodriguez Thu, 25 Jun 2009 11:17:47 -0500 + sugar-hulahop (0.4.9-1) unstable; urgency=low * New upstream release. @@ -21,6 +38,38 @@ -- Jonas Smedegaard Sat, 30 May 2009 10:01:09 +0200 +sugar-hulahop (0.4.8~dfsg-3ubuntu4) jaunty; urgency=low + + * No changes upload to rebuild against newer xulrunner (LP: #328033) + + -- Morgan Collett Wed, 11 Feb 2009 13:48:34 +0200 + +sugar-hulahop (0.4.8~dfsg-3ubuntu3) jaunty; urgency=low + + * debian/rules: Replace dependency on python-xpcom with xulrunner-1.9 + (LP: #263173) + + -- Morgan Collett Wed, 04 Feb 2009 14:22:13 +0200 + +sugar-hulahop (0.4.8~dfsg-3ubuntu2) jaunty; urgency=low + + * no changes upload for nss/nspr SONAME mini-transition + + -- Alexander Sack Mon, 12 Jan 2009 16:22:16 +0100 + +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: @@ -43,6 +92,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 @@ -55,6 +117,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. @@ -83,6 +158,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. @@ -136,0 +219 @@ + diff -u sugar-hulahop-0.4.9/debian/patches/series sugar-hulahop-0.4.9/debian/patches/series --- sugar-hulahop-0.4.9/debian/patches/series +++ sugar-hulahop-0.4.9/debian/patches/series @@ -1 +1 @@ -1001_hardcode_LIBXUL_DIR.patch +1002_python2.6.patch only in patch2: unchanged: --- sugar-hulahop-0.4.9.orig/debian/python-hulahop.install +++ sugar-hulahop-0.4.9/debian/python-hulahop.install @@ -0,0 +1 @@ +debian/tmp/usr/* only in patch2: unchanged: --- sugar-hulahop-0.4.9.orig/debian/patches/1002_python2.6.patch +++ sugar-hulahop-0.4.9/debian/patches/1002_python2.6.patch @@ -0,0 +1,31 @@ +Index: sugar-hulahop-0.4.9-1ubuntu1/configure +=================================================================== +--- sugar-hulahop-0.4.9-1ubuntu1.orig/configure 2009-06-24 17:16:32.000000000 -0500 ++++ sugar-hulahop-0.4.9-1ubuntu1/configure 2009-06-24 17:18:04.000000000 -0500 +@@ -20653,7 +20653,7 @@ + + # Find any Python interpreter. + if test -z "$PYTHON"; then +- for ac_prog in python python2 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5 ++ for ac_prog in python python2 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5 + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 +@@ -20749,7 +20749,7 @@ + $as_echo_n "(cached) " >&6 + else + am_cv_python_pythondir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(0,0,prefix='$PYTHON_PREFIX')" 2>/dev/null || +- echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"` ++ echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/*-packages"` + fi + { $as_echo "$as_me:$LINENO: result: $am_cv_python_pythondir" >&5 + $as_echo "$am_cv_python_pythondir" >&6; } +@@ -20766,7 +20766,7 @@ + $as_echo_n "(cached) " >&6 + else + am_cv_python_pyexecdir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(1,0,prefix='$PYTHON_EXEC_PREFIX')" 2>/dev/null || +- echo "${PYTHON_EXEC_PREFIX}/lib/python${PYTHON_VERSION}/site-packages"` ++ echo "${PYTHON_EXEC_PREFIX}/lib/python${PYTHON_VERSION}/*-packages"` + fi + { $as_echo "$as_me:$LINENO: result: $am_cv_python_pyexecdir" >&5 + $as_echo "$am_cv_python_pyexecdir" >&6; }