r26309 - in /desktop/experimental/epiphany-browser: ./ debian/ debian/patches/ debian/source/
bigon at users.alioth.debian.org
bigon at users.alioth.debian.org
Sun Jan 16 02:08:09 UTC 2011
Author: bigon
Date: Sun Jan 16 02:07:53 2011
New Revision: 26309
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=26309
Log:
Merge with unstable branch
Added:
desktop/experimental/epiphany-browser/debian/epiphany-browser-data.install
- copied unchanged from r24668, desktop/unstable/epiphany-browser/debian/epiphany-browser-data.install
desktop/experimental/epiphany-browser/debian/epiphany-browser-dev.install
- copied unchanged from r24668, desktop/unstable/epiphany-browser/debian/epiphany-browser-dev.install
desktop/experimental/epiphany-browser/debian/patches/00_epiphany-browser.patch
- copied unchanged from r24668, desktop/unstable/epiphany-browser/debian/patches/00_epiphany-browser.patch
desktop/experimental/epiphany-browser/debian/patches/14_download_nautilus.patch
- copied unchanged from r26308, desktop/unstable/epiphany-browser/debian/patches/14_download_nautilus.patch
desktop/experimental/epiphany-browser/debian/source/
desktop/experimental/epiphany-browser/debian/source/format
Removed:
desktop/experimental/epiphany-browser/debian/epiphany-browser-data.dirs
desktop/experimental/epiphany-browser/debian/epiphany-browser-dev.dirs
desktop/experimental/epiphany-browser/debian/patches/00_browser_wrapper_path.patch
desktop/experimental/epiphany-browser/debian/patches/02_ac_init.patch
Modified:
desktop/experimental/epiphany-browser/ (props changed)
desktop/experimental/epiphany-browser/debian/changelog
desktop/experimental/epiphany-browser/debian/control
desktop/experimental/epiphany-browser/debian/control.in
desktop/experimental/epiphany-browser/debian/epiphany-browser.install
desktop/experimental/epiphany-browser/debian/patches/05_libexecdir.patch
desktop/experimental/epiphany-browser/debian/patches/12_safetypes.patch (props changed)
desktop/experimental/epiphany-browser/debian/patches/series
desktop/experimental/epiphany-browser/debian/rules
Propchange: desktop/experimental/epiphany-browser/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Jan 16 02:07:53 2011
@@ -1,1 +1,1 @@
-/desktop/unstable/epiphany-browser:24669-24920
+/desktop/unstable/epiphany-browser:24389-26308
Modified: desktop/experimental/epiphany-browser/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-browser/debian/changelog?rev=26309&op=diff
==============================================================================
--- desktop/experimental/epiphany-browser/debian/changelog [utf-8] (original)
+++ desktop/experimental/epiphany-browser/debian/changelog [utf-8] Sun Jan 16 02:07:53 2011
@@ -10,7 +10,46 @@
-- Gustavo Noronha Silva <kov at debian.org> Thu, 13 Jan 2011 15:43:11 -0200
-epiphany-browser (2.31.5-1) experimental; urgency=low
+epiphany-browser (2.30.6-1) unstable; urgency=low
+
+ * debian/rules: revert the desktop name change from 2.30.2-4. It
+ breaks gnome-panel, and it is arguably a bug in gnome-shell not to
+ take into account the previous fix (g_set_prgname).
+ * New upstream translation and bugfix release.
+ * 99_autoreconf.patch: refreshed.
+
+ -- Josselin Mouette <joss at debian.org> Fri, 17 Sep 2010 08:13:26 +0200
+
+epiphany-browser (2.30.5-1) unstable; urgency=low
+
+ * New upstream bugfix release:
+ + debian/patches/13_accept-languages.patch:
+ - Dropped, merged upstream.
+ + debian/patches/14_download_nautilus.patch,
+ debian/patches/99_autoreconf.patch,
+ debian/patches/99_ltmain_as-needed.patch:
+ - Refreshed.
+
+ -- Sebastian Dröge <slomo at debian.org> Sun, 05 Sep 2010 12:19:40 +0200
+
+epiphany-browser (2.30.3-1) unstable; urgency=low
+
+ [ Josselin Mouette ]
+ * 14_download_nautilus.patch: don’t open nautilus every time a file is
+ saved. This is simply annoying.
+
+ [ Sebastian Dröge ]
+ * New upstream bugfix release:
+ + debian/control.in:
+ - Build depend on WebKit >= 1.2.3.
+ + debian/patches/05_libexecdir.patch,
+ debian/patches/14_download_nautilus.patch,
+ debian/patches/99_autoreconf.patch:
+ - Refreshed.
+
+ -- Sebastian Dröge <slomo at debian.org> Wed, 18 Aug 2010 20:06:24 +0200
+
+epiphany-browser (2.30.2-4) unstable; urgency=low
* debian/rules:
- rename desktop file to epiphany-browser.desktop so that GNOME Shell is
@@ -26,12 +65,37 @@
-- Sebastian Dröge <slomo at debian.org> Tue, 25 May 2010 21:49:45 +0200
+epiphany-browser (2.30.2-3) unstable; urgency=low
+
+ * Stop renaming help files paths. Closes: #586721.
+ * Drop type-handling usage. Closes: #587864.
+ * Bump standards version accordingly.
+ * 13_accept-languages.patch: patch from Mario Sanchez Prada, with a
+ small modification. Set the accept-languages string correctly.
+ Closes: #570142.
+ * Switch to 3.0 source package format.
+ * Move the packaging to use quilt.
+ * Merge 00_browser_wrapper_path.patch and 02_ac_init.patch into a new
+ 00_epiphany-browser.patch.
+ * Add to it a pair of missing renames: g_set_prgname (used by
+ bug-buddy) and the --help message.
+
+ -- Josselin Mouette <joss at debian.org> Sat, 03 Jul 2010 01:38:24 +0200
+
epiphany-browser (2.30.2-2) unstable; urgency=low
+ [ David Weinehall ]
* Restore Josselin Mouette's improved package description that
accidentally got lost in 2.30.0-1 (Closes: #572886).
- -- David Weinehall <tao at debian.org> Thu, 15 Apr 2010 20:57:44 +0300
+ [ Josselin Mouette ]
+ * Relax epiphany-gecko conflict to not make the package uninstallable.
+ Closes: #583347.
+ * Make epiphany-extensions conflict a Breaks. Bump the version since
+ the directory changed again in the meantime.
+ * Disable seed on ia64 since it doesn’t work.
+
+ -- Josselin Mouette <joss at debian.org> Sat, 29 May 2010 15:57:13 +0200
epiphany-browser (2.30.2-1) unstable; urgency=low
Modified: desktop/experimental/epiphany-browser/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-browser/debian/control?rev=26309&op=diff
==============================================================================
--- desktop/experimental/epiphany-browser/debian/control [utf-8] (original)
+++ desktop/experimental/epiphany-browser/debian/control [utf-8] Sun Jan 16 02:07:53 2011
@@ -9,6 +9,7 @@
Maintainer: Josselin Mouette <joss at debian.org>
Uploaders: David Weinehall <tao at debian.org>, Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Gustavo Noronha Silva <kov at debian.org>, Sebastian Dröge <slomo at debian.org>
Build-Depends: debhelper (>= 5),
+ cdbs,
pkg-config,
libglib2.0-dev (>= 2.18.0),
libgtk3.0-dev (>= 2.99.1),
@@ -29,20 +30,19 @@
scrollkeeper,
gnome-pkg-tools (>= 0.10),
libxml-parser-perl,
- libwebkit-dev (>= 1.1.22),
+ libwebkit-dev (>= 1.2.3),
gobject-introspection (>= 0.6.7),
libgirepository1.0-dev (>= 0.6.7),
gir1.2-glib-2.0,
gir1.2-gtk-3.0,
gir1.2-freedesktop,
gir1.2-webkit-3.0,
- libseed-dev (>= 2.27.91),
+ libseed-dev (>= 2.27.91) [!ia64],
iso-codes (>= 0.35),
gnome-doc-utils (>= 0.3.2),
intltool (>= 0.40.0),
x11proto-core-dev,
- network-manager-dev | not+linux-gnu,
- quilt,
+ network-manager-dev [linux-any],
libenchant-dev (>= 1.0),
libavahi-gobject-dev (>= 0.6.22),
gtk-doc-tools (>= 1.0),
@@ -51,7 +51,7 @@
zip,
ca-certificates
Build-Depends-Indep: libglib2.0-doc, libgtk2.0-doc
-Standards-Version: 3.8.4
+Standards-Version: 3.9.0
Homepage: http://www.gnome.org/projects/epiphany/
Vcs-Browser: http://svn.debian.org/viewsvn/pkg-gnome/desktop/unstable/epiphany-browser/
Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/desktop/unstable/epiphany-browser/
@@ -65,11 +65,10 @@
dbus-x11,
iso-codes,
${misc:Depends}
-Conflicts: epiphany-gecko,
+Conflicts: epiphany-gecko (<< 2.28),
epiphany-webkit (<< 2.28),
- epiphany-extensions (<< 2.29.0~20092012-1),
swfdec-mozilla
-Replaces: epiphany-gecko,
+Replaces: epiphany-gecko (<< 2.28),
epiphany-webkit (<< 2.28)
Recommends: yelp,
evince,
@@ -113,6 +112,7 @@
Section: devel
Depends: epiphany-browser (>= ${binary:Version}),
epiphany-browser-data (= ${source:Version}),
+ ${misc:Depends},
libgtk2.0-dev (>= 2.16.0),
libwebkit-dev
Conflicts: epiphany-webkit-dev
@@ -128,7 +128,7 @@
Architecture: any
Section: debug
Priority: extra
-Depends: epiphany-browser (= ${binary:Version})
+Depends: epiphany-browser (= ${binary:Version}), ${misc:Depends}
Recommends: libwebkit-1.0-2-dbg
Description: Debugging symbols for the GNOME web browser
Epiphany is a simple yet powerful GNOME web browser targeted at
@@ -139,14 +139,14 @@
Package: epiphany-webkit
Architecture: all
-Depends: epiphany-browser (>= 2.28.0)
+Depends: epiphany-browser (>= 2.28.0), ${misc:Depends}
Description: Dummy, transitional package
This package has been made obsolete by epiphany-browser 2.28.0, and
is safe to remove.
Package: epiphany-gecko
Architecture: all
-Depends: epiphany-browser (>= 2.28.0)
+Depends: epiphany-browser (>= 2.28.0), ${misc:Depends}
Description: Dummy, transitional package
This package has been made obsolete by epiphany-browser 2.28.0, and
is safe to remove.
Modified: desktop/experimental/epiphany-browser/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-browser/debian/control.in?rev=26309&op=diff
==============================================================================
--- desktop/experimental/epiphany-browser/debian/control.in [utf-8] (original)
+++ desktop/experimental/epiphany-browser/debian/control.in [utf-8] Sun Jan 16 02:07:53 2011
@@ -4,6 +4,7 @@
Maintainer: Josselin Mouette <joss at debian.org>
Uploaders: @GNOME_TEAM@
Build-Depends: debhelper (>= 5),
+ cdbs,
pkg-config,
libglib2.0-dev (>= 2.18.0),
libgtk3.0-dev (>= 2.99.1),
@@ -24,20 +25,19 @@
scrollkeeper,
gnome-pkg-tools (>= 0.10),
libxml-parser-perl,
- libwebkit-dev (>= 1.1.22),
+ libwebkit-dev (>= 1.2.3),
gobject-introspection (>= 0.6.7),
libgirepository1.0-dev (>= 0.6.7),
gir1.2-glib-2.0,
gir1.2-gtk-3.0,
gir1.2-freedesktop,
gir1.2-webkit-3.0,
- libseed-dev (>= 2.27.91),
+ libseed-dev (>= 2.27.91) [!ia64],
iso-codes (>= 0.35),
gnome-doc-utils (>= 0.3.2),
intltool (>= 0.40.0),
x11proto-core-dev,
- network-manager-dev | not+linux-gnu,
- quilt,
+ network-manager-dev [linux-any],
libenchant-dev (>= 1.0),
libavahi-gobject-dev (>= 0.6.22),
gtk-doc-tools (>= 1.0),
@@ -46,7 +46,7 @@
zip,
ca-certificates
Build-Depends-Indep: libglib2.0-doc, libgtk2.0-doc
-Standards-Version: 3.8.4
+Standards-Version: 3.9.0
Homepage: http://www.gnome.org/projects/epiphany/
Vcs-Browser: http://svn.debian.org/viewsvn/pkg-gnome/desktop/unstable/epiphany-browser/
Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/desktop/unstable/epiphany-browser/
@@ -60,11 +60,10 @@
dbus-x11,
iso-codes,
${misc:Depends}
-Conflicts: epiphany-gecko,
+Conflicts: epiphany-gecko (<< 2.28),
epiphany-webkit (<< 2.28),
- epiphany-extensions (<< 2.29.0~20092012-1),
swfdec-mozilla
-Replaces: epiphany-gecko,
+Replaces: epiphany-gecko (<< 2.28),
epiphany-webkit (<< 2.28)
Recommends: yelp,
evince,
@@ -108,6 +107,7 @@
Section: devel
Depends: epiphany-browser (>= ${binary:Version}),
epiphany-browser-data (= ${source:Version}),
+ ${misc:Depends},
libgtk2.0-dev (>= 2.16.0),
libwebkit-dev
Conflicts: epiphany-webkit-dev
@@ -123,7 +123,7 @@
Architecture: any
Section: debug
Priority: extra
-Depends: epiphany-browser (= ${binary:Version})
+Depends: epiphany-browser (= ${binary:Version}), ${misc:Depends}
Recommends: libwebkit-1.0-2-dbg
Description: Debugging symbols for the GNOME web browser
Epiphany is a simple yet powerful GNOME web browser targeted at
@@ -134,14 +134,14 @@
Package: epiphany-webkit
Architecture: all
-Depends: epiphany-browser (>= 2.28.0)
+Depends: epiphany-browser (>= 2.28.0), ${misc:Depends}
Description: Dummy, transitional package
This package has been made obsolete by epiphany-browser 2.28.0, and
is safe to remove.
Package: epiphany-gecko
Architecture: all
-Depends: epiphany-browser (>= 2.28.0)
+Depends: epiphany-browser (>= 2.28.0), ${misc:Depends}
Description: Dummy, transitional package
This package has been made obsolete by epiphany-browser 2.28.0, and
is safe to remove.
Modified: desktop/experimental/epiphany-browser/debian/epiphany-browser.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-browser/debian/epiphany-browser.install?rev=26309&op=diff
==============================================================================
--- desktop/experimental/epiphany-browser/debian/epiphany-browser.install [utf-8] (original)
+++ desktop/experimental/epiphany-browser/debian/epiphany-browser.install [utf-8] Sun Jan 16 02:07:53 2011
@@ -1,2 +1,4 @@
debian/epiphany.sh /usr/bin/
debian/bug/control /usr/share/bug/epiphany-browser/
+debian/tmp/usr/bin
+debian/tmp/usr/lib/girepository-1.0
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=26309&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 Jan 16 02:07:53 2011
@@ -1,7 +1,7 @@
-Index: epiphany-browser-2.28.0/data/epiphany.pc.in
+Index: epiphany-browser-2.30.3/data/epiphany.pc.in
===================================================================
---- epiphany-browser-2.28.0.orig/data/epiphany.pc.in 2009-09-24 18:15:07.808465337 -0300
-+++ epiphany-browser-2.28.0/data/epiphany.pc.in 2009-09-24 18:19:01.164440294 -0300
+--- epiphany-browser-2.30.3.orig/data/epiphany.pc.in 2010-08-16 23:08:14.000000000 +0200
++++ epiphany-browser-2.30.3/data/epiphany.pc.in 2010-08-18 20:04:59.007686500 +0200
@@ -2,8 +2,8 @@
exec_prefix=@exec_prefix@
libdir=@libdir@
@@ -13,10 +13,10 @@
datarootdir=@datarootdir@
datadir=@datadir@
icondir=@datadir@/@PACKAGE@/icons
-Index: epiphany-browser-2.28.0/lib/Makefile.am
+Index: epiphany-browser-2.30.3/lib/Makefile.am
===================================================================
---- epiphany-browser-2.28.0.orig/lib/Makefile.am 2009-09-24 18:15:07.832440578 -0300
-+++ epiphany-browser-2.28.0/lib/Makefile.am 2009-09-24 18:19:01.164440294 -0300
+--- epiphany-browser-2.30.3.orig/lib/Makefile.am 2010-04-22 21:45:15.000000000 +0200
++++ epiphany-browser-2.30.3/lib/Makefile.am 2010-08-18 20:04:59.023786595 +0200
@@ -79,7 +79,7 @@
-I$(top_srcdir)/lib/egg \
-DDATADIR="\"$(datadir)\"" \
@@ -26,11 +26,11 @@
$(AM_CPPFLAGS)
libephymisc_la_CFLAGS = \
-Index: epiphany-browser-2.28.0/src/Makefile.am
+Index: epiphany-browser-2.30.3/src/Makefile.am
===================================================================
---- epiphany-browser-2.28.0.orig/src/Makefile.am 2009-09-24 18:15:07.820440106 -0300
-+++ epiphany-browser-2.28.0/src/Makefile.am 2009-09-24 18:19:01.164440294 -0300
-@@ -102,8 +102,8 @@
+--- epiphany-browser-2.30.3.orig/src/Makefile.am 2010-08-16 23:08:15.000000000 +0200
++++ epiphany-browser-2.30.3/src/Makefile.am 2010-08-18 20:04:59.031688648 +0200
+@@ -106,8 +106,8 @@
-I$(top_srcdir)/lib/egg \
-I$(top_srcdir)/lib/widgets \
-I$(top_srcdir)/src/bookmarks \
Propchange: desktop/experimental/epiphany-browser/debian/patches/12_safetypes.patch
('svn:mergeinfo' removed)
Modified: desktop/experimental/epiphany-browser/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-browser/debian/patches/series?rev=26309&op=diff
==============================================================================
--- desktop/experimental/epiphany-browser/debian/patches/series [utf-8] (original)
+++ desktop/experimental/epiphany-browser/debian/patches/series [utf-8] Sun Jan 16 02:07:53 2011
@@ -1,10 +1,10 @@
-00_browser_wrapper_path.patch
+00_epiphany-browser.patch
01_bookmarks_menu.patch
-02_ac_init.patch
03_dbus.patch
05_libexecdir.patch
07_bookmarks.patch
10_smart_bookmarks.patch
12_safetypes.patch
+14_download_nautilus.patch
99_autoreconf.patch
99_ltmain_as-needed.patch
Modified: desktop/experimental/epiphany-browser/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-browser/debian/rules?rev=26309&op=diff
==============================================================================
--- desktop/experimental/epiphany-browser/debian/rules [utf-8] (original)
+++ desktop/experimental/epiphany-browser/debian/rules [utf-8] Sun Jan 16 02:07:53 2011
@@ -1,167 +1,51 @@
#!/usr/bin/make -f
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/gnome.mk
include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
-DEB_VERSION := $(shell dpkg-parsechangelog | sed -n -e 's/^Version: //p')
include /usr/share/gnome-pkg-tools/1/rules/gnome-version.mk
include /usr/share/gnome-pkg-tools/1/rules/check-dist.mk
-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
GNOME_MODULE := epiphany
-STAMP_DIR := debian/stamp
-BUILD_DIR := debian/build
-PATCH_DIR := debian/patches
-
-DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
-DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-DEB_BUILD_GNU_CPU ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_CPU)
-
-# To add the Debian version to the user agent
-CPPFLAGS += -DDEB_PACKAGE_VERSION=\\\"$(DEB_VERSION)\\\"
-
-CFLAGS += -Wall -g -O$(if $(findstring noopt,$(DEB_BUILD_OPTIONS)),0,2)
-
LDFLAGS += -Wl,-O1 -Wl,--as-needed
-QUILT := QUILT_PATCHES=$(PATCH_DIR) quilt --quiltrc /dev/null
-
-configure_flags := \
- --disable-maintainer-mode \
- --prefix=/usr \
- --mandir=\$${prefix}/share/man \
- --sysconfdir=/etc \
- --localstatedir=/var \
+DEB_CONFIGURE_EXTRA_FLAGS += \
--enable-dbus \
--disable-scrollkeeper \
--enable-zeroconf \
--libexecdir=\$${prefix}/lib/epiphany-browser \
--enable-gtk-doc \
--disable-introspection \
- --disable-seed \
--enable-spell-checker \
--with-ca-file=/etc/ssl/certs/ca-certificates.crt
+ifneq ($(DEB_HOST_ARCH),ia64)
+DEB_CONFIGURE_EXTRA_FLAGS += \
+ --enable-seed
+endif
+
ifeq ($(DEB_HOST_ARCH_OS),linux)
-configure_flags += \
+DEB_CONFIGURE_EXTRA_FLAGS += \
--enable-network-manager
endif
-ifeq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
- configure_flags += --build=$(DEB_BUILD_GNU_TYPE)
-else
- configure_flags += --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE)
-endif
+DEB_DH_INSTALLCHANGELOGS_ARGS_ALL := --no-act
+DEB_INSTALL_DOCS_ALL := --no-act
-patch: $(STAMP_DIR)/patch-stamp
-$(STAMP_DIR)/patch-stamp:
- dh_testdir
- mkdir -p $(STAMP_DIR)
- $(QUILT) push -a || test $$? = 2
- touch $@
+binary-post-install/%::
+ dh_installchangelogs -p$(cdbs_curpkg)
+ dh_installdocs -p$(cdbs_curpkg)
-builddir = $(BUILD_DIR)/browser
+binary-post-install/epiphany-browser::
+ cd debian/epiphany-browser/usr/bin \
+ && mv epiphany epiphany-browser \
+ && mv epiphany.sh epiphany
-configure: $(STAMP_DIR)/configure-stamp
-$(STAMP_DIR)/configure-stamp: $(STAMP_DIR)/patch-stamp
- dh_testdir
- mkdir -p $(builddir)
- cd $(builddir) && \
- CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" \
- $(CURDIR)/configure $(configure_flags)
- touch $@
-
-build: $(STAMP_DIR)/build-stamp
-$(STAMP_DIR)/build-stamp: $(STAMP_DIR)/configure-stamp
- dh_testdir
- echo=/bin/echo $(MAKE) -C $(builddir)
- touch $@
-
-installdir = $(CURDIR)/debian/epiphany-browser
-
-install-clean:
- dh_testdir
- dh_testroot
- dh_clean -k
-
-install: install-clean $(STAMP_DIR)/build-stamp
- echo=/bin/echo $(MAKE) -C $(builddir) install DESTDIR=$(installdir)
- cd $(installdir)/usr/bin && mv epiphany epiphany-browser
- rm -f $(installdir)/usr/lib/epiphany*/*/*/*a
- echo gnome:Version=$(DEB_GNOME_VERSION) >> debian/epiphany-browser.substvars
- echo gnome:NextVersion=$(DEB_GNOME_NEXTVERSION) >> debian/epiphany-browser.substvars
-
- dh_installdirs
- mv debian/epiphany-browser/usr/include debian/epiphany-browser-dev/usr/
- mv debian/epiphany-browser/usr/lib/pkgconfig debian/epiphany-browser-dev/usr/lib/
- cd debian/epiphany-browser/usr/share && \
- mv aclocal gtk-doc $(CURDIR)/debian/epiphany-browser-dev/usr/share/
- mv debian/epiphany-browser/usr/share debian/epiphany-browser-data/usr/
- cd debian/epiphany-browser-data/usr/share/man/man1 && \
- mv epiphany.1 epiphany-browser.1
- # Correct help file paths
- cd debian/epiphany-browser-data/usr/share/omf && mv epiphany epiphany-browser
- cd debian/epiphany-browser-data/usr/share/gnome/help && mv epiphany epiphany-browser
- 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/#' {} \;
- dh_install
- cd debian/epiphany-browser/usr/bin && \
- mv epiphany.sh epiphany
-
- env PACKAGE_VERSION=$$(dpkg-parsechangelog | grep Version | cut -d ' ' -f 2) \
- sed "s/@PACKAGEVERSION@/$${PACKAGE_VERSION}/g" debian/branding.conf.in > \
- debian/epiphany-browser-data/usr/share/epiphany-browser/branding.conf
-
-clean::
- dh_testdir
- dh_testroot
- $(QUILT) pop -a -R || test $$? = 2
- rm -rf .pc
- rm -f po/.intltool-merge-cache
- rm -f intltool-extract intltool-update intltool-merge
- rm -rf $(INSTALL_DIR) $(BUILD_DIR) $(STAMP_DIR)
- rm -rf debian/icons
- dh_clean
-
-binary: binary-arch binary-indep
-
-binary-indep: build install
- dh_testdir
- dh_testroot
- dh_installchangelogs -pepiphany-browser-data ChangeLog
- dh_installchangelogs -i -Nepiphany-browser-data
- dh_installdocs -i
- dh_installman -i
- dh_installmenu -i
- dh_link -i
- dh_scrollkeeper -i
- dh_gconf -i
- dh_desktop -i
- dh_compress -i
- dh_fixperms -i
- dh_installdeb -i
- dh_gencontrol -i
- dh_md5sums -i
- dh_builddeb -i
-
-binary-arch: build install
- dh_testdir
- dh_testroot
- dh_installchangelogs -a
- dh_installdocs -a
- dh_installman -a
- dh_installmenu -a
- dh_link -a
- dh_scrollkeeper -a
- dh_gconf -a
- dh_desktop -a
- dh_strip -a --dbg-package=epiphany-browser-dbg
- dh_compress -a
- dh_fixperms -a
- dh_installdeb -a
- dh_shlibdeps -a
- dh_gencontrol -a
- dh_md5sums -a
- dh_builddeb -a
-
-.PHONY: patch configure build install clean install-clean binary-indep binary-arch binary
+binary-post-install/epiphany-browser-data::
+ dh_installchangelogs -p$(cdbs_curpkg) ./ChangeLog
+ cd debian/epiphany-browser-data/usr/share/man/man1 \
+ && mv epiphany.1 epiphany-browser.1
+ sed 's/@PACKAGEVERSION@/$(DEB_VERSION)/' debian/branding.conf.in \
+ > debian/epiphany-browser-data/usr/share/epiphany-browser/branding.conf
Added: desktop/experimental/epiphany-browser/debian/source/format
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-browser/debian/source/format?rev=26309&op=file
==============================================================================
--- desktop/experimental/epiphany-browser/debian/source/format (added)
+++ desktop/experimental/epiphany-browser/debian/source/format [utf-8] Sun Jan 16 02:07:53 2011
@@ -1,0 +1,1 @@
+3.0 (quilt)
More information about the pkg-gnome-commits
mailing list