Misc fixes

diff --git a/Makefile b/Makefile
index 796c11eca1c97521b6761add4fbedabd770bf64b..e9998b448c0f1e24b73893c8ae6a6960a8d4aa47 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 $(TODAY)
+               dch -v 2-$(TODAY)
                fakeroot dpkg-buildpackage
                
 
 release:       clean
-               mkdir -p ../$(MODULE_NAME)-$(TODAY)
-               cp -a *.h *.c *.lds Makefile debian doc misc ../$(MODULE_NAME)-$(TODAY)
-               sed -i "s|^\(#define OMNIBOOK_MODULE_VERSION.*\)\".*\"|\1\"$(TODAY)\"|" ../$(MODULE_NAME)-$(TODAY)/omnibook.h
-               rm -f ../$(MODULE_NAME)-$(TODAY).tar ../$(MODULE_NAME)-$(TODAY).tar.gz
-               (cd ..; tar cvf $(MODULE_NAME)-$(TODAY).tar $(MODULE_NAME)-$(TODAY); gzip -9 $(MODULE_NAME)-$(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)-current.tar ../$(MODULE_NAME)-current.tar.gz
-               (cd ..; tar cvf $(MODULE_NAME)-current.tar $(MODULE_NAME)-current; gzip -9 $(MODULE_NAME)-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/changelog b/debian/changelog
index da17a4d268cff5f9ecc2a76f85d8027124c75955..98ce30daa45b26e859de87116ae13c0b166cae6f 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,3 @@
-omnibook (20060630) unstable; urgency=low
-
-  * Locally built 
-
- -- Mathieu Bérard <mathieu@localhost.localdomain>  Fri, 30 Jun 2006 23:24:17 +0200
-
 omnibook (20060126-1) unstable; urgency=low
 
   * Minor build inconveniences corrected.