r24657 - in /desktop/unstable/epiphany-browser/debian: branding.conf.in changelog control control.in epiphany-browser-data.dirs epiphany-browser-data.install epiphany-browser-dev.dirs epiphany-browser-dev.install epiphany-browser.install rules
joss at users.alioth.debian.org
joss at users.alioth.debian.org
Fri Jul 2 22:27:00 UTC 2010
Author: joss
Date: Fri Jul 2 22:27:00 2010
New Revision: 24657
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=24657
Log:
Move the packaging to use quilt.
Added:
desktop/unstable/epiphany-browser/debian/epiphany-browser-data.install
desktop/unstable/epiphany-browser/debian/epiphany-browser-dev.install
Removed:
desktop/unstable/epiphany-browser/debian/epiphany-browser-data.dirs
desktop/unstable/epiphany-browser/debian/epiphany-browser-dev.dirs
Modified:
desktop/unstable/epiphany-browser/debian/branding.conf.in
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/rules
Modified: desktop/unstable/epiphany-browser/debian/branding.conf.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-browser/debian/branding.conf.in?rev=24657&op=diff
==============================================================================
--- desktop/unstable/epiphany-browser/debian/branding.conf.in [utf-8] (original)
+++ desktop/unstable/epiphany-browser/debian/branding.conf.in [utf-8] Fri Jul 2 22:27:00 2010
@@ -1,4 +1,4 @@
[User Agent]
Vendor=Debian
-VendorSub=squeeze/sid
+VendorSub=squeeze
VendorComment=@PACKAGEVERSION@
Modified: desktop/unstable/epiphany-browser/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-browser/debian/changelog?rev=24657&op=diff
==============================================================================
--- desktop/unstable/epiphany-browser/debian/changelog [utf-8] (original)
+++ desktop/unstable/epiphany-browser/debian/changelog [utf-8] Fri Jul 2 22:27:00 2010
@@ -9,6 +9,7 @@
* 08_disable_page_cache.patch: disable the page cache for the moment,
given the amount of bugs related to history navigation. :(
* Switch to 3.0 source package format.
+ * Move the packaging to use quilt.
-- Josselin Mouette <joss at debian.org> Fri, 02 Jul 2010 21:35:39 +0200
Modified: desktop/unstable/epiphany-browser/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-browser/debian/control?rev=24657&op=diff
==============================================================================
--- desktop/unstable/epiphany-browser/debian/control [utf-8] (original)
+++ desktop/unstable/epiphany-browser/debian/control [utf-8] Fri Jul 2 22:27:00 2010
@@ -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),
libgtk2.0-dev (>= 2.20.0),
@@ -112,6 +113,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
@@ -127,7 +129,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
@@ -138,14 +140,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/unstable/epiphany-browser/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-browser/debian/control.in?rev=24657&op=diff
==============================================================================
--- desktop/unstable/epiphany-browser/debian/control.in [utf-8] (original)
+++ desktop/unstable/epiphany-browser/debian/control.in [utf-8] Fri Jul 2 22:27:00 2010
@@ -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),
libgtk2.0-dev (>= 2.20.0),
@@ -107,6 +108,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
@@ -122,7 +124,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
@@ -133,14 +135,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.
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=24657&op=file
==============================================================================
--- desktop/unstable/epiphany-browser/debian/epiphany-browser-data.install (added)
+++ desktop/unstable/epiphany-browser/debian/epiphany-browser-data.install [utf-8] Fri Jul 2 22:27:00 2010
@@ -1,0 +1,11 @@
+debian/tmp/etc
+debian/tmp/usr/share/applications
+debian/tmp/usr/share/dbus-1
+debian/tmp/usr/share/epiphany-browser/[!m]*
+debian/tmp/usr/share/epiphany-browser/mime-types-permissions.xml etc/gnome/epiphany
+debian/tmp/usr/share/gir-1.0
+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
Added: desktop/unstable/epiphany-browser/debian/epiphany-browser-dev.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-browser/debian/epiphany-browser-dev.install?rev=24657&op=file
==============================================================================
--- desktop/unstable/epiphany-browser/debian/epiphany-browser-dev.install (added)
+++ desktop/unstable/epiphany-browser/debian/epiphany-browser-dev.install [utf-8] Fri Jul 2 22:27:00 2010
@@ -1,0 +1,4 @@
+debian/tmp/usr/include
+debian/tmp/usr/lib/pkgconfig
+debian/tmp/usr/share/aclocal
+debian/tmp/usr/share/gtk-doc
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=24657&op=diff
==============================================================================
--- desktop/unstable/epiphany-browser/debian/epiphany-browser.install [utf-8] (original)
+++ desktop/unstable/epiphany-browser/debian/epiphany-browser.install [utf-8] Fri Jul 2 22:27:00 2010
@@ -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/unstable/epiphany-browser/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-browser/debian/rules?rev=24657&op=diff
==============================================================================
--- desktop/unstable/epiphany-browser/debian/rules [utf-8] (original)
+++ desktop/unstable/epiphany-browser/debian/rules [utf-8] Fri Jul 2 22:27:00 2010
@@ -1,33 +1,16 @@
#!/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/gnome-get-source.mk
GNOME_MODULE := epiphany
-STAMP_DIR := debian/stamp
-BUILD_DIR := debian/build
-
-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
-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 \
@@ -38,121 +21,30 @@
--with-ca-file=/etc/ssl/certs/ca-certificates.crt
ifneq ($(DEB_HOST_ARCH),ia64)
-configure_flags += \
+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
-builddir = $(BUILD_DIR)/browser
+binary-post-install/%::
+ dh_installchangelogs -p$(cdbs_curpkg)
+ dh_installdocs -p$(cdbs_curpkg)
-configure: $(STAMP_DIR)/configure-stamp
-$(STAMP_DIR)/configure-stamp:
- dh_testdir
- mkdir -p $(builddir)
- cd $(builddir) && \
- CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" \
- $(CURDIR)/configure $(configure_flags)
- touch $@
+binary-post-install/epiphany-browser::
+ cd debian/epiphany-browser/usr/bin \
+ && mv epiphany epiphany-browser \
+ && mv epiphany.sh epiphany
-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/etc/* debian/epiphany-browser-data/etc
- rmdir debian/epiphany-browser/etc
- mv debian/epiphany-browser/usr/share debian/epiphany-browser-data/usr/
- cd debian/epiphany-browser-data/usr/share/epiphany-browser && \
- mv mime-types-permissions.xml $(CURDIR)/debian/epiphany-browser-data/etc/gnome/epiphany/mime-types-permissions.xml
- cd debian/epiphany-browser-data/usr/share/man/man1 && \
- mv epiphany.1 epiphany-browser.1
- 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
- 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
More information about the pkg-gnome-commits
mailing list