r874 - lvm2/trunk/debian

[Bastian Blank]

Author: waldi
Date: Thu Oct 20 16:50:16 2011
New Revision: 874

Log:
* debian/changelog: Update.
* debian/control: Remove build-dependency on quilt.
* debian/rules: Remove own quilt usage.

Modified:
   lvm2/trunk/debian/changelog
   lvm2/trunk/debian/control
   lvm2/trunk/debian/rules

Modified: lvm2/trunk/debian/changelog
==============================================================================
--- lvm2/trunk/debian/changelog	Thu Oct 20 16:27:17 2011	(r873)
+++ lvm2/trunk/debian/changelog	Thu Oct 20 16:50:16 2011	(r874)
@@ -3,6 +3,7 @@
   * New upstream version.
   * Remove lvm-common conflicts and replaces.
   * Remove grub-common breakage.
+  * Remove own quilt usage.
 
  -- Bastian Blank <waldi at debian.org>  Sat, 15 Oct 2011 23:00:32 +0200
 

Modified: lvm2/trunk/debian/control
==============================================================================
--- lvm2/trunk/debian/control	Thu Oct 20 16:27:17 2011	(r873)
+++ lvm2/trunk/debian/control	Thu Oct 20 16:50:16 2011	(r874)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian LVM Team <pkg-lvm-maintainers at lists.alioth.debian.org>
 Uploaders: Bastian Blank <waldi at debian.org>
-Build-Depends: debhelper (>> 7), automake, libcman-dev (>> 2), libdlm-dev (>> 2), libreadline-gplv2-dev, libselinux1-dev, libudev-dev, pkg-config, quilt
+Build-Depends: debhelper (>> 7), automake, libcman-dev (>> 2), libdlm-dev (>> 2), libreadline-gplv2-dev, libselinux1-dev, libudev-dev, pkg-config
 Standards-Version: 3.9.1
 Homepage: http://sources.redhat.com/lvm2/
 Vcs-Svn: svn://svn.debian.org/pkg-lvm/lvm2/trunk/

Modified: lvm2/trunk/debian/rules
==============================================================================
--- lvm2/trunk/debian/rules	Thu Oct 20 16:27:17 2011	(r873)
+++ lvm2/trunk/debian/rules	Thu Oct 20 16:50:16 2011	(r874)
@@ -47,18 +47,12 @@
 CONFIGURE_FLAGS += --disable-o_direct
 endif
 
-patch: $(STAMPS_DIR)/patch
-
-$(STAMPS_DIR)/patch:
-	@mkdir -p $(STAMPS_DIR)
-	QUILT_PATCHES=$(CURDIR)/debian/patches quilt --quiltrc /dev/null push -a || test $$? = 2
-	touch $@
-
 source: $(STAMPS_DIR)/source
 
 $(STAMPS_DIR)/source: SOURCE_FILES = $(filter-out debian .svn, $(wildcard * .[^.]*))
 $(STAMPS_DIR)/source: DIR = $(BUILD_DIR)/source
-$(STAMPS_DIR)/source: $(STAMPS_DIR)/patch
+$(STAMPS_DIR)/source:
+	@mkdir -p $(STAMPS_DIR)
 	rm -rf $(DIR)
 	mkdir -p '$(DIR)'
 	cp -a $(SOURCE_FILES) '$(DIR)'