r23952 - in /packages/unstable/gwget2/debian: ./ patches/ source/

pochu at users.alioth.debian.org pochu at users.alioth.debian.org
Thu Apr 22 09:10:23 UTC 2010 

Author: pochu
Date: Thu Apr 22 09:10:16 2010
New Revision: 23952

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=23952
Log:
* ACK NMU, thanks Steffen Joeris!
* debian/patches/02_epiphany_2.30.patch:
  - Cherry pick upstream commit, adds support for Epiphany 2.30.
* debian/patches/fix_epiphany_2.29.patch:
  - Removed, obsoleted by the above patch.
* debian/control.in:
  - Build depend on epiphany-browser-dev >= 2.30 and << 2.31, and make
    the extension package depend on epiphany-browser >= 2.30 and << 2.31.
* All of the above Closes: #577899.
* debian/patches/fix_glib_error_reporting.patch:
  - Moved to debian/patches/01_fix_glib_error_reporting.patch.
  - Forwarded, add headers.
* debian/source/format,
  debian/control.in,
  debian/rules:
  - Switch to source format 3.0 (quilt).
* debian/README.source:
  - Removed, no need for it with source format 3.0 (I don't think it was
    needed just for quilt anyway...).
* debian/control.in:
  - Use spaces consistently.
  - Point Vcs-Browser to viewsvn instead of wsvn.
  - Standards-Version is 3.8.4, no changes needed.

Added:
    packages/unstable/gwget2/debian/patches/01_fix_glib_error_reporting.patch
      - copied, changed from r23737, packages/unstable/gwget2/debian/patches/fix_glib_error_reporting.patch
    packages/unstable/gwget2/debian/patches/02_epiphany_2.30.patch
    packages/unstable/gwget2/debian/source/
    packages/unstable/gwget2/debian/source/format
Removed:
    packages/unstable/gwget2/debian/README.source
    packages/unstable/gwget2/debian/patches/fix_epiphany_2.29.patch
    packages/unstable/gwget2/debian/patches/fix_glib_error_reporting.patch
Modified:
    packages/unstable/gwget2/debian/changelog
    packages/unstable/gwget2/debian/control
    packages/unstable/gwget2/debian/control.in
    packages/unstable/gwget2/debian/patches/series
    packages/unstable/gwget2/debian/rules

Modified: packages/unstable/gwget2/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gwget2/debian/changelog?rev=23952&op=diff
==============================================================================
--- packages/unstable/gwget2/debian/changelog [utf-8] (original)
+++ packages/unstable/gwget2/debian/changelog [utf-8] Thu Apr 22 09:10:16 2010
@@ -1,3 +1,31 @@
+gwget2 (1.0.4-2) UNRELEASED; urgency=low
+
+  * ACK NMU, thanks Steffen Joeris!
+  * debian/patches/02_epiphany_2.30.patch:
+    - Cherry pick upstream commit, adds support for Epiphany 2.30.
+  * debian/patches/fix_epiphany_2.29.patch:
+    - Removed, obsoleted by the above patch.
+  * debian/control.in:
+    - Build depend on epiphany-browser-dev >= 2.30 and << 2.31, and make
+      the extension package depend on epiphany-browser >= 2.30 and << 2.31.
+  * All of the above Closes: #577899.
+  * debian/patches/fix_glib_error_reporting.patch:
+    - Moved to debian/patches/01_fix_glib_error_reporting.patch.
+    - Forwarded, add headers.
+  * debian/source/format,
+    debian/control.in,
+    debian/rules:
+    - Switch to source format 3.0 (quilt).
+  * debian/README.source:
+    - Removed, no need for it with source format 3.0 (I don't think it was
+      needed just for quilt anyway...).
+  * debian/control.in:
+    - Use spaces consistently.
+    - Point Vcs-Browser to viewsvn instead of wsvn.
+    - Standards-Version is 3.8.4, no changes needed.
+
+ -- Emilio Pozuelo Monfort <pochu at debian.org>  Thu, 22 Apr 2010 10:56:12 +0200
+
 gwget2 (1.0.4-1.1) unstable; urgency=low
 
   * Non-maintainer upload

Modified: packages/unstable/gwget2/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gwget2/debian/control?rev=23952&op=diff
==============================================================================
--- packages/unstable/gwget2/debian/control [utf-8] (original)
+++ packages/unstable/gwget2/debian/control [utf-8] Thu Apr 22 09:10:16 2010
@@ -7,7 +7,7 @@
 Section: gnome
 Priority: optional
 Maintainer: Arnaud Fontaine <arnau at debian.org>
-Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Loic Minier <lool at dooz.org>
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Emilio Pozuelo Monfort <pochu at debian.org>, Loic Minier <lool at dooz.org>
 Build-Depends: cdbs (>= 0.4.23-1.1),
                debhelper (>= 5),
                pkg-config,
@@ -16,19 +16,18 @@
                libglade2-dev,
                libxml-parser-perl,
                libgcrypt11-dev,
-	       libglib2.0-dev (>= 2.16.0),
+               libglib2.0-dev (>= 2.16.0),
                libnotify-dev (>= 0.3.2),
                libbonobo2-dev,
-               epiphany-browser-dev (>= 2.29),
-               epiphany-browser-dev (<< 2.30),
+               epiphany-browser-dev (>= 2.30),
+               epiphany-browser-dev (<< 2.31),
                gnome-pkg-tools,
-	       intltool (>= 0.35.0),
-               quilt,
+               intltool (>= 0.35.0),
                libtool
 Homepage: http://gnome.org/projects/gwget/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/packages/unstable/gwget2
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gwget2/?op=log
-Standards-Version: 3.8.3
+Vcs-Browser: http://svn.debian.org/viewsvn/pkg-gnome/packages/unstable/gwget2/
+Standards-Version: 3.8.4
 
 Package: gwget
 Architecture: any
@@ -44,8 +43,8 @@
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
-         epiphany-browser (>= 2.29),
-         epiphany-browser (<< 2.30),
+         epiphany-browser (>= 2.30),
+         epiphany-browser (<< 2.31),
          gwget
 Description: Gwget extension for Epiphany web browser
  Extension for using gwget as a download manager in Epiphany web

Modified: packages/unstable/gwget2/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gwget2/debian/control.in?rev=23952&op=diff
==============================================================================
--- packages/unstable/gwget2/debian/control.in [utf-8] (original)
+++ packages/unstable/gwget2/debian/control.in [utf-8] Thu Apr 22 09:10:16 2010
@@ -11,19 +11,18 @@
                libglade2-dev,
                libxml-parser-perl,
                libgcrypt11-dev,
-	       libglib2.0-dev (>= 2.16.0),
+               libglib2.0-dev (>= 2.16.0),
                libnotify-dev (>= 0.3.2),
                libbonobo2-dev,
-               epiphany-browser-dev (>= 2.29),
-               epiphany-browser-dev (<< 2.30),
+               epiphany-browser-dev (>= 2.30),
+               epiphany-browser-dev (<< 2.31),
                gnome-pkg-tools,
-	       intltool (>= 0.35.0),
-               quilt,
+               intltool (>= 0.35.0),
                libtool
 Homepage: http://gnome.org/projects/gwget/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/packages/unstable/gwget2
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gwget2/?op=log
-Standards-Version: 3.8.3
+Vcs-Browser: http://svn.debian.org/viewsvn/pkg-gnome/packages/unstable/gwget2/
+Standards-Version: 3.8.4
 
 Package: gwget
 Architecture: any
@@ -39,8 +38,8 @@
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
-         epiphany-browser (>= 2.29),
-         epiphany-browser (<< 2.30),
+         epiphany-browser (>= 2.30),
+         epiphany-browser (<< 2.31),
          gwget
 Description: Gwget extension for Epiphany web browser
  Extension for using gwget as a download manager in Epiphany web

Copied: packages/unstable/gwget2/debian/patches/01_fix_glib_error_reporting.patch (from r23737, packages/unstable/gwget2/debian/patches/fix_glib_error_reporting.patch)
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gwget2/debian/patches/01_fix_glib_error_reporting.patch?rev=23952&op=diff
==============================================================================
--- packages/unstable/gwget2/debian/patches/fix_glib_error_reporting.patch [utf-8] (original)
+++ packages/unstable/gwget2/debian/patches/01_fix_glib_error_reporting.patch [utf-8] Thu Apr 22 09:10:16 2010
@@ -1,3 +1,8 @@
+Bug: https://bugzilla.gnome.org/show_bug.cgi?id=616488
+Author: Arnaud Fontaine <arnau at debian.org>
+
+Improve error messages.
+
 diff -urN gwget-1.0.4.orig/src/gwget-application.c gwget-1.0.4/src/gwget-application.c
 --- gwget-1.0.4.orig/src/gwget-application.c	2009-11-30 22:46:12.000000000 +0100
 +++ gwget-1.0.4/src/gwget-application.c	2009-11-30 22:47:13.000000000 +0100

Added: packages/unstable/gwget2/debian/patches/02_epiphany_2.30.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gwget2/debian/patches/02_epiphany_2.30.patch?rev=23952&op=file
==============================================================================
--- packages/unstable/gwget2/debian/patches/02_epiphany_2.30.patch (added)
+++ packages/unstable/gwget2/debian/patches/02_epiphany_2.30.patch [utf-8] Thu Apr 22 09:10:16 2010
@@ -1,0 +1,40 @@
+From b3cb9bcd6f1f64cf60d445c626b8c9e4c9a58a73 Mon Sep 17 00:00:00 2001
+From: Vincent Untz <vuntz at gnome.org>
+Date: Wed, 10 Feb 2010 19:46:56 +0000
+Subject: Support for Epiphany 2.29/2.30
+
+---
+diff --git a/configure.ac b/configure.ac
+index 55dff89..8ebee12 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -102,7 +102,11 @@ AC_ARG_WITH([epiphany-version],
+ 
+ dnl try to autodetect Epiphany 1.2, 1.4, 1.6, 1.8, 1.10, 2.14, 2.15, 2.16, 2.17, 2.18, 2.19, 2.20, 2.21, 2.22, 2.23, 2.24, 2.25, 2.26, 2.27 or 2.28
+ EPHY_AUTODETECT="(autodetect)"
+-if pkg-config --exists epiphany-2.28; then
++if pkg-config --exists epiphany-2.30; then
++        EPHY_VER=2.30
++elif pkg-config --exists epiphany-2.29; then
++        EPHY_VER=2.29
++elif pkg-config --exists epiphany-2.28; then
+         EPHY_VER=2.28
+ elif pkg-config --exists epiphany-2.27; then
+         EPHY_VER=2.27
+@@ -229,6 +233,14 @@ elif test "x$EPHY_VER" = "x2.28"; then
+ 	  EPIPHANY_PKGCONFIG=epiphany-2.28
+           EPIPHANY_REQUIRED=2.28
+ 	  EPIPHANY_SHORTVER=228
++elif test "x$EPHY_VER" = "x2.29"; then
++	  EPIPHANY_PKGCONFIG=epiphany-2.29
++          EPIPHANY_REQUIRED=2.29
++	  EPIPHANY_SHORTVER=229
++elif test "x$EPHY_VER" = "x2.30"; then
++	  EPIPHANY_PKGCONFIG=epiphany-2.30
++          EPIPHANY_REQUIRED=2.30
++	  EPIPHANY_SHORTVER=230
+ else
+      	AC_MSG_RESULT([no epiphany installed])
+ fi
+--
+cgit v0.8.3.1

Modified: packages/unstable/gwget2/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gwget2/debian/patches/series?rev=23952&op=diff
==============================================================================
--- packages/unstable/gwget2/debian/patches/series [utf-8] (original)
+++ packages/unstable/gwget2/debian/patches/series [utf-8] Thu Apr 22 09:10:16 2010
@@ -1,2 +1,2 @@
-fix_glib_error_reporting.patch
-fix_epiphany_2.29.patch
+01_fix_glib_error_reporting.patch
+02_epiphany_2.30.patch

Modified: packages/unstable/gwget2/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gwget2/debian/rules?rev=23952&op=diff
==============================================================================
--- packages/unstable/gwget2/debian/rules [utf-8] (original)
+++ packages/unstable/gwget2/debian/rules [utf-8] Thu Apr 22 09:10:16 2010
@@ -35,7 +35,6 @@
 include /usr/share/cdbs/1/class/gnome.mk
 include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
 -include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
-include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
 GNOME_MODULE := gwget
 

Added: packages/unstable/gwget2/debian/source/format
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gwget2/debian/source/format?rev=23952&op=file
==============================================================================
--- packages/unstable/gwget2/debian/source/format (added)
+++ packages/unstable/gwget2/debian/source/format [utf-8] Thu Apr 22 09:10:16 2010
@@ -1,0 +1,1 @@
+3.0 (quilt)

More information about the pkg-gnome-commits mailing list