[Pkg-voip-commits] r8340 - in /gnugk/trunk/debian: changelog control gnugk.install init.d rules

[msp at alioth.debian.org]

Author: msp
Date: Mon Apr 26 08:09:17 2010
New Revision: 8340

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=8340
Log:
Update gnugk.init.d - init.d-script-missing-dependency-on-remote_fs

Added:
    gnugk/trunk/debian/gnugk.install
Modified:
    gnugk/trunk/debian/changelog
    gnugk/trunk/debian/control
    gnugk/trunk/debian/init.d
    gnugk/trunk/debian/rules

Modified: gnugk/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/gnugk/trunk/debian/changelog?rev=8340&op=diff
==============================================================================
--- gnugk/trunk/debian/changelog (original)
+++ gnugk/trunk/debian/changelog Mon Apr 26 08:09:17 2010
@@ -3,8 +3,9 @@
   * New upstream release
   * Added Build-Depends: libh323plus-dev
   * configure --disable-unixodbc - unsupported API
-
- -- Mark Purcell <msp at debian.org>  Mon, 26 Apr 2010 16:23:20 +1000
+  * Update gnugk.init.d - init.d-script-missing-dependency-on-remote_fs
+
+ -- Mark Purcell <msp at debian.org>  Mon, 26 Apr 2010 18:07:56 +1000
 
 gnugk (2:2.3.0-4-1) unstable; urgency=low
 

Modified: gnugk/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-voip/gnugk/trunk/debian/control?rev=8340&op=diff
==============================================================================
--- gnugk/trunk/debian/control (original)
+++ gnugk/trunk/debian/control Mon Apr 26 08:09:17 2010
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian VoIP Team <pkg-voip-maintainers at lists.alioth.debian.org>
 Uploaders: Kilian Krause <kilian at debian.org>, Mark Purcell <msp at debian.org>, Faidon Liambotis <paravoid at debian.org>
-Build-Depends: debhelper (>= 7), cdbs,
+Build-Depends: debhelper (>= 7.0.50~), cdbs,
  libh323plus-dev, libspeex-dev,
  libsdl1.2-dev,
  linuxdoc-tools,

Added: gnugk/trunk/debian/gnugk.install
URL: http://svn.debian.org/wsvn/pkg-voip/gnugk/trunk/debian/gnugk.install?rev=8340&op=file
==============================================================================
--- gnugk/trunk/debian/gnugk.install (added)
+++ gnugk/trunk/debian/gnugk.install Mon Apr 26 08:09:17 2010
@@ -1,0 +1,2 @@
+obj_*/gnugk usr/sbin/
+obj_*/addpasswd usr/sbin/

Modified: gnugk/trunk/debian/init.d
URL: http://svn.debian.org/wsvn/pkg-voip/gnugk/trunk/debian/init.d?rev=8340&op=diff
==============================================================================
--- gnugk/trunk/debian/init.d (original)
+++ gnugk/trunk/debian/init.d Mon Apr 26 08:09:17 2010
@@ -7,8 +7,8 @@
 
 ### BEGIN INIT INFO
 # Provides:          gnugk
-# Required-Start:    $syslog
-# Required-Stop:     $syslog
+# Required-Start:    $syslog $remote_fs
+# Required-Stop:     $syslog $remote_fs
 # Should-Start:      $local_fs $network $named
 # Should-Stop:       $local_fs $network $named
 # Default-Start:     2 3 4 5

Modified: gnugk/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/gnugk/trunk/debian/rules?rev=8340&op=diff
==============================================================================
--- gnugk/trunk/debian/rules (original)
+++ gnugk/trunk/debian/rules Mon Apr 26 08:09:17 2010
@@ -6,30 +6,46 @@
 ## pwlib_compat.h does not set this on OpenH323 >= 1.19 by mistake
 export STDCCFLAGS+= -DhasSRV=1
 
+
+export PREFIX=/usr/
+export OPENH323DIR=/usr/share/openh323
+export OPENH323MAKEDIR=/usr/share/openh323
+export OH323_LIBDIR=/usr/lib
 export PTLIB_CONFIG=/usr/bin/ptlib-config
-export OPENH323DIR=/usr/include/openh323
+export PTLIBDIR=$(shell /usr/bin/ptlib-config --ptlibdir)
 
-export PTLIBDIR=$(shell /usr/bin/ptlib-config --ptlibdir)
-export OPENH323MAKEDIR=/usr/include/openh323
-export PREFIX=/usr/
-export OH323_LIBDIR=/usr/lib
+%:
+	dh $@
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/autotools.mk
+#include /usr/share/cdbs/1/rules/debhelper.mk
+#include /usr/share/cdbs/1/class/autotools.mk
 -include /usr/share/gnome-pkg-tools/1/rules/sf-get-source.mk
 
-DEB_INSTALL_CHANGELOGS_ALL := changes.txt
-DEB_CONFIGURE_EXTRA_FLAGS := --with-pgsql-include-dir=`/usr/bin/pg_config --includedir` --disable-unixodbc
-DEB_DH_INSTALLINIT_ARGS	:= -- defaults 90 10
+override_dh_auto_configure:
+	dh_auto_configure -- --with-pgsql-include-dir=`/usr/bin/pg_config --includedir` --disable-unixodbc
 
-DEB_MAKE_BUILD_TARGET    := opt addpasswd doc
-DEB_MAKE_CHECK_TARGET := obj*/gnugk -h > /dev/null
+override_dh_auto_build:
+	dh_auto_build -- opt addpasswd doc
+
+override_dh_auto_test:
+	obj*/gnugk -h > /dev/null
+
+override_dh_installchangelogs:
+	dh_installchangelogs changes.txt
+
+override_dh_install_init:
+	dh_install_init -- defaults 90 10
+
+override_dh_auto_install:
+	dh_auto_install
+	install --mode=640 --owner=root --group=root \
+		etc/complete.ini $(CURDIR)/debian/gnugk/etc/gatekeeper.ini
+
+override_dh_fixperms:
+	dh_fixperms
+	chmod -x debian/gnugk/usr/share/doc/gnugk/examples/odbc.ini
+
 DEB_MAKE_INSTALL_TARGET  := install DESTDIR=$(CURDIR)/debian/gnugk INSTALL_DIR=$(CURDIR)/debian/gnugk/usr INSTALLBIN_DIR=$(CURDIR)/debian/gnugk/usr/sbin
-
-clean::
-	rm -fR docs/manual/.cvsignore
 
 install/gnugk::
 	chmod -x etc/odbc.ini
-	install --mode=640 --owner=root --group=root \
-		etc/complete.ini $(CURDIR)/debian/gnugk/etc/gatekeeper.ini