r522 - in lvm2/trunk: . autoconf daemons debian debian/bin dmeventd doc include lib man po scripts test tools

[Bastian Blank]

Author: waldi
Date: Tue Jan  8 15:35:48 2008
New Revision: 522

Log:
- Remove inline source.
- Use linux-2.6 style orig handling.

* debian/bin/genorig.py: Add.
* debian/changelog: Update.
* debian/rules: Add rules for orig handling.


Added:
   lvm2/trunk/debian/bin/
   lvm2/trunk/debian/bin/genorig.py   (contents, props changed)
Removed:
   lvm2/trunk/COPYING
   lvm2/trunk/COPYING.LIB
   lvm2/trunk/INSTALL
   lvm2/trunk/Makefile.in
   lvm2/trunk/README
   lvm2/trunk/VERSION
   lvm2/trunk/WHATS_NEW
   lvm2/trunk/autoconf/
   lvm2/trunk/configure
   lvm2/trunk/configure.in
   lvm2/trunk/daemons/
   lvm2/trunk/dmeventd/
   lvm2/trunk/doc/
   lvm2/trunk/include/
   lvm2/trunk/lib/
   lvm2/trunk/make.tmpl.in
   lvm2/trunk/man/
   lvm2/trunk/po/
   lvm2/trunk/scripts/
   lvm2/trunk/test/
   lvm2/trunk/tools/
Modified:
   lvm2/trunk/debian/changelog
   lvm2/trunk/debian/rules

Added: lvm2/trunk/debian/bin/genorig.py
==============================================================================
--- (empty file)
+++ lvm2/trunk/debian/bin/genorig.py	Tue Jan  8 15:35:48 2008
@@ -0,0 +1,74 @@
+#!/usr/bin/env python
+
+import os, os.path, re, shutil, sys
+
+class GenOrig(object):
+    log = sys.stdout.write
+
+    source = 'lvm2'
+
+    def __init__(self, input_tar, version):
+        self.input_tar, self.version = input_tar, version
+
+    def __call__(self):
+        import tempfile
+        self.dir = tempfile.mkdtemp(prefix = 'genorig', dir = 'debian')
+        try:
+            self.orig_dir = "%s-%s" % (self.source, self.version)
+            self.orig_tar = "%s_%s.orig.tar.gz" % (self.source, self.version)
+
+            self.do_upstream()
+            self.do_orig()
+        finally:
+            shutil.rmtree(self.dir)
+
+    def do_upstream(self):
+        self.log("Extracting tarball %s\n" % self.input_tar)
+        match = re.match(r'(^|.*/)(?P<dir>LVM2\.\d+\.\d+\.\d+)\.t(?P<extension>(gz|bz2))$', self.input_tar)
+        if not match:
+            raise RuntimeError("Can't identify name of tarball")
+        cmdline = ['tar -xf', self.input_tar, '-C', self.dir]
+        extension = match.group('extension')
+        if extension == 'bz2':
+            cmdline.append('-j')
+        elif extension == 'gz':
+            cmdline.append('-z')
+        if os.spawnv(os.P_WAIT, '/bin/sh', ['sh', '-c', ' '.join(cmdline)]):
+            raise RuntimeError("Can't extract tarball")
+        os.rename(os.path.join(self.dir, match.group('dir')), os.path.join(self.dir, self.orig_dir))
+
+    def do_orig(self):
+        out = "../orig/%s" % self.orig_tar
+
+        try:
+            os.mkdir("../orig")
+        except OSError: pass
+        try:
+            os.stat(out)
+        except OSError: pass
+        else:
+            raise RuntimeError("Destination already exists")
+
+        self.log("Generate tarball %s\n" % out)
+        cmdline = ['tar -czf', out, '-C', self.dir, self.orig_dir]
+        try:
+            if os.spawnv(os.P_WAIT, '/bin/sh', ['sh', '-c', ' '.join(cmdline)]):
+                raise RuntimeError("Can't patch source")
+            os.chmod(out, 0644)
+        except:
+            try:
+                os.unlink(out)
+            except OSError:
+                pass
+            raise
+
+if __name__ == '__main__':
+    from optparse import OptionParser
+    p = OptionParser()
+    #p.add_option("-v", "--version", dest = "version")
+    options, args = p.parse_args(sys.argv)
+
+    input_tar = args[1]
+    version = args[2]
+
+    GenOrig(input_tar, version)()

Modified: lvm2/trunk/debian/changelog
==============================================================================
--- lvm2/trunk/debian/changelog	(original)
+++ lvm2/trunk/debian/changelog	Tue Jan  8 15:35:48 2008
@@ -1,8 +1,9 @@
-lvm2 (2.02.26-2) UNRELEASED; urgency=low
+lvm2 (2.02.29) UNRELEASED; urgency=low
 
-  * Load modules. 
+  * New upstream version.
+  * Load modules.
 
- -- Bastian Blank <waldi at debian.org>  Fri, 22 Jun 2007 11:41:49 +0000
+ -- Bastian Blank <waldi at debian.org>  Tue, 08 Jan 2008 15:34:23 +0000
 
 lvm2 (2.02.26-1) unstable; urgency=low
 

Modified: lvm2/trunk/debian/rules
==============================================================================
--- lvm2/trunk/debian/rules	(original)
+++ lvm2/trunk/debian/rules	Tue Jan  8 15:35:48 2008
@@ -7,6 +7,10 @@
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
+SOURCE := $(shell dpkg-parsechangelog | sed -ne 's,^Source: *\(.*\)$$,\1,p')
+VERSION_DEBIAN := $(shell dpkg-parsechangelog | sed -ne 's,^Version: *\(.*\)$$,\1,p')
+VERSION := $(shell echo "$(VERSION_DEBIAN)" | sed -e 's,^[0-9]*:,,' -e 's,-[^-]*$$,,')
+
 ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
 CFLAGS += -g
 endif
@@ -79,10 +83,12 @@
 
 	touch $@
 
+maintainerclean:
+	rm -rf $(filter-out .svn .svk debian, $(wildcard * .[^.]*))
+
 clean:
 	dh_testdir
 	rm -rf $(BUILD_DIR)
-
 	dh_clean
 
 install: install-deb install-udeb
@@ -148,4 +154,20 @@
 	dh_builddeb -a
 
 binary: binary-indep binary-arch
+
+DIR_ORIG = ../orig/$(SOURCE)-$(VERSION)
+TAR_ORIG_NAME = $(SOURCE)_$(VERSION).orig.tar.gz
+TAR_ORIG = $(firstword $(wildcard ../$(TAR_ORIG_NAME)) $(wildcard ../orig/$(TAR_ORIG_NAME)))
+
+orig: $(DIR_ORIG)
+	rsync --delete --exclude debian --exclude .svk --exclude .svn --link-dest=$(DIR_ORIG)/ -a $(DIR_ORIG)/ .
+
+$(DIR_ORIG):
+ifeq ($(TAR_ORIG),)
+	$(error Cannot find orig tarball $(TAR_ORIG_NAME))
+else
+	mkdir -p ../orig
+	tar -C ../orig -xzf $(TAR_ORIG)
+endif
+
 .PHONY: build clean binary-indep binary-arch binary install configure