More polish before release

diff --git a/Makefile b/Makefile
index bf8a57d143d65eb943c8f447105459fcd3912e7a..23019d4a931a28cca98c0725d0a40b36d894633c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -104,19 +104,19 @@ kpatch:           kinstall
                (cd $(KSRC); patch -p1 < $(BDIR)/misc/omnibook-integration.patch)
 
 deb:           clean
-               dch -v 1:2-$(TODAY)
+               dch -v 1:2.$(TODAY)
                fakeroot dpkg-buildpackage
                
 
 release:       clean
-               mkdir -p ../$(MODULE_NAME)-2-$(TODAY)
-               cp -a *.h *.c *.lds Makefile debian doc misc ../$(MODULE_NAME)-2-$(TODAY)
-               sed -i "s|^\(#define OMNIBOOK_MODULE_VERSION.*\)\".*\"|\1\"2-$(TODAY)\"|" ../$(MODULE_NAME)-2-$(TODAY)/omnibook.h
-               rm -f ../$(MODULE_NAME)-2-$(TODAY).tar ../$(MODULE_NAME)-2-$(TODAY).tar.gz
-               (cd ..; tar cvf $(MODULE_NAME)-2-$(TODAY).tar $(MODULE_NAME)-2-$(TODAY); gzip -9 $(MODULE_NAME)-2-$(TODAY).tar)
+               mkdir -p ../$(MODULE_NAME)-2.$(TODAY)
+               cp -a *.h *.c *.lds Makefile debian doc misc ../$(MODULE_NAME)-2.$(TODAY)
+               sed -i "s|^\(#define OMNIBOOK_MODULE_VERSION.*\)\".*\"|\1\"2.$(TODAY)\"|" ../$(MODULE_NAME)-2.$(TODAY)/omnibook.h
+               rm -f ../$(MODULE_NAME)-2.$(TODAY).tar ../$(MODULE_NAME)-2.$(TODAY).tar.gz
+               (cd ..; tar cvf $(MODULE_NAME)-2.$(TODAY).tar $(MODULE_NAME)-2.$(TODAY); gzip -9 $(MODULE_NAME)-2.$(TODAY).tar)
 
 current:       clean
-               rm -f ../$(MODULE_NAME)-2-current.tar ../$(MODULE_NAME)-2-current.tar.gz
-               (cd ..; tar cvf $(MODULE_NAME)-2-current.tar $(MODULE_NAME)-current; gzip -9 $(MODULE_NAME)-2-current.tar)
+               rm -f ../$(MODULE_NAME)-2.current.tar ../$(MODULE_NAME)-2.current.tar.gz
+               (cd ..; tar cvf $(MODULE_NAME)-2.current.tar $(MODULE_NAME)-current; gzip -9 $(MODULE_NAME)-2.current.tar)
 
 # End of file

diff --git a/debian/control b/debian/control
index c68e93214582ec60b8b72bc1cb5e5f9303cde3c4..97f81fe31ac109ccf0a44a243b1e6181fda39849 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -1,9 +1,9 @@
 Source: omnibook
 Section: misc
 Priority: optional
-Maintainer: Peter Soos <sp@osb.hu>
+Maintainer: Mathieu Bérard <math_b@users.sourceforge.net>
 Build-Depends: debhelper (>> 4.0.0)
-Standards-Version: 3.6.2
+Standards-Version: 3.7.2
 
 Package: omnibook-source
 Architecture: all

diff --git a/debian/control.modules.in b/debian/control.modules.in
index acb4893407bb8a6c55b3351abd82630d52212967..6739b7b3c646b01a20000754a6e997cd8cf9a309 100644 (file)
--- a/debian/control.modules.in
+++ b/debian/control.modules.in
@@ -1,9 +1,9 @@
 Source: omnibook
 Section: misc
 Priority: optional
-Maintainer: Peter Soos <sp@osb.hu>
+Maintainer: Mathieu Bérard <math_b@users.sourceforge.net>
 Build-Depends: debhelper (>> 4.0.0), build-essential, module-assistant, kernel-package
-Standards-Version: 3.6.2
+Standards-Version: 3.7.2
 
 Package: omnibook-module-_KVERS_
 Architecture: i386

diff --git a/debian/docs b/debian/docs
index 17b83031ba1b17301bde642de6961106555837ef..7682c66680d11a77de6c631640acafe3a66d7d7a 100644 (file)
--- a/debian/docs
+++ b/debian/docs
@@ -1,5 +1,4 @@
 doc/BUGS
-doc/ChangeLog
 doc/CREDITS
 doc/README-1st
 doc/README

diff --git a/debian/rules b/debian/rules
index c7a7323f7b066f78c89bb0e5467696ef5dee6cad..c121ce2b2cefd5b5badcf8b67c76086fbc922a4e 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -95,7 +95,7 @@ binary-modules: prep-deb-files
        $(MAKE) install KSRC=$(KSRC) DESTDIR=$(CURDIR)/debian/$(PKGNAME) DEPMOD=""
 
        dh_installdocs
-       dh_installchangelogs
+       dh_installchangelogs doc/ChangeLog
        dh_compress
        dh_fixperms
        dh_installdeb
@@ -145,7 +145,7 @@ install: build
 binary-indep: build install
        dh_testdir -i
        dh_testroot -i
-       dh_installchangelogs -i
+       dh_installchangelogs -i doc/ChangeLog
        dh_installdocs -i
        dh_installexamples -i
 #      dh_install -i

diff --git a/doc/ChangeLog b/doc/ChangeLog
index dc9f37884c6a8599534ed33df3da52d6fdf27393..2808e5e28891f10923a7d5ecf90c20e643da44ec 100644 (file)
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,7 +1,7 @@
 Changelog file for omnibook package:
 ------------------------------------
 
-2-20060806 Mathieu Bérard <math_b@users.sourceforge.net>
+2.20060806 Mathieu Bérard <math_b@users.sourceforge.net>
 * Make the module linux 2.6 only
   Kernel versions from 2.6.8 to a least 2.6.17 are supported
   Code for compatibility with kernels older than 2.6.17 is 
@@ -41,7 +41,7 @@ Changelog file for omnibook package:
 * Add a new feature for testers: dump
   Dump was stolen from the ibm_acpi driver
   It is disabled by default
-* Bump version to 2-YYYYMMDD
+* Bump version to 2.YYYYMMDD
 
 2006-05-15 Thomas Perl <thp@perli.net>
 * Added support for xe4500's "audio mute" led

diff --git a/omnibook.h b/omnibook.h
index 355df08b047431e00bc4a243f8b9f423774ac7fb..f241eb06ee24f257e1f7e4318ebb62f83b8f3c62 100644 (file)
--- a/omnibook.h
+++ b/omnibook.h
@@ -25,7 +25,7 @@
  */
 
 #define OMNIBOOK_MODULE_NAME           "omnibook"
-#define OMNIBOOK_MODULE_VERSION                "2-20000000"
+#define OMNIBOOK_MODULE_VERSION                "2.20000000"
 
 /*
  * EC types