r772 - in lvm2/trunk/debian: . source

[Bastian Blank]

Author: waldi
Date: Tue Mar 16 19:44:07 2010
New Revision: 772

Log:
* debian/changelog: Update.
* debian/rules: Patch in root.
* debian/source/format: Set to 3.0 (quilt).

Added:
   lvm2/trunk/debian/source/
   lvm2/trunk/debian/source/format
Modified:
   lvm2/trunk/debian/changelog
   lvm2/trunk/debian/rules

Modified: lvm2/trunk/debian/changelog
==============================================================================
--- lvm2/trunk/debian/changelog	Fri Nov  6 17:28:38 2009	(r771)
+++ lvm2/trunk/debian/changelog	Tue Mar 16 19:44:07 2010	(r772)
@@ -1,3 +1,9 @@
+lvm2 (2.02.54-2) UNRELEASED; urgency=low
+
+  * Use 3.0 (quilt) source format.
+
+ -- Bastian Blank <waldi at debian.org>  Sun, 28 Feb 2010 12:43:32 +0100
+
 lvm2 (2.02.54-1) unstable; urgency=low
 
   * New upstream version.

Modified: lvm2/trunk/debian/rules
==============================================================================
--- lvm2/trunk/debian/rules	Fri Nov  6 17:28:38 2009	(r771)
+++ lvm2/trunk/debian/rules	Tue Mar 16 19:44:07 2010	(r772)
@@ -42,27 +42,23 @@
 CONFIGURE_FLAGS += --disable-o_direct
 endif
 
-source: $(STAMPS_DIR)/source
+patch: $(STAMPS_DIR)/patch
 
-$(STAMPS_DIR)/source: DIR = $(BUILD_DIR)/source
-$(STAMPS_DIR)/source:
+$(STAMPS_DIR)/patch:
 	@mkdir -p $(STAMPS_DIR)
-	rm -rf $(DIR)
-	mkdir -p $(DIR)
-	cp -al $(filter-out debian .svk .svn, $(wildcard .[^.]* *)) $(DIR)
-	cp --remove-destination /usr/share/misc/config.sub /usr/share/misc/config.guess $(DIR)/autoconf
-	cd $(DIR); QUILT_PATCHES=$(CURDIR)/debian/patches quilt --quiltrc /dev/null push -a || test $$? = 2
-	cd $(DIR); autoreconf
+	QUILT_PATCHES=$(CURDIR)/debian/patches quilt --quiltrc /dev/null push -a || test $$? = 2
 	touch $@
 
 setup: $(STAMPS_DIR)/setup-deb $(STAMPS_DIR)/setup-udeb
 
-$(STAMPS_DIR)/setup-deb: SOURCE_DIR = $(BUILD_DIR)/source
+$(STAMPS_DIR)/setup-deb: SOURCE_FILES = $(filter-out debian, $(wildcard * .[^.]*))
 $(STAMPS_DIR)/setup-deb: DIR = $(BUILD_DIR)/build-deb
-$(STAMPS_DIR)/setup-deb: $(STAMPS_DIR)/source
+$(STAMPS_DIR)/setup-deb: $(STAMPS_DIR)/patch
 	rm -rf $(DIR)
-	cp -al $(SOURCE_DIR) $(DIR)
+	mkdir -p '$(DIR)'
+	cp -a $(SOURCE_FILES) '$(DIR)'
 	cd $(DIR); \
+	autoreconf; \
 	./configure CFLAGS="$(CFLAGS)" \
 		$(CONFIGURE_FLAGS) \
 		--with-optimisation="" \
@@ -74,12 +70,14 @@
 		--enable-readline
 	touch $@
 
-$(STAMPS_DIR)/setup-udeb: SOURCE_DIR = $(BUILD_DIR)/source
+$(STAMPS_DIR)/setup-udeb: SOURCE_FILES = $(filter-out debian, $(wildcard * .[^.]*))
 $(STAMPS_DIR)/setup-udeb: DIR = $(BUILD_DIR)/build-udeb
-$(STAMPS_DIR)/setup-udeb: $(STAMPS_DIR)/source
+$(STAMPS_DIR)/setup-udeb: $(STAMPS_DIR)/patch
 	rm -rf $(DIR)
-	cp -al $(SOURCE_DIR) $(DIR)
+	mkdir -p '$(DIR)'
+	cp -a $(SOURCE_FILES) '$(DIR)'
 	cd $(DIR); \
+	autoreconf; \
 	./configure CFLAGS="$(CFLAGS_UDEB)" \
 		$(CONFIGURE_FLAGS) \
 		--with-optimisation="" \

Added: lvm2/trunk/debian/source/format
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ lvm2/trunk/debian/source/format	Tue Mar 16 19:44:07 2010	(r772)
@@ -0,0 +1 @@
+3.0 (quilt)