r11258 - in /desktop/unstable/epiphany-browser/debian: ./ patches/
joss at users.alioth.debian.org
joss at users.alioth.debian.org
Sat Jun 2 10:35:10 UTC 2007
Author: joss
Date: Sat Jun 2 10:35:09 2007
New Revision: 11258
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=11258
Log:
* Fix watch file.
* Split translations and data files in a separate
epiphany-browser-data package.
+ Include gnome-version.mk for ${gnome:Version}.
* Ship debugging symbols in epiphany-browser-dbg (closes: #425290).
+ debian/compat: use debhelper mode 5.
+ Build-depend on debhelper 5.
* Wrap depends and build-depends.
* Improve descriptions a bit.
* Use ${binary:Version}.
* Replace some file moves in debian/rules by correct .install files.
* README: removed, obsolete.
* New upstream translation and bugfix release.
* 02_ac_init.patch: updated.
* 04_move_tabs.patch: disabled for the moment, it doesn't work.
* 08_load_on_new_tab.patch: ditto.
* 99_configure.patch: refreshed.
Added:
desktop/unstable/epiphany-browser/debian/compat
desktop/unstable/epiphany-browser/debian/epiphany-browser-data.gconf-defaults
- copied unchanged from r11150, desktop/unstable/epiphany-browser/debian/epiphany-browser.gconf-defaults
desktop/unstable/epiphany-browser/debian/epiphany-browser-data.install
Removed:
desktop/unstable/epiphany-browser/debian/README
desktop/unstable/epiphany-browser/debian/epiphany-browser.dirs
desktop/unstable/epiphany-browser/debian/epiphany-browser.gconf-defaults
Modified:
desktop/unstable/epiphany-browser/debian/changelog
desktop/unstable/epiphany-browser/debian/control
desktop/unstable/epiphany-browser/debian/control.in
desktop/unstable/epiphany-browser/debian/epiphany-browser.install
desktop/unstable/epiphany-browser/debian/epiphany-browser.links
desktop/unstable/epiphany-browser/debian/patches/02_ac_init.patch
desktop/unstable/epiphany-browser/debian/patches/99_configure.patch
desktop/unstable/epiphany-browser/debian/patches/series
desktop/unstable/epiphany-browser/debian/rules
Modified: desktop/unstable/epiphany-browser/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-browser/debian/changelog?rev=11258&op=diff
==============================================================================
--- desktop/unstable/epiphany-browser/debian/changelog (original)
+++ desktop/unstable/epiphany-browser/debian/changelog Sat Jun 2 10:35:09 2007
@@ -1,13 +1,29 @@
-epiphany-browser (2.18.1-4) UNRELEASED; urgency=low
-
- [ Josselin Mouette ]
- * Fix watch file.
+epiphany-browser (2.18.2-1) unstable; urgency=low
[ Sam Morris ]
* Drop 11_spell-checker-for-1.8.0.patch now that xulrunner 1.8.1 is
available. Also bump build-depends appropriately. Closes: #414558.
- -- Sam Morris <sam at robots.org.uk> Sat, 26 May 2007 22:14:22 +0100
+ [ Josselin Mouette ]
+ * Fix watch file.
+ * Split translations and data files in a separate
+ epiphany-browser-data package.
+ + Include gnome-version.mk for ${gnome:Version}.
+ * Ship debugging symbols in epiphany-browser-dbg (closes: #425290).
+ + debian/compat: use debhelper mode 5.
+ + Build-depend on debhelper 5.
+ * Wrap depends and build-depends.
+ * Improve descriptions a bit.
+ * Use ${binary:Version}.
+ * Replace some file moves in debian/rules by correct .install files.
+ * README: removed, obsolete.
+ * New upstream translation and bugfix release.
+ * 02_ac_init.patch: updated.
+ * 04_move_tabs.patch: disabled for the moment, it doesn't work.
+ * 08_load_on_new_tab.patch: ditto.
+ * 99_configure.patch: refreshed.
+
+ -- Josselin Mouette <joss at debian.org> Sat, 02 Jun 2007 11:56:53 +0200
epiphany-browser (2.18.1-3) unstable; urgency=low
Added: desktop/unstable/epiphany-browser/debian/compat
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-browser/debian/compat?rev=11258&op=file
==============================================================================
--- desktop/unstable/epiphany-browser/debian/compat (added)
+++ desktop/unstable/epiphany-browser/debian/compat Sat Jun 2 10:35:09 2007
@@ -1,0 +1,1 @@
+5
Modified: desktop/unstable/epiphany-browser/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-browser/debian/control?rev=11258&op=diff
==============================================================================
--- desktop/unstable/epiphany-browser/debian/control (original)
+++ desktop/unstable/epiphany-browser/debian/control Sat Jun 2 10:35:09 2007
@@ -3,18 +3,54 @@
Priority: optional
Maintainer: Josselin Mouette <joss at debian.org>
Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Loic Minier <lool at dooz.org>, Sebastian Dröge <slomo at debian.org>
-Build-Depends: debhelper (>= 4.2.22), pkg-config, libglade2-dev (>= 2.3.1), libglib2.0-dev (>= 2.12.0), libgtk2.0-dev (>= 2.10.0), libgnomeui-dev (>= 2.16.0-2), libgconf2-dev, libgnomevfs2-dev (>= 2.9.2), libstartup-notification0-dev (>= 0.5), libpango1.0-dev (>= 1.8.0), scrollkeeper, cdbs (>= 0.4.17), libgnome-desktop-dev (>= 2.9.91), libxml2-dev (>= 2.6.12), libxslt1-dev (>= 1.1.7), gnome-pkg-tools (>= 0.10), libxml-parser-perl, libgnome2-dev (>= 2.14.0), libxul-dev (>= 1.8.1), iso-codes (>= 0.35), libdbus-glib-1-dev (>= 0.60), python-dev (>= 2.3), python-gtk2-dev (>= 2.7.1), python-gnome2-dev (>= 2.6.0), gnome-doc-utils (>= 0.3.2), intltool (>= 0.35.0), x11proto-core-dev, network-manager-dev, quilt, libenchant-dev (>= 1.0)
+Build-Depends: debhelper (>= 5),
+ pkg-config,
+ libglade2-dev (>= 2.3.1),
+ libglib2.0-dev (>= 2.12.0),
+ libgtk2.0-dev (>= 2.10.0),
+ libgnomeui-dev (>= 2.16.0-2),
+ libgconf2-dev,
+ libgnomevfs2-dev (>= 2.9.2),
+ libstartup-notification0-dev (>= 0.5),
+ libpango1.0-dev (>= 1.8.0),
+ scrollkeeper,
+ cdbs (>= 0.4.17),
+ libgnome-desktop-dev (>= 2.9.91),
+ libxml2-dev (>= 2.6.12),
+ libxslt1-dev (>= 1.1.7),
+ gnome-pkg-tools (>= 0.10),
+ libxml-parser-perl,
+ libgnome2-dev (>= 2.14.0),
+ libxul-dev (>= 1.8.1),
+ iso-codes (>= 0.35),
+ libdbus-glib-1-dev (>= 0.60),
+ python-dev (>= 2.3),
+ python-gtk2-dev (>= 2.7.1),
+ python-gnome2-dev (>= 2.6.0),
+ gnome-doc-utils (>= 0.3.2),
+ intltool (>= 0.35.0),
+ x11proto-core-dev,
+ network-manager-dev,
+ quilt,
+ libenchant-dev (>= 1.0)
Standards-Version: 3.7.2
Package: epiphany-browser
Architecture: any
-Depends: ${shlibs:Depends}, gnome-icon-theme (>= 2.9.90), dbus, iso-codes, xulrunner-gnome-support, ${misc:Depends}
+Depends: epiphany-browser-data (>= ${gnome:Version}),
+ epiphany-browser-data (<< ${gnome:NextVersion}),
+ ${shlibs:Depends},
+ gnome-icon-theme (>= 2.9.90),
+ dbus,
+ iso-codes,
+ xulrunner-gnome-support,
+ ${misc:Depends}
Conflicts: epiphany-extensions (<< 2.16)
Recommends: yelp, epiphany-extensions
Suggests: mozplugger
Provides: www-browser, gnome-www-browser
Description: Intuitive GNOME web browser
- A simple yet powerful GNOME web browser targeted at
+ Epiphany is a simple yet powerful GNOME web browser targeted at
non-technical users. Its principles are simplicity and standards
compliance. Simplicity is achieved by a well designed user interface and
reliance on external applications for performing external tasks (such as
@@ -23,11 +59,41 @@
rendering engine, as developed for the Mozilla and Iceweasel browsers; and
on the user interface side by closely following the GNOME Human Interface
Guidelines (HIG) and by close integration with the GNOME desktop.
+ .
+ Homepage: http://www.gnome.org/projects/epiphany/
+
+Package: epiphany-browser-data
+Architecture: all
+Depends: ${misc:Depends}
+Recommends: epiphany-browser
+Conflicts: epiphany-browser (<< 2.18.2-1)
+Description: Data files for the GNOME web browser
+ Epiphany is a simple yet powerful GNOME web browser targeted at
+ non-technical users. Its principles are simplicity and standards
+ compliance.
+ .
+ This package contains the common files, artwork and translations for
+ Epiphany.
Package: epiphany-browser-dev
Architecture: all
Section: devel
-Depends: epiphany-browser (>= ${Source-Version}), libgnomeui-dev (>= 2.16.0-2)
-Description: Development files for Epiphany web browser
- This package is required to develop extensions for the GNOME Epiphany
- web browser.
+Depends: epiphany-browser (>= ${binary:Version}), libgnomeui-dev (>= 2.16.0-2)
+Description: Development files for the GNOME web browser
+ Epiphany is a simple yet powerful GNOME web browser targeted at
+ non-technical users. Its principles are simplicity and standards
+ compliance.
+ .
+ This package is required to develop extensions for Epiphany.
+
+Package: epiphany-browser-dbg
+Architecture: any
+Section: gnome
+Priority: extra
+Depends: epiphany-browser (= ${binary:Version})
+Description: Debugging symbols for the GNOME web browser
+ Epiphany is a simple yet powerful GNOME web browser targeted at
+ non-technical users. Its principles are simplicity and standards
+ compliance.
+ .
+ This package contains detached debugging symbols.
Modified: desktop/unstable/epiphany-browser/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-browser/debian/control.in?rev=11258&op=diff
==============================================================================
--- desktop/unstable/epiphany-browser/debian/control.in (original)
+++ desktop/unstable/epiphany-browser/debian/control.in Sat Jun 2 10:35:09 2007
@@ -3,18 +3,54 @@
Priority: optional
Maintainer: Josselin Mouette <joss at debian.org>
Uploaders: @GNOME_TEAM@
-Build-Depends: debhelper (>= 4.2.22), pkg-config, libglade2-dev (>= 2.3.1), libglib2.0-dev (>= 2.12.0), libgtk2.0-dev (>= 2.10.0), libgnomeui-dev (>= 2.16.0-2), libgconf2-dev, libgnomevfs2-dev (>= 2.9.2), libstartup-notification0-dev (>= 0.5), libpango1.0-dev (>= 1.8.0), scrollkeeper, cdbs (>= 0.4.17), libgnome-desktop-dev (>= 2.9.91), libxml2-dev (>= 2.6.12), libxslt1-dev (>= 1.1.7), gnome-pkg-tools (>= 0.10), libxml-parser-perl, libgnome2-dev (>= 2.14.0), libxul-dev (>= 1.8.1), iso-codes (>= 0.35), libdbus-glib-1-dev (>= 0.60), python-dev (>= 2.3), python-gtk2-dev (>= 2.7.1), python-gnome2-dev (>= 2.6.0), gnome-doc-utils (>= 0.3.2), intltool (>= 0.35.0), x11proto-core-dev, network-manager-dev, quilt, libenchant-dev (>= 1.0)
+Build-Depends: debhelper (>= 5),
+ pkg-config,
+ libglade2-dev (>= 2.3.1),
+ libglib2.0-dev (>= 2.12.0),
+ libgtk2.0-dev (>= 2.10.0),
+ libgnomeui-dev (>= 2.16.0-2),
+ libgconf2-dev,
+ libgnomevfs2-dev (>= 2.9.2),
+ libstartup-notification0-dev (>= 0.5),
+ libpango1.0-dev (>= 1.8.0),
+ scrollkeeper,
+ cdbs (>= 0.4.17),
+ libgnome-desktop-dev (>= 2.9.91),
+ libxml2-dev (>= 2.6.12),
+ libxslt1-dev (>= 1.1.7),
+ gnome-pkg-tools (>= 0.10),
+ libxml-parser-perl,
+ libgnome2-dev (>= 2.14.0),
+ libxul-dev (>= 1.8.1),
+ iso-codes (>= 0.35),
+ libdbus-glib-1-dev (>= 0.60),
+ python-dev (>= 2.3),
+ python-gtk2-dev (>= 2.7.1),
+ python-gnome2-dev (>= 2.6.0),
+ gnome-doc-utils (>= 0.3.2),
+ intltool (>= 0.35.0),
+ x11proto-core-dev,
+ network-manager-dev,
+ quilt,
+ libenchant-dev (>= 1.0)
Standards-Version: 3.7.2
Package: epiphany-browser
Architecture: any
-Depends: ${shlibs:Depends}, gnome-icon-theme (>= 2.9.90), dbus, iso-codes, xulrunner-gnome-support, ${misc:Depends}
+Depends: epiphany-browser-data (>= ${gnome:Version}),
+ epiphany-browser-data (<< ${gnome:NextVersion}),
+ ${shlibs:Depends},
+ gnome-icon-theme (>= 2.9.90),
+ dbus,
+ iso-codes,
+ xulrunner-gnome-support,
+ ${misc:Depends}
Conflicts: epiphany-extensions (<< 2.16)
Recommends: yelp, epiphany-extensions
Suggests: mozplugger
Provides: www-browser, gnome-www-browser
Description: Intuitive GNOME web browser
- A simple yet powerful GNOME web browser targeted at
+ Epiphany is a simple yet powerful GNOME web browser targeted at
non-technical users. Its principles are simplicity and standards
compliance. Simplicity is achieved by a well designed user interface and
reliance on external applications for performing external tasks (such as
@@ -23,11 +59,41 @@
rendering engine, as developed for the Mozilla and Iceweasel browsers; and
on the user interface side by closely following the GNOME Human Interface
Guidelines (HIG) and by close integration with the GNOME desktop.
+ .
+ Homepage: http://www.gnome.org/projects/epiphany/
+
+Package: epiphany-browser-data
+Architecture: all
+Depends: ${misc:Depends}
+Recommends: epiphany-browser
+Conflicts: epiphany-browser (<< 2.18.2-1)
+Description: Data files for the GNOME web browser
+ Epiphany is a simple yet powerful GNOME web browser targeted at
+ non-technical users. Its principles are simplicity and standards
+ compliance.
+ .
+ This package contains the common files, artwork and translations for
+ Epiphany.
Package: epiphany-browser-dev
Architecture: all
Section: devel
-Depends: epiphany-browser (>= ${Source-Version}), libgnomeui-dev (>= 2.16.0-2)
-Description: Development files for Epiphany web browser
- This package is required to develop extensions for the GNOME Epiphany
- web browser.
+Depends: epiphany-browser (>= ${binary:Version}), libgnomeui-dev (>= 2.16.0-2)
+Description: Development files for the GNOME web browser
+ Epiphany is a simple yet powerful GNOME web browser targeted at
+ non-technical users. Its principles are simplicity and standards
+ compliance.
+ .
+ This package is required to develop extensions for Epiphany.
+
+Package: epiphany-browser-dbg
+Architecture: any
+Section: gnome
+Priority: extra
+Depends: epiphany-browser (= ${binary:Version})
+Description: Debugging symbols for the GNOME web browser
+ Epiphany is a simple yet powerful GNOME web browser targeted at
+ non-technical users. Its principles are simplicity and standards
+ compliance.
+ .
+ This package contains detached debugging symbols.
Added: desktop/unstable/epiphany-browser/debian/epiphany-browser-data.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-browser/debian/epiphany-browser-data.install?rev=11258&op=file
==============================================================================
--- desktop/unstable/epiphany-browser/debian/epiphany-browser-data.install (added)
+++ desktop/unstable/epiphany-browser/debian/epiphany-browser-data.install Sat Jun 2 10:35:09 2007
@@ -1,0 +1,12 @@
+debian/tmp/etc/gconf
+debian/tmp/usr/share/epiphany-browser/ep*
+debian/tmp/usr/share/epiphany-browser/*.ini
+debian/tmp/usr/share/epiphany-browser/art
+debian/tmp/usr/share/epiphany-browser/chrome
+debian/tmp/usr/share/epiphany-browser/glade
+debian/tmp/usr/share/epiphany-browser/icons
+debian/tmp/usr/share/dbus-1
+debian/tmp/usr/share/gnome/help/epiphany/* /usr/share/gnome/help/epiphany-browser/
+debian/tmp/usr/share/omf/epiphany/* /usr/share/omf/epiphany-browser/
+debian/tmp/usr/share/icons
+debian/tmp/usr/share/locale
Modified: desktop/unstable/epiphany-browser/debian/epiphany-browser.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-browser/debian/epiphany-browser.install?rev=11258&op=diff
==============================================================================
--- desktop/unstable/epiphany-browser/debian/epiphany-browser.install (original)
+++ desktop/unstable/epiphany-browser/debian/epiphany-browser.install Sat Jun 2 10:35:09 2007
@@ -1,11 +1,6 @@
debian/tmp/usr/bin
debian/tmp/usr/lib/epiphany
-debian/tmp/etc
debian/tmp/usr/share/applications
-debian/tmp/usr/share/epiphany-browser
-debian/tmp/usr/share/dbus-1
-debian/tmp/usr/share/gnome
-debian/tmp/usr/share/icons
-debian/tmp/usr/share/locale
debian/tmp/usr/share/man
-debian/tmp/usr/share/omf
+debian/tmp/usr/share/epiphany-browser/mime-types-permissions.xml /etc/gnome/epiphany/
+debian/tmp/usr/share/epiphany-browser/default-prefs.js /etc/gnome/epiphany/
Modified: desktop/unstable/epiphany-browser/debian/epiphany-browser.links
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-browser/debian/epiphany-browser.links?rev=11258&op=diff
==============================================================================
--- desktop/unstable/epiphany-browser/debian/epiphany-browser.links (original)
+++ desktop/unstable/epiphany-browser/debian/epiphany-browser.links Sat Jun 2 10:35:09 2007
@@ -1,2 +1,4 @@
/usr/bin/epiphany /usr/bin/epiphany-browser
/usr/share/man/man1/epiphany.1.gz /usr/share/man/man1/epiphany-browser.1.gz
+/etc/gnome/epiphany/mime-types-permissions.xml /usr/share/epiphany-browser/mime-types-permissions.xml
+/etc/gnome/epiphany/default-prefs.js /usr/share/epiphany-browser/default-prefs.js
Modified: desktop/unstable/epiphany-browser/debian/patches/02_ac_init.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-browser/debian/patches/02_ac_init.patch?rev=11258&op=diff
==============================================================================
--- desktop/unstable/epiphany-browser/debian/patches/02_ac_init.patch (original)
+++ desktop/unstable/epiphany-browser/debian/patches/02_ac_init.patch Sat Jun 2 10:35:09 2007
@@ -6,8 +6,8 @@
# with this program; if not, write to the Free Software Foundation, Inc.,
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
--AC_INIT([GNOME Web Browser],[2.18.1],[http://bugzilla.gnome.org/enter_bug.cgi?product=epiphany],[epiphany])
-+AC_INIT([GNOME Web Browser],[2.18.1],[http://bugzilla.gnome.org/enter_bug.cgi?product=epiphany],[epiphany-browser])
+-AC_INIT([GNOME Web Browser],[2.18.2],[http://bugzilla.gnome.org/enter_bug.cgi?product=epiphany],[epiphany])
++AC_INIT([GNOME Web Browser],[2.18.2],[http://bugzilla.gnome.org/enter_bug.cgi?product=epiphany],[epiphany-browser])
GNOME_COMMON_INIT
Modified: desktop/unstable/epiphany-browser/debian/patches/99_configure.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-browser/debian/patches/99_configure.patch?rev=11258&op=diff
==============================================================================
--- desktop/unstable/epiphany-browser/debian/patches/99_configure.patch (original)
+++ desktop/unstable/epiphany-browser/debian/patches/99_configure.patch Sat Jun 2 10:35:09 2007
@@ -1,10 +1,12 @@
---- epiphany-browser-2.18.1-old/configure 2007-04-09 14:16:39.000000000 +0200
-+++ epiphany-browser-2.18.1/configure 2007-04-25 01:32:44.000000000 +0200
+Index: epiphany-2.18.2/configure
+===================================================================
+--- epiphany-2.18.2.orig/configure 2007-05-28 19:54:58.000000000 +0200
++++ epiphany-2.18.2/configure 2007-06-02 11:56:11.858405000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
--# Generated by GNU Autoconf 2.60 for GNOME Web Browser 2.18.1.
-+# Generated by GNU Autoconf 2.61 for GNOME Web Browser 2.18.1.
+-# Generated by GNU Autoconf 2.60 for GNOME Web Browser 2.18.2.
++# Generated by GNU Autoconf 2.61 for GNOME Web Browser 2.18.2.
#
# Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=epiphany>.
#
@@ -138,8 +140,8 @@
PACKAGE_NAME='GNOME Web Browser'
-PACKAGE_TARNAME='epiphany'
+PACKAGE_TARNAME='epiphany-browser'
- PACKAGE_VERSION='2.18.1'
- PACKAGE_STRING='GNOME Web Browser 2.18.1'
+ PACKAGE_VERSION='2.18.2'
+ PACKAGE_STRING='GNOME Web Browser 2.18.2'
PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=epiphany'
@@ -721,36 +736,36 @@
# Factoring default headers for most tests.
@@ -266,7 +268,7 @@
@@ -1771,7 +1788,7 @@
if $ac_init_version; then
cat <<\_ACEOF
- GNOME Web Browser configure 2.18.1
+ GNOME Web Browser configure 2.18.2
-generated by GNU Autoconf 2.60
+generated by GNU Autoconf 2.61
@@ -275,7 +277,7 @@
@@ -1785,7 +1802,7 @@
running configure, to aid debugging if configure makes a mistake.
- It was created by GNOME Web Browser $as_me 2.18.1, which was
+ It was created by GNOME Web Browser $as_me 2.18.2, which was
-generated by GNU Autoconf 2.60. Invocation command line was
+generated by GNU Autoconf 2.61. Invocation command line was
@@ -320,7 +322,7 @@
# Define the identity of the package.
- PACKAGE='epiphany'
+ PACKAGE='epiphany-browser'
- VERSION='2.18.1'
+ VERSION='2.18.2'
@@ -2543,7 +2552,7 @@
@@ -4222,7 +4224,7 @@
@@ -30992,7 +29627,7 @@
# values after options handling.
ac_log="
- This file was extended by GNOME Web Browser $as_me 2.18.1, which was
+ This file was extended by GNOME Web Browser $as_me 2.18.2, which was
-generated by GNU Autoconf 2.60. Invocation command line was
+generated by GNU Autoconf 2.61. Invocation command line was
@@ -4240,7 +4242,7 @@
@@ -31045,7 +29680,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
- GNOME Web Browser config.status 2.18.1
+ GNOME Web Browser config.status 2.18.2
-configured by $0, generated by GNU Autoconf 2.60,
+configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
Modified: desktop/unstable/epiphany-browser/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-browser/debian/patches/series?rev=11258&op=diff
==============================================================================
--- desktop/unstable/epiphany-browser/debian/patches/series (original)
+++ desktop/unstable/epiphany-browser/debian/patches/series Sat Jun 2 10:35:09 2007
@@ -2,10 +2,10 @@
01_bookmarks_menu.patch
02_ac_init.patch
03_dbus.patch
-04_move_tabs.patch
+#04_move_tabs.patch
06_ssl_weak_ciphers.patch
07_bookmarks.patch
-08_load_on_new_tab.patch
+#08_load_on_new_tab.patch
09_download_dialog.patch -p0
10_url_double-click.patch
99_configure.patch
Modified: desktop/unstable/epiphany-browser/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-browser/debian/rules?rev=11258&op=diff
==============================================================================
--- desktop/unstable/epiphany-browser/debian/rules (original)
+++ desktop/unstable/epiphany-browser/debian/rules Sat Jun 2 10:35:09 2007
@@ -5,6 +5,7 @@
include /usr/share/cdbs/1/rules/patchsys-quilt.mk
include /usr/share/cdbs/1/rules/utils.mk
include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
+include /usr/share/gnome-pkg-tools/1/rules/gnome-version.mk
-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
GNOME_MODULE := epiphany
@@ -17,6 +18,8 @@
--with-mozilla=xulrunner \
--enable-network-manager \
--enable-spell-checker
+
+DEB_DH_STRIP_ARGS += --dbg-package=epiphany-browser-dbg
clean::
rm -f po/.intltool-merge-cache
@@ -36,18 +39,7 @@
clean::
rm -rf debian/pkg-config
-binary-install/epiphany-browser::
- # Configuration files
- for file in default-prefs.js mime-types-permissions.xml; do \
- mv debian/epiphany-browser/usr/share/epiphany-browser/$$file debian/epiphany-browser/etc/gnome/epiphany/ ; \
- ln -s /etc/gnome/epiphany/$$file debian/epiphany-browser/usr/share/epiphany-browser/$$file ; \
- done
-
-binary-predeb/epiphany-browser::
- mv debian/epiphany-browser/usr/share/gnome/help/epiphany \
- debian/epiphany-browser/usr/share/gnome/help/epiphany-browser
- mv debian/epiphany-browser/usr/share/omf/epiphany \
- debian/epiphany-browser/usr/share/omf/epiphany-browser
- # temp fix, correct help file path in .omf files
- find debian/epiphany-browser/usr/share/omf/epiphany-browser/ \
+binary-predeb/epiphany-browser-data::
+ # Correct help file path in .omf files
+ find debian/epiphany-browser-data/usr/share/omf/epiphany-browser/ \
-name "*.omf" -exec perl -pi -e 's#/usr/share/gnome/help/epiphany/#/usr/share/gnome/help/epiphany-browser/#' {} \;
More information about the pkg-gnome-commits
mailing list