- Makefile: added nodeb tar option: make tar nodeb=1 will build a src.tar.gz

 without the debian dir (needed for debian packaging)

- debian: minor cleanups

Makefile

@@ -114,6 +114,8 @@ export PREFIX LOCALBASE
 #export INSTALL INSTALL-CFG INSTALL-BIN INSTALL-MODULES INSTALL-DOC INSTALL-MAN 
 #export INSTALL-TOUCH
 
+tar_name=$(NAME)-$(RELEASE)_src
+
 tar_extra_args+=$(addprefix --exclude=$(notdir $(CURDIR))/, \
 					$(auto_gen) $(auto_gen_others))
 ifneq ($(TLS),)
@@ -121,6 +123,12 @@ ifneq ($(TLS),)
 else
 	tar_extra_args+=--exclude=$(notdir $(CURDIR))/tls* 
 endif
+
+ifneq ($(nodeb),)
+	tar_extra_args+=--exclude=$(notdir $(CURDIR))/debian 
+	tar_name:=$(tar_name)_nodeb
+endif
+
 # include the common rules
 include Makefile.rules
 
@@ -195,7 +203,7 @@ tar:
 			    mv tmp/_tar1/$(notdir $(CURDIR)) \
 			       tmp/_tar2/"$(NAME)-$(RELEASE)" && \
 			    (cd tmp/_tar2 && $(TAR) \
-			                    -zcf ../../"$(NAME)-$(RELEASE)_src".tar.gz \
+			                    -zcf ../../"$(tar_name)".tar.gz \
 			                               "$(NAME)-$(RELEASE)" ) ; \
 			    rm -rf tmp/_tar1; rm -rf tmp/_tar2
 

debian/changelog

@@ -88,15 +88,15 @@ ser (0.8.11-pre29) unstable; urgency=low
 
 ser (0.8.10) unstable; urgency=low
 
- * fixes lots of  bugs in 0.8.9 (log not working, ipv6 address conversion)
+  * fixes lots of  bugs in 0.8.9 (log not working, ipv6 address conversion)
 
- * introduces port support in uri matching with myself
+  * introduces port support in uri matching with myself
 
- * faster hash function (statefull performance increase ~10%)
+  * faster hash function (statefull performance increase ~10%)
 
- * modules updates (sms, jabber)
+  * modules updates (sms, jabber)
 
- * the jabber module is in a separate package now (it depends on libexpat)
+  * the jabber module is in a separate package now (it depends on libexpat)
 
  -- Andrei Pelinescu-Onciul <[email protected]>  Tue, 4 Nov 2002 17:23:37 +0200
 

debian/postrm

@@ -37,7 +37,7 @@ esac
 
 if [ "$1" = "purge" ] ; then
 # remove user/group on purge
-	deluser --quiet --remove-home ser &>/dev/null || true
+	deluser --quiet --remove-home ser >/dev/null 2>&1 || true
 # remove /etc/ser if empty
 	rmdir /etc/ser || true
 fi