r30634 - in /desktop/experimental/epiphany-browser/debian: changelog control control.in patches/05_libexecdir.patch rules

biebl at users.alioth.debian.org biebl at users.alioth.debian.org
Sun Oct 16 20:57:22 UTC 2011 

Author: biebl
Date: Sun Oct 16 20:57:21 2011
New Revision: 30634

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=30634
Log:
* debian/control.in:
  - Drop Build-Depends on libdbus-glib-1-dev (ported to GDBus).
  - Drop Build-Depends on libstartup-notification0-dev.
  - Drop Build-Depends on network-manager-dev.
* debian/rules:
  - Drop obsolete --enable-network-manager configure flag. NetworkManager
    support is enabled unconditionally. As dbus is used to to access
    NetworkManager, this does not add a hard dependency.

Modified:
    desktop/experimental/epiphany-browser/debian/changelog
    desktop/experimental/epiphany-browser/debian/control
    desktop/experimental/epiphany-browser/debian/control.in
    desktop/experimental/epiphany-browser/debian/patches/05_libexecdir.patch
    desktop/experimental/epiphany-browser/debian/rules

Modified: desktop/experimental/epiphany-browser/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-browser/debian/changelog?rev=30634&op=diff
==============================================================================
--- desktop/experimental/epiphany-browser/debian/changelog [utf-8] (original)
+++ desktop/experimental/epiphany-browser/debian/changelog [utf-8] Sun Oct 16 20:57:21 2011
@@ -1,3 +1,16 @@
+epiphany-browser (3.2.0-2) UNRELEASED; urgency=low
+
+  * debian/control.in:
+    - Drop Build-Depends on libdbus-glib-1-dev (ported to GDBus).
+    - Drop Build-Depends on libstartup-notification0-dev.
+    - Drop Build-Depends on network-manager-dev.
+  * debian/rules:
+    - Drop obsolete --enable-network-manager configure flag. NetworkManager
+      support is enabled unconditionally. As dbus is used to to access
+      NetworkManager, this does not add a hard dependency.
+
+ -- Michael Biebl <biebl at debian.org>  Sun, 16 Oct 2011 22:52:43 +0200
+
 epiphany-browser (3.2.0-1) experimental; urgency=low
 
   * New upstream release

Modified: desktop/experimental/epiphany-browser/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-browser/debian/control?rev=30634&op=diff
==============================================================================
--- desktop/experimental/epiphany-browser/debian/control [utf-8] (original)
+++ desktop/experimental/epiphany-browser/debian/control [utf-8] Sun Oct 16 20:57:21 2011
@@ -18,8 +18,6 @@
                libxml2-dev (>= 2.6.12),
                libxslt1-dev (>= 1.1.7),
                libgnome-keyring-dev (>= 2.26.0),
-               libstartup-notification0-dev (>= 0.5),
-               libdbus-glib-1-dev (>= 0.60),
                libsoup-gnome2.4-dev (>= 2.33.1),
                libnss3-dev,
                libnotify-dev (>= 0.5.1),
@@ -35,7 +33,6 @@
                gnome-doc-utils (>= 0.3.2),
                intltool (>= 0.40.0),
                x11proto-core-dev,
-               network-manager-dev [linux-any],
                libavahi-gobject-dev (>= 0.6.22),
                gtk-doc-tools (>= 1.0),
                ca-certificates,

Modified: desktop/experimental/epiphany-browser/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-browser/debian/control.in?rev=30634&op=diff
==============================================================================
--- desktop/experimental/epiphany-browser/debian/control.in [utf-8] (original)
+++ desktop/experimental/epiphany-browser/debian/control.in [utf-8] Sun Oct 16 20:57:21 2011
@@ -13,8 +13,6 @@
                libxml2-dev (>= 2.6.12),
                libxslt1-dev (>= 1.1.7),
                libgnome-keyring-dev (>= 2.26.0),
-               libstartup-notification0-dev (>= 0.5),
-               libdbus-glib-1-dev (>= 0.60),
                libsoup-gnome2.4-dev (>= 2.33.1),
                libnss3-dev,
                libnotify-dev (>= 0.5.1),
@@ -30,7 +28,6 @@
                gnome-doc-utils (>= 0.3.2),
                intltool (>= 0.40.0),
                x11proto-core-dev,
-               network-manager-dev [linux-any],
                libavahi-gobject-dev (>= 0.6.22),
                gtk-doc-tools (>= 1.0),
                ca-certificates,

Modified: desktop/experimental/epiphany-browser/debian/patches/05_libexecdir.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-browser/debian/patches/05_libexecdir.patch?rev=30634&op=diff
==============================================================================
--- desktop/experimental/epiphany-browser/debian/patches/05_libexecdir.patch [utf-8] (original)
+++ desktop/experimental/epiphany-browser/debian/patches/05_libexecdir.patch [utf-8] Sun Oct 16 20:57:21 2011
@@ -1,7 +1,7 @@
-Index: epiphany-browser-2.91.92/data/epiphany.pc.in
+Index: epiphany-3.2.0/data/epiphany.pc.in
 ===================================================================
---- epiphany-browser-2.91.92.orig/data/epiphany.pc.in	2010-08-26 09:39:47.000000000 -0300
-+++ epiphany-browser-2.91.92/data/epiphany.pc.in	2011-03-31 23:48:14.240572472 -0300
+--- epiphany-3.2.0.orig/data/epiphany.pc.in	2011-04-20 05:49:50.000000000 +0200
++++ epiphany-3.2.0/data/epiphany.pc.in	2011-10-16 22:51:00.476170217 +0200
 @@ -2,8 +2,8 @@
  exec_prefix=@exec_prefix@
  libdir=@libdir@
@@ -13,11 +13,11 @@
  datarootdir=@datarootdir@
  datadir=@datadir@
  icondir=@datadir@/@PACKAGE@/icons
-Index: epiphany-browser-2.91.92/lib/Makefile.am
+Index: epiphany-3.2.0/lib/Makefile.am
 ===================================================================
---- epiphany-browser-2.91.92.orig/lib/Makefile.am	2011-02-27 19:30:27.000000000 -0300
-+++ epiphany-browser-2.91.92/lib/Makefile.am	2011-03-31 23:48:14.240572472 -0300
-@@ -80,7 +80,7 @@
+--- epiphany-3.2.0.orig/lib/Makefile.am	2011-09-05 20:40:31.000000000 +0200
++++ epiphany-3.2.0/lib/Makefile.am	2011-10-16 22:51:00.484170115 +0200
+@@ -83,7 +83,7 @@
  	-I$(top_srcdir)/lib/egg			\
  	-DDATADIR="\"$(datadir)\""		\
  	-DSHARE_DIR=\"$(pkgdatadir)\" 		\
@@ -26,11 +26,11 @@
  	$(AM_CPPFLAGS)
  
  libephymisc_la_CFLAGS = \
-Index: epiphany-browser-2.91.92/src/Makefile.am
+Index: epiphany-3.2.0/src/Makefile.am
 ===================================================================
---- epiphany-browser-2.91.92.orig/src/Makefile.am	2011-03-07 17:38:38.000000000 -0300
-+++ epiphany-browser-2.91.92/src/Makefile.am	2011-03-31 23:48:14.244572529 -0300
-@@ -104,8 +104,8 @@
+--- epiphany-3.2.0.orig/src/Makefile.am	2011-09-27 12:46:58.000000000 +0200
++++ epiphany-3.2.0/src/Makefile.am	2011-10-16 22:51:00.504169863 +0200
+@@ -99,8 +99,8 @@
  	-I$(top_srcdir)/lib/egg		\
  	-I$(top_srcdir)/lib/widgets   	\
  	-I$(top_srcdir)/src/bookmarks   \

Modified: desktop/experimental/epiphany-browser/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-browser/debian/rules?rev=30634&op=diff
==============================================================================
--- desktop/experimental/epiphany-browser/debian/rules [utf-8] (original)
+++ desktop/experimental/epiphany-browser/debian/rules [utf-8] Sun Oct 16 20:57:21 2011
@@ -25,11 +25,6 @@
 		--enable-seed
 endif
 
-ifeq ($(DEB_HOST_ARCH_OS),linux)
-DEB_CONFIGURE_EXTRA_FLAGS += \
-		--enable-network-manager
-endif
-
 DEB_DH_INSTALLCHANGELOGS_ARGS_ALL := --no-act
 DEB_INSTALL_DOCS_ALL := --no-act
 DEB_DH_GIREPOSITORY_ARGS_ALL += -lsrc

More information about the pkg-gnome-commits mailing list