[Pkg-voip-commits] r1392 - in radiusclient-ng/trunk/debian: . patches

[Jan Janak]

Author: janakj-guest
Date: 2006-03-13 16:11:30 +0000 (Mon, 13 Mar 2006)
New Revision: 1392

Added:
   radiusclient-ng/trunk/debian/patches/install-servers.dpatch
Modified:
   radiusclient-ng/trunk/debian/changelog
   radiusclient-ng/trunk/debian/control
   radiusclient-ng/trunk/debian/patches/00list
   radiusclient-ng/trunk/debian/rules
Log:
- added dpatch to build dependencies
- changelog updated
- dpatch which installs servers file properly


Modified: radiusclient-ng/trunk/debian/changelog
===================================================================
--- radiusclient-ng/trunk/debian/changelog	2006-03-13 13:58:04 UTC (rev 1391)
+++ radiusclient-ng/trunk/debian/changelog	2006-03-13 16:11:30 UTC (rev 1392)
@@ -7,8 +7,9 @@
   * Prepared for dpatch
   * Removed files outside debian directory from svn
   * Fixed the contents of debian/copyright
+  * Install servers file in sysconfdir
 
- -- Jan Janak <jan at iptel.org>  Mon, 13 Mar 2006 14:56:10 +0100
+ -- Jan Janak <jan at iptel.org>  Mon, 13 Mar 2006 17:10:02 +0100
 
 radiusclient-ng (0.5.2-0.2) unstable; urgency=low
 

Modified: radiusclient-ng/trunk/debian/control
===================================================================
--- radiusclient-ng/trunk/debian/control	2006-03-13 13:58:04 UTC (rev 1391)
+++ radiusclient-ng/trunk/debian/control	2006-03-13 16:11:30 UTC (rev 1392)
@@ -2,7 +2,7 @@
 Priority: optional
 Maintainer: Debian VoIP Team <pkg-voip-maintainers at lists.alioth.debian.org>
 Uploaders: Mark Purcell <msp at debian.org>, Jan Janak <jan at iptel.org>
-Build-Depends: debhelper (>= 4.0.0), autotools-dev
+Build-Depends: debhelper (>= 4.0.0), dpatch, autotools-dev
 Standards-Version: 3.6.1
 Section: libs
 

Modified: radiusclient-ng/trunk/debian/patches/00list
===================================================================
--- radiusclient-ng/trunk/debian/patches/00list	2006-03-13 13:58:04 UTC (rev 1391)
+++ radiusclient-ng/trunk/debian/patches/00list	2006-03-13 16:11:30 UTC (rev 1392)
@@ -0,0 +1 @@
+install-servers

Added: radiusclient-ng/trunk/debian/patches/install-servers.dpatch
===================================================================
--- radiusclient-ng/trunk/debian/patches/install-servers.dpatch	2006-03-13 13:58:04 UTC (rev 1391)
+++ radiusclient-ng/trunk/debian/patches/install-servers.dpatch	2006-03-13 16:11:30 UTC (rev 1392)
@@ -0,0 +1,66 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## servers.dpatch by Jan Janak <jan at iptel.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description
+
+ at DPATCH@
+--- ./etc/Makefile.am.orig	2005-11-07 23:55:34.000000000 +0100
++++ ./etc/Makefile.am	2006-03-13 16:07:22.000000000 +0100
+@@ -16,7 +16,7 @@
+ pkgsysconfdir = @pkgsysconfdir@
+ pkgsysconf_DATA = issue port-id-map radiusclient.conf \
+ 	dictionary dictionary.ascend dictionary.compat dictionary.merit \
+-	dictionary.sip
++	dictionary.sip servers
+ 
+ EXTRA_DIST = issue port-id-map dictionary dictionary.ascend \
+ 	dictionary.compat dictionary.merit servers radiusclient.conf.in \
+@@ -27,10 +27,10 @@
+ 	    -e 's|@pkgsysconf''dir@|$(pkgsysconfdir)|g' \
+ 	    <$(srcdir)/radiusclient.conf.in >radiusclient.conf
+ 
+-install-data-local: servers
+-	$(mkinstalldirs) $(pkgsysconfdir); \
+-        echo " $(INSTALL) -m 600 $(srcdir)/servers $(pkgsysconfdir)/servers"; \
+-        $(INSTALL) -m 600 $(srcdir)/servers $(pkgsysconfdir)/servers
++#install-data-local: servers
++#	$(mkinstalldirs) $(pkgsysconfdir); \
++#        echo " $(INSTALL) -m 600 $(srcdir)/servers $(pkgsysconfdir)/servers"; \
++#        $(INSTALL) -m 600 $(srcdir)/servers $(pkgsysconfdir)/servers
+ 
+-uninstall-local:
+-	rm -f $(pkgsysconfdir)/servers
++#uninstall-local:
++#	rm -f $(pkgsysconfdir)/servers
+--- ./etc/Makefile.in.orig	2006-03-13 14:59:23.000000000 +0100
++++ ./etc/Makefile.in	2006-03-13 16:08:05.000000000 +0100
+@@ -170,7 +170,7 @@
+ CLEANFILES = *~ radiusclient.conf
+ pkgsysconf_DATA = issue port-id-map radiusclient.conf \
+ 	dictionary dictionary.ascend dictionary.compat dictionary.merit \
+-	dictionary.sip
++	dictionary.sip servers
+ 
+ EXTRA_DIST = issue port-id-map dictionary dictionary.ascend \
+ 	dictionary.compat dictionary.merit servers radiusclient.conf.in \
+@@ -365,13 +365,13 @@
+ 	    -e 's|@pkgsysconf''dir@|$(pkgsysconfdir)|g' \
+ 	    <$(srcdir)/radiusclient.conf.in >radiusclient.conf
+ 
+-install-data-local: servers
+-	$(mkinstalldirs) $(pkgsysconfdir); \
+-        echo " $(INSTALL) -m 600 $(srcdir)/servers $(pkgsysconfdir)/servers"; \
+-        $(INSTALL) -m 600 $(srcdir)/servers $(pkgsysconfdir)/servers
++#install-data-local: servers
++#	$(mkinstalldirs) $(pkgsysconfdir); \
++#        echo " $(INSTALL) -m 600 $(srcdir)/servers $(pkgsysconfdir)/servers"; \
++#        $(INSTALL) -m 600 $(srcdir)/servers $(pkgsysconfdir)/servers
+ 
+-uninstall-local:
+-	rm -f $(pkgsysconfdir)/servers
++#uninstall-local:
++#	rm -f $(pkgsysconfdir)/servers
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:

Modified: radiusclient-ng/trunk/debian/rules
===================================================================
--- radiusclient-ng/trunk/debian/rules	2006-03-13 13:58:04 UTC (rev 1391)
+++ radiusclient-ng/trunk/debian/rules	2006-03-13 16:11:30 UTC (rev 1392)
@@ -45,7 +45,7 @@
 config.status: patch configure
 	dh_testdir
 	# Add here commands to configure the package.
-	CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --sysconfdir=/etc
+	CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --sysconfdir=/etc
 
 
 build: build-stamp