r24656 - in /desktop/unstable/epiphany-browser/debian: changelog control control.in rules source/ source/format

[joss at users.alioth.debian.org]

Author: joss
Date: Fri Jul  2 21:06:25 2010
New Revision: 24656

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=24656
Log:
Switch to 3.0 source package format.

Added:
    desktop/unstable/epiphany-browser/debian/source/
    desktop/unstable/epiphany-browser/debian/source/format
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/rules

Modified: desktop/unstable/epiphany-browser/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-browser/debian/changelog?rev=24656&op=diff
==============================================================================
--- desktop/unstable/epiphany-browser/debian/changelog [utf-8] (original)
+++ desktop/unstable/epiphany-browser/debian/changelog [utf-8] Fri Jul  2 21:06:25 2010
@@ -8,6 +8,7 @@
     Closes: #570142.
   * 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.
 
  -- 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=24656&op=diff
==============================================================================
--- desktop/unstable/epiphany-browser/debian/control [utf-8] (original)
+++ desktop/unstable/epiphany-browser/debian/control [utf-8] Fri Jul  2 21:06:25 2010
@@ -43,7 +43,6 @@
                intltool (>= 0.40.0),
                x11proto-core-dev,
                network-manager-dev [linux-any],
-               quilt,
                libenchant-dev (>= 1.0),
                libavahi-gobject-dev (>= 0.6.22),
                gtk-doc-tools (>= 1.0),

Modified: desktop/unstable/epiphany-browser/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-browser/debian/control.in?rev=24656&op=diff
==============================================================================
--- desktop/unstable/epiphany-browser/debian/control.in [utf-8] (original)
+++ desktop/unstable/epiphany-browser/debian/control.in [utf-8] Fri Jul  2 21:06:25 2010
@@ -38,7 +38,6 @@
                intltool (>= 0.40.0),
                x11proto-core-dev,
                network-manager-dev [linux-any],
-               quilt,
                libenchant-dev (>= 1.0),
                libavahi-gobject-dev (>= 0.6.22),
                gtk-doc-tools (>= 1.0),

Modified: desktop/unstable/epiphany-browser/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-browser/debian/rules?rev=24656&op=diff
==============================================================================
--- desktop/unstable/epiphany-browser/debian/rules [utf-8] (original)
+++ desktop/unstable/epiphany-browser/debian/rules [utf-8] Fri Jul  2 21:06:25 2010
@@ -9,7 +9,6 @@
 
 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)
@@ -22,8 +21,6 @@
 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 \
@@ -56,17 +53,10 @@
 	configure_flags += --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE)
 endif
 
-patch: $(STAMP_DIR)/patch-stamp
-$(STAMP_DIR)/patch-stamp:
-	dh_testdir
-	mkdir -p $(STAMP_DIR)
-	$(QUILT) push -a || test $$? = 2
-	touch $@
-
 builddir = $(BUILD_DIR)/browser
 
 configure: $(STAMP_DIR)/configure-stamp
-$(STAMP_DIR)/configure-stamp: $(STAMP_DIR)/patch-stamp
+$(STAMP_DIR)/configure-stamp:
 	dh_testdir
 	mkdir -p $(builddir)
 	cd $(builddir) && \
@@ -117,7 +107,6 @@
 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

Added: desktop/unstable/epiphany-browser/debian/source/format
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-browser/debian/source/format?rev=24656&op=file
==============================================================================
--- desktop/unstable/epiphany-browser/debian/source/format (added)
+++ desktop/unstable/epiphany-browser/debian/source/format [utf-8] Fri Jul  2 21:06:25 2010
@@ -1,0 +1,1 @@
+3.0 (quilt)