[Pkg-voip-commits] r1133 - bayonne/trunk/debian

[Kilian Krause]

Author: kilian
Date: 2006-01-04 13:27:00 +0000 (Wed, 04 Jan 2006)
New Revision: 1133

Modified:
   bayonne/trunk/debian/changelog
   bayonne/trunk/debian/control
   bayonne/trunk/debian/init.d
   bayonne/trunk/debian/rules
Log:
some more cleanups to at least get most of linda shut up.


Modified: bayonne/trunk/debian/changelog
===================================================================
--- bayonne/trunk/debian/changelog	2006-01-04 12:42:20 UTC (rev 1132)
+++ bayonne/trunk/debian/changelog	2006-01-04 13:27:00 UTC (rev 1133)
@@ -1,10 +1,3 @@
-bayonne (1.2.15-3) unstable; urgency=low
-
-  * Remove all arches but i386, as upstream reckons it's unsuitable for !i386
-    anyway.
-
- -- Kilian Krause <kilian at debian.org>  Wed,  4 Jan 2006 13:28:41 +0100
-
 bayonne (1.2.15-2) unstable; urgency=low
 
   [ Mark Purcell ]
@@ -12,8 +5,11 @@
 
   [ Kilian Krause ]
   * Bump build-dependencies to libmysqlclient15-dev (Closes: #343764)
+  * Make package i386-only as upstream reckons that the code is entirely
+    unportable. (Closes: #321833, #334107, #342763)
+  * Standards-Version bumped to 3.6.2. Small changes applied.
 
- -- Kilian Krause <kilian at debian.org>  Sat, 31 Dec 2005 16:44:02 +0000
+ -- Kilian Krause <kilian at debian.org>  Wed,  4 Jan 2006 13:22:18 +0000
 
 bayonne (1.2.15-1) unstable; urgency=low
 

Modified: bayonne/trunk/debian/control
===================================================================
--- bayonne/trunk/debian/control	2006-01-04 12:42:20 UTC (rev 1132)
+++ bayonne/trunk/debian/control	2006-01-04 13:27:00 UTC (rev 1133)
@@ -3,12 +3,12 @@
 Priority: optional
 Maintainer: Debian VoIP Team <pkg-voip-maintainers at lists.alioth.debian.org>
 Uploaders: Mark Purcell <msp at debian.org>, Kilian Krause <kilian at debian.org>, Jose Carlos Garcia Sogo <jsogo at debian.org>, Santiago Garcia Mantinan <manty at debian.org>, Simon Richter <sjr at debian.org>
-Build-Depends: debhelper (>> 3.0.0), libcommoncpp2-dev (>= 1.3.10-4), libccaudio-dev (>= 1.1.2-2),  libccscript-dev (>= 2.5.7-4), libperl-dev, zlib1g-dev, libxml2-dev, tcl8.4-dev, libhoard, libzap-dev, libjpeg62-dev, libmysqlclient15-dev, libpam0g-dev (>= 0.76), dpatch
-Standards-Version: 3.5.2
+Build-Depends: debhelper (>> 4.0.0), libcommoncpp2-dev (>= 1.3.10-4), libccaudio-dev (>= 1.1.2-2),  libccscript-dev (>= 2.5.7-4), libperl-dev, zlib1g-dev, libxml2-dev, tcl8.4-dev, libhoard, libzap-dev, libjpeg62-dev, libmysqlclient15-dev, libpam0g-dev (>= 0.76), dpatch, autotools-dev
+Standards-Version: 3.6.2
 
 Package: bayonne
 Architecture: i386
-Depends: ${shlibs:Depends}, adduser
+Depends: ${shlibs:Depends}, adduser, procps
 Recommends: bayonne-prompts-sys, sox, wget
 Suggests: bayonne-prompts-en, bayonne-doc
 Description: Telephony server of the GNU project

Modified: bayonne/trunk/debian/init.d
===================================================================
--- bayonne/trunk/debian/init.d	2006-01-04 12:42:20 UTC (rev 1132)
+++ bayonne/trunk/debian/init.d	2006-01-04 13:27:00 UTC (rev 1133)
@@ -40,18 +40,6 @@
 	# --oknodo --stop --quiet \
 	echo "$NAME."
 	;;
-  #reload)
-	#
-	#	If the daemon can reload its config files on the fly
-	#	for example by sending it SIGHUP, do it here.
-	#
-	#	If the daemon responds to changes in its config file
-	#	directly anyway, make this a do-nothing entry.
-	#
-	# echo "Reloading $DESC configuration files."
-	# start-stop-daemon --stop --signal 1 --quiet --pidfile \
-	#	/var/run/$NAME.pid --exec $DAEMON
-  #;;
   restart|force-reload)
 	#
 	#	If the "reload" option is implemented, move the "force-reload"
@@ -59,7 +47,9 @@
 	#	just the same as "restart".
 	#
 	echo -n "Restarting $DESC: "
-	$0 stop && sleep 5 && $0 start
+	$0 stop 
+	sleep 5
+	$0 start
 	echo "$NAME."
 	;;
   *)

Modified: bayonne/trunk/debian/rules
===================================================================
--- bayonne/trunk/debian/rules	2006-01-04 12:42:20 UTC (rev 1132)
+++ bayonne/trunk/debian/rules	2006-01-04 13:27:00 UTC (rev 1133)
@@ -6,7 +6,7 @@
 #export DH_VERBOSE=1
 
 # This is the debhelper compatability version to use.
-export DH_COMPAT=3
+export DH_COMPAT=4
 
 export OPENH323DIR=/usr/share/openh323
 export PWLIBDIR=/usr/share/pwlib
@@ -86,7 +86,9 @@
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/bayonne
 
 	dh_movefiles --sourcedir=debian/bayonne
+	rm -f $(CURDIR)/debian/bayonne/etc/*.orig
 
+
 # Build architecture-independent files here.
 binary-indep: build install
 	dh_testdir -i