r576 - lvm2/trunk/debian

[Bastian Blank]

Author: waldi
Date: Mon Jun  2 20:25:36 2008
New Revision: 576

Log:
* debian/changelog: Update.
* debian/rules: Reorder source rules.


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

Modified: lvm2/trunk/debian/changelog
==============================================================================
--- lvm2/trunk/debian/changelog	(original)
+++ lvm2/trunk/debian/changelog	Mon Jun  2 20:25:36 2008
@@ -2,6 +2,7 @@
 
   * New upstream version.
   * Update standards version to 3.7.3, no changes.
+  * Only ignore known VCS dirs (closes: #482745)
 
  -- Bastian Blank <waldi at debian.org>  Mon, 02 Jun 2008 20:27:24 +0200
 

Modified: lvm2/trunk/debian/rules
==============================================================================
--- lvm2/trunk/debian/rules	(original)
+++ lvm2/trunk/debian/rules	Mon Jun  2 20:25:36 2008
@@ -38,17 +38,25 @@
 CONFIGURE_FLAGS += --disable-o_direct
 endif
 
-setup: $(STAMPS_DIR)/setup
-$(STAMPS_DIR)/setup: $(BUILD_DIR) $(STAMPS_DIR) $(STAMPS_DIR)/setup-deb $(STAMPS_DIR)/setup-udeb
+source: $(BUILD_DIR) $(STAMPS_DIR) $(STAMPS_DIR)/source
 
-$(STAMPS_DIR)/setup-deb: DIR = $(BUILD_DIR)/build-deb
-$(STAMPS_DIR)/setup-deb:
+$(STAMPS_DIR)/source: DIR = $(BUILD_DIR)/source
+$(STAMPS_DIR)/source:
 	rm -rf $(DIR)
 	mkdir -p $(DIR)
-	cp -al $(filter-out debian, $(wildcard *)) $(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
+	touch $@
+
+setup: source $(STAMPS_DIR)/setup-deb $(STAMPS_DIR)/setup-udeb
+
+$(STAMPS_DIR)/setup-deb: SOURCE_DIR = $(BUILD_DIR)/source
+$(STAMPS_DIR)/setup-deb: DIR = $(BUILD_DIR)/build-deb
+$(STAMPS_DIR)/setup-deb: $(STAMPS_DIR)/source
+	rm -rf $(DIR)
+	cp -al $(SOURCE_DIR) $(DIR)
 	cd $(DIR); \
 	./configure CFLAGS="$(CFLAGS)" \
 		$(CONFIGURE_FLAGS) \
@@ -58,14 +66,11 @@
 		--enable-readline
 	touch $@
 
+$(STAMPS_DIR)/setup-udeb: SOURCE_DIR = $(BUILD_DIR)/source
 $(STAMPS_DIR)/setup-udeb: DIR = $(BUILD_DIR)/build-udeb
-$(STAMPS_DIR)/setup-udeb:
+$(STAMPS_DIR)/setup-udeb: $(STAMPS_DIR)/source
 	rm -rf $(DIR)
-	mkdir -p $(DIR)
-	cp -al $(filter-out debian, $(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
+	cp -al $(SOURCE_DIR) $(DIR)
 	cd $(DIR); \
 	./configure CFLAGS="$(CFLAGS_UDEB)" \
 		$(CONFIGURE_FLAGS) \
@@ -74,8 +79,7 @@
 		--with-pool=none
 	touch $@
 
-build: $(STAMPS_DIR)/build
-$(STAMPS_DIR)/build: $(STAMPS_DIR)/setup $(STAMPS_DIR)/build-deb $(STAMPS_DIR)/build-udeb
+build: setup $(STAMPS_DIR)/build-deb $(STAMPS_DIR)/build-udeb
 
 build-deb: $(STAMPS_DIR)/build-deb
 $(STAMPS_DIR)/build-deb: DIR = $(BUILD_DIR)/build-deb