r21541 - in /desktop/experimental/epiphany-webkit/debian: changelog rules

[kov at users.alioth.debian.org]

Author: kov
Date: Thu Sep 24 22:14:20 2009
New Revision: 21541

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=21541
Log:
Finish taking over epiphany-browser

Modified:
    desktop/experimental/epiphany-webkit/debian/changelog
    desktop/experimental/epiphany-webkit/debian/rules

Modified: desktop/experimental/epiphany-webkit/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-webkit/debian/changelog?rev=21541&op=diff
==============================================================================
--- desktop/experimental/epiphany-webkit/debian/changelog [utf-8] (original)
+++ desktop/experimental/epiphany-webkit/debian/changelog [utf-8] Thu Sep 24 22:14:20 2009
@@ -13,6 +13,9 @@
   - applied upstream
   * debian/patches/99_autoreconf.patch:
   - refreshed
+  * debian/control.in, debian/rules:
+  - take over epiphany-browser package, remove hooks to build multiple
+    backends
 
   == Changes related to the temporary WebKit branding ==
 

Modified: desktop/experimental/epiphany-webkit/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-webkit/debian/rules?rev=21541&op=diff
==============================================================================
--- desktop/experimental/epiphany-webkit/debian/rules [utf-8] (original)
+++ desktop/experimental/epiphany-webkit/debian/rules [utf-8] Thu Sep 24 22:14:20 2009
@@ -23,11 +23,9 @@
 
 LDFLAGS += -Wl,-O1 -Wl,--as-needed
 
-FLAVORS := webkit
-
 QUILT := QUILT_PATCHES=$(PATCH_DIR) quilt --quiltrc /dev/null
 
-common_configure_flags := \
+configure_flags := \
 		--disable-maintainer-mode \
 		--prefix=/usr \
 		--mandir=\$${prefix}/share/man \
@@ -35,23 +33,21 @@
 		--localstatedir=/var \
 		--enable-dbus \
 		--disable-scrollkeeper \
-		--enable-zeroconf
+		--enable-zeroconf \
+		--libexecdir=\$${prefix}/lib/epiphany-browser \
+		--enable-gtk-doc \
+		--enable-spell-checker
 
 ifeq ($(DEB_HOST_ARCH_OS),linux)
-common_configure_flags += \
+configure_flags += \
 		--enable-network-manager
 endif
 
 ifeq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
-	common_configure_flags += --build=$(DEB_BUILD_GNU_TYPE)
+	configure_flags += --build=$(DEB_BUILD_GNU_TYPE)
 else
-	common_configure_flags += --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE)
+	configure_flags += --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE)
 endif
-
-webkit_configure_flags := $(common_configure_flags) \
-		--libexecdir=\$${prefix}/lib/epiphany-browser \
-		--enable-gtk-doc \
-		--enable-spell-checker
 
 patch: $(STAMP_DIR)/patch-stamp
 $(STAMP_DIR)/patch-stamp:
@@ -60,19 +56,19 @@
 	$(QUILT) push -a || test $$? = 2
 	touch $@
 
-builddir = $(BUILD_DIR)/$*
+builddir = $(BUILD_DIR)/browser
 
-configure: $(addprefix $(STAMP_DIR)/configure-stamp-, $(FLAVORS))
-$(STAMP_DIR)/configure-stamp-%: $(STAMP_DIR)/patch-stamp
+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)
+			$(CURDIR)/configure $(configure_flags)
 	touch $@
 
-build: $(addprefix $(STAMP_DIR)/build-stamp-, $(FLAVORS))
-$(STAMP_DIR)/build-stamp-%: $(STAMP_DIR)/configure-stamp-%
+build: $(STAMP_DIR)/build-stamp
+$(STAMP_DIR)/build-stamp: $(STAMP_DIR)/configure-stamp
 	dh_testdir
 	echo=/bin/echo $(MAKE) -C $(builddir)
 	touch $@
@@ -84,14 +80,13 @@
 	dh_testroot
 	dh_clean -k
 
-install-%: $(STAMP_DIR)/build-stamp-%
+install: install-clean $(STAMP_DIR)/build-stamp
 	echo=/bin/echo $(MAKE) -C $(builddir) install DESTDIR=$(installdir)
-	cd $(installdir)/usr/bin && mv epiphany epiphany-$*
+	cd $(installdir)/usr/bin && mv epiphany epiphany-browser
 	rm -f $(installdir)/usr/lib/epiphany*/*/*/*a
-	echo gnome:Version=$(DEB_GNOME_VERSION) >> debian/epiphany-$*.substvars
-	echo gnome:NextVersion=$(DEB_GNOME_NEXTVERSION) >> debian/epiphany-$*.substvars
+	echo gnome:Version=$(DEB_GNOME_VERSION) >> debian/epiphany-browser.substvars
+	echo gnome:NextVersion=$(DEB_GNOME_NEXTVERSION) >> debian/epiphany-browser.substvars
 
-install: install-clean $(addprefix install-, $(FLAVORS))
 	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/