r16178 - in /desktop/experimental/epiphany-browser/debian: changelog control rules

[lool at users.alioth.debian.org]

Author: lool
Date: Wed Jun  4 10:35:06 2008
New Revision: 16178

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=16178
Log:
Cleanup rules.

Modified:
    desktop/experimental/epiphany-browser/debian/changelog
    desktop/experimental/epiphany-browser/debian/control
    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=16178&op=diff
==============================================================================
--- desktop/experimental/epiphany-browser/debian/changelog (original)
+++ desktop/experimental/epiphany-browser/debian/changelog Wed Jun  4 10:35:06 2008
@@ -1,3 +1,9 @@
+epiphany-browser (2.22.2-2) UNRELEASED; urgency=low
+
+  * Cleanup rules.
+
+ -- Loic Minier <lool at dooz.org>  Wed, 04 Jun 2008 12:34:25 +0200
+
 epiphany-browser (2.22.2-1) experimental; urgency=low
 
   * Conflict against seahorse < 2.22.1-3.

Modified: desktop/experimental/epiphany-browser/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-browser/debian/control?rev=16178&op=diff
==============================================================================
--- desktop/experimental/epiphany-browser/debian/control (original)
+++ desktop/experimental/epiphany-browser/debian/control Wed Jun  4 10:35:06 2008
@@ -2,7 +2,7 @@
 Section: gnome
 Priority: optional
 Maintainer: Josselin Mouette <joss at debian.org>
-Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Sebastian Dröge <slomo 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 (>= 5),
                pkg-config,
                libglib2.0-dev (>= 2.16.0),

Modified: desktop/experimental/epiphany-browser/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-browser/debian/rules?rev=16178&op=diff
==============================================================================
--- desktop/experimental/epiphany-browser/debian/rules (original)
+++ desktop/experimental/epiphany-browser/debian/rules Wed Jun  4 10:35:06 2008
@@ -21,6 +21,8 @@
 
 FLAVORS := gecko webkit
 
+QUILT := QUILT_PATCHES=$(PATCH_DIR) quilt --quiltrc /dev/null
+
 common_configure_flags := \
 		--prefix=/usr \
 		--mandir=\$${prefix}/share/man \
@@ -33,9 +35,9 @@
 		--enable-network-manager
 
 ifeq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
-        common_configure_flags += --build=$(DEB_BUILD_GNU_TYPE)
+	common_configure_flags += --build=$(DEB_BUILD_GNU_TYPE)
 else
-        common_configure_flags += --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE)
+	common_configure_flags += --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE)
 endif
 
 gecko_configure_flags := $(common_configure_flags) \
@@ -53,7 +55,7 @@
 $(STAMP_DIR)/patch-stamp:
 	dh_testdir
 	mkdir -p $(STAMP_DIR)
-	QUILT_PATCHES=$(PATCH_DIR) quilt --quiltrc /dev/null push -a || test $$? = 2
+	$(QUILT) push -a || test $$? = 2
 	touch $@
 
 builddir = $(BUILD_DIR)/$*
@@ -101,13 +103,12 @@
 		mv mime-types-permissions.xml default-prefs.js $(CURDIR)/debian/epiphany-browser-data/etc/gnome/epiphany/
 	cd debian/epiphany-browser-data/usr/share/man/man1 && \
 		mv epiphany.1 epiphany-browser.1
-# Correct help file paths
+	# 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/#' {} \;
-
-# Make both epiphanies installable together
+	# Make both epiphanies installable together
 	for f in $(FLAVORS); do \
 		F=`echo $$f | sed -r 's/^([a-z])/\U\1/'` ; \
 		mkdir -p debian/epiphany-$$f/usr/share/applications ; \
@@ -125,8 +126,8 @@
 clean::
 	dh_testdir
 	dh_testroot
-	QUILT_PATCHES=$(PATCH_DIR) quilt --quiltrc /dev/null pop -a -R || test $$? = 2
-	rm -rf .pc	
+	$(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)
@@ -171,5 +172,5 @@
 	dh_gencontrol -a
 	dh_md5sums -a
 	dh_builddeb -a
-	
+
 .PHONY: patch configure build install clean install-clean binary-indep binary-arch binary