diff -u gwget2-0.99/debian/control gwget2-0.99/debian/control --- gwget2-0.99/debian/control +++ gwget2-0.99/debian/control @@ -15,8 +15,8 @@ libgnomevfs2-dev, libnotify-dev (>= 0.3.2), libbonobo2-dev, - epiphany-browser-dev (>= 2.22), - epiphany-browser-dev (<< 2.23), + epiphany-browser-dev (>= 2.24), + epiphany-browser-dev (<< 2.25), gnome-pkg-tools Homepage: http://gnome.org/projects/gwget/ Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/packages/unstable/gwget2 @@ -41,8 +41,8 @@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, - epiphany-gecko (>= 2.22), - epiphany-gecko (<< 2.23), + epiphany-gecko (>= 2.24), + epiphany-gecko (<< 2.25), gwget Description: Gwget extension for Epiphany web browser Extension for using gwget as a download manager in Epiphany web diff -u gwget2-0.99/debian/rules gwget2-0.99/debian/rules --- gwget2-0.99/debian/rules +++ gwget2-0.99/debian/rules @@ -19,7 +19,7 @@ DEB_MAKE_CLEAN_TARGET := DEB_CONFIGURE_EXTRA_FLAGS += --enable-epiphany-extension \ - --with-epiphany-version=2.22 + --with-epiphany-version=2.24 post-patches:: touch configure.in && \ diff -u gwget2-0.99/debian/changelog gwget2-0.99/debian/changelog --- gwget2-0.99/debian/changelog +++ gwget2-0.99/debian/changelog @@ -1,3 +1,13 @@ +gwget2 (0.99-3ubuntu2) intrepid; urgency=low + + * Port to epiphany-browser 2.24 (LP: #279202). + - Add patch 61_epi-224, to build with epiphany-browser 2.24. + - Update build-depends to depend on epiphany-browser-dev 2.24. + - Update depends to depend on epiphany-gecko 2.24. + - Pass with-epiphany-version=2.24 option to configure. + + -- Albert Damen Thu, 16 Oct 2008 15:58:23 +0200 + gwget2 (0.99-3ubuntu1) intrepid; urgency=low * Merge from Debian unstable, remaining Ubuntu changes: diff -u gwget2-0.99/debian/control.in gwget2-0.99/debian/control.in --- gwget2-0.99/debian/control.in +++ gwget2-0.99/debian/control.in @@ -15,8 +15,8 @@ libgnomevfs2-dev, libnotify-dev (>= 0.3.2), libbonobo2-dev, - epiphany-browser-dev (>= 2.22), - epiphany-browser-dev (<< 2.23), + epiphany-browser-dev (>= 2.24), + epiphany-browser-dev (<< 2.25), gnome-pkg-tools Homepage: http://gnome.org/projects/gwget/ Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/packages/unstable/gwget2 @@ -41,8 +41,8 @@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, - epiphany-gecko (>= 2.22), - epiphany-gecko (<< 2.23), + epiphany-gecko (>= 2.24), + epiphany-gecko (<< 2.25), gwget Description: Gwget extension for Epiphany web browser Extension for using gwget as a download manager in Epiphany web only in patch2: unchanged: --- gwget2-0.99.orig/debian/patches/61_epi-224.patch +++ gwget2-0.99/debian/patches/61_epi-224.patch @@ -0,0 +1,53 @@ +diff -Nur -x '*.orig' -x '*~' gwget2-0.99/configure gwget2-0.99.new/configure +--- gwget2-0.99/configure 2008-10-16 15:54:23.000000000 +0200 ++++ gwget2-0.99.new/configure 2008-10-16 15:56:08.000000000 +0200 +@@ -22570,7 +22570,9 @@ + + + EPHY_AUTODETECT="(autodetect)" +-if pkg-config --exists epiphany-2.22; then ++if pkg-config --exists epiphany-2.24; then ++ EPHY_VER=2.24 ++elif pkg-config --exists epiphany-2.22; then + EPHY_VER=2.22 + elif pkg-config --exists epiphany-2.18; then + EPHY_VER=2.18 +@@ -22643,6 +22645,10 @@ + EPIPHANY_PKGCONFIG=epiphany-2.22 + EPIPHANY_REQUIRED=2.22 + EPIPHANY_SHORTVER=222 ++elif test "x$EPHY_VER" = "x2.24"; then ++ EPIPHANY_PKGCONFIG=epiphany-2.24 ++ EPIPHANY_REQUIRED=2.24 ++ EPIPHANY_SHORTVER=224 + else + { echo "$as_me:$LINENO: result: no epiphany installed" >&5 + echo "${ECHO_T}no epiphany installed" >&6; } +diff -Nur -x '*.orig' -x '*~' gwget2-0.99/configure.in gwget2-0.99.new/configure.in +--- gwget2-0.99/configure.in 2008-10-16 15:54:23.000000000 +0200 ++++ gwget2-0.99.new/configure.in 2008-10-16 15:56:59.000000000 +0200 +@@ -101,9 +101,11 @@ + [Whether to use epiphany version 1.6 or 1.8 or 1.10 or 2.14 (default 1.6)]), + [EPHY_VER="$withval"]) + +-dnl try to autodetect Epiphany 1.2, 1.4, 1.6, 1.8, 1.10, 2.14, 2.15, 2.16, 2.17 or 2.18, 2.22 ++dnl try to autodetect Epiphany 1.2, 1.4, 1.6, 1.8, 1.10, 2.14, 2.15, 2.16, 2.17 or 2.18, 2.22, 2.24 + EPHY_AUTODETECT="(autodetect)" +-if pkg-config --exists epiphany-2.22; then ++if pkg-config --exists epiphany-2.24; then ++ EPHY_VER=2.24 ++elif pkg-config --exists epiphany-2.22; then + EPHY_VER=2.22 + elif pkg-config --exists epiphany-2.18; then + EPHY_VER=2.18 +@@ -176,6 +178,10 @@ + EPIPHANY_PKGCONFIG=epiphany-2.22 + EPIPHANY_REQUIRED=2.22 + EPIPHANY_SHORTVER=222 ++elif test "x$EPHY_VER" = "x2.24"; then ++ EPIPHANY_PKGCONFIG=epiphany-2.24 ++ EPIPHANY_REQUIRED=2.24 ++ EPIPHANY_SHORTVER=224 + else + AC_MSG_RESULT([no epiphany installed]) + fi