[xml/sgml-commit] r2134 - in /packages/refdb/trunk/debian: patches/use_sbin.patch patches/use_slashrun.patch rules
malat at users.alioth.debian.org
malat at users.alioth.debian.org
Fri Dec 28 16:49:18 UTC 2012
Author: malat
Date: Fri Dec 28 16:49:17 2012
New Revision: 2134
URL: http://svn.debian.org/wsvn/debian-xml-sgml/?sc=1&rev=2134
Log:
Fix remaining bits of /run
Modified:
packages/refdb/trunk/debian/patches/use_sbin.patch
packages/refdb/trunk/debian/patches/use_slashrun.patch
packages/refdb/trunk/debian/rules
Modified: packages/refdb/trunk/debian/patches/use_sbin.patch
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/refdb/trunk/debian/patches/use_sbin.patch?rev=2134&op=diff
==============================================================================
--- packages/refdb/trunk/debian/patches/use_sbin.patch (original)
+++ packages/refdb/trunk/debian/patches/use_sbin.patch Fri Dec 28 16:49:17 2012
@@ -1,31 +1,7 @@
-Index: refdb-0.9.9/scripts/refdbctl
+Index: refdb-0.9.9/scripts/refdb.in
===================================================================
---- refdb-0.9.9.orig/scripts/refdbctl 2012-12-28 17:32:42.000000000 +0100
-+++ refdb-0.9.9/scripts/refdbctl 2012-12-28 17:33:05.000000000 +0100
-@@ -24,10 +24,10 @@
- # NB we must use bash for "cd -" to work
-
- # full path to the daemon binary
--REFDBD='/usr/bin/refdbd'
-+REFDBD='/usr/sbin/refdbd'
-
- # full path of the file the daemon writes its PID to
--PIDFILE='/var/run/refdbd.pid'
-+PIDFILE='/run/refdbd.pid'
-
- # default return value is 0 (all fine). Other values are: 1 (error),
- # 2 (nothing to do), 3 (unknown or missing command)
-@@ -126,4 +126,4 @@
- RETVAL=3;;
- esac
-
--exit $RETVAL
-\ No newline at end of file
-+exit $RETVAL
-Index: refdb-0.9.9/scripts/refdb
-===================================================================
---- refdb-0.9.9.orig/scripts/refdb 2012-12-28 17:34:02.000000000 +0100
-+++ refdb-0.9.9/scripts/refdb 2012-12-28 17:34:40.000000000 +0100
+--- refdb-0.9.9.orig/scripts/refdb.in 2012-12-28 17:43:52.000000000 +0100
++++ refdb-0.9.9/scripts/refdb.in 2012-12-28 17:44:12.000000000 +0100
@@ -32,13 +32,13 @@
NAME=refdb
@@ -34,12 +10,12 @@
+PATH=/sbin:/usr/sbin
# the full path to the binary that is to be started as a daemon
--DAEMON=/usr/bin/refdbd
-+DAEMON=/usr/sbin/refdbd
+-DAEMON=<prefix>/bin/refdbd
++DAEMON=<prefix>/sbin/refdbd
# the full path to the script that actually starts and stops the application
--REFDBCTL=/usr/bin/refdbctl
-+REFDBCTL=/usr/sbin/refdbctl
+-REFDBCTL=<prefix>/bin/refdbctl
++REFDBCTL=<prefix>/sbin/refdbctl
# set to 'YES' if the OS uses a BSD-style daemon startup system (this is
# true for BSD-UNIX and Unices derived thereof, as well as for the
Modified: packages/refdb/trunk/debian/patches/use_slashrun.patch
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/refdb/trunk/debian/patches/use_slashrun.patch?rev=2134&op=diff
==============================================================================
--- packages/refdb/trunk/debian/patches/use_slashrun.patch (original)
+++ packages/refdb/trunk/debian/patches/use_slashrun.patch Fri Dec 28 16:49:17 2012
@@ -1,7 +1,7 @@
Index: refdb-0.9.9/scripts/Makefile.am
===================================================================
---- refdb-0.9.9.orig/scripts/Makefile.am 2012-12-28 17:36:52.000000000 +0100
-+++ refdb-0.9.9/scripts/Makefile.am 2012-12-28 17:37:16.000000000 +0100
+--- refdb-0.9.9.orig/scripts/Makefile.am 2012-12-28 17:43:14.000000000 +0100
++++ refdb-0.9.9/scripts/Makefile.am 2012-12-28 17:44:33.000000000 +0100
@@ -61,7 +61,7 @@
refdb-init: refdb-init.in
@@ -13,8 +13,8 @@
sed 's%<myshell>%$(myshell)%' | \
Index: refdb-0.9.9/src/refdbd.c
===================================================================
---- refdb-0.9.9.orig/src/refdbd.c 2012-12-28 17:37:29.000000000 +0100
-+++ refdb-0.9.9/src/refdbd.c 2012-12-28 17:37:35.000000000 +0100
+--- refdb-0.9.9.orig/src/refdbd.c 2012-12-28 17:43:34.000000000 +0100
++++ refdb-0.9.9/src/refdbd.c 2012-12-28 17:44:33.000000000 +0100
@@ -97,7 +97,7 @@
char log_file[PREFS_BUF_LEN] = "/var/log/refdbd.log"; /* custom log file */
char log_dest[PREFS_BUF_LEN] = "2"; /* log destination. 0=print on stderr, 1=use syslog, 2=use custom logfile */
@@ -26,8 +26,8 @@
char remote_admin[PREFS_BUF_LEN] = "f"; /* remote administration not allowed */
Index: refdb-0.9.9/etc/Makefile.am
===================================================================
---- refdb-0.9.9.orig/etc/Makefile.am 2012-12-28 17:37:53.000000000 +0100
-+++ refdb-0.9.9/etc/Makefile.am 2012-12-28 17:37:57.000000000 +0100
+--- refdb-0.9.9.orig/etc/Makefile.am 2012-12-28 17:43:14.000000000 +0100
++++ refdb-0.9.9/etc/Makefile.am 2012-12-28 17:44:33.000000000 +0100
@@ -12,7 +12,7 @@
$(objects): %.example: %
@@ -37,10 +37,10 @@
sed 's%<pkgdatadir>%$(pkgdatadir)%' | \
sed 's%<db_path>%$(db_dir)%' | \
sed 's%<classpath_root>%$(classpath_root)%' > $@
-Index: refdb-0.9.9/etc/refdbdrc.mysql
+Index: refdb-0.9.9/etc/refdbdrc
===================================================================
---- refdb-0.9.9.orig/etc/refdbdrc.mysql 2012-12-28 17:38:20.000000000 +0100
-+++ refdb-0.9.9/etc/refdbdrc.mysql 2012-12-28 17:38:27.000000000 +0100
+--- refdb-0.9.9.orig/etc/refdbdrc 2012-12-28 17:43:14.000000000 +0100
++++ refdb-0.9.9/etc/refdbdrc 2012-12-28 17:44:33.000000000 +0100
@@ -75,7 +75,7 @@
# The full path of the file where the refdbd stores the current process
@@ -50,55 +50,42 @@
# Allow (t) or deny (f) remote administration of refdbd through refdba
remoteadmin f
-Index: refdb-0.9.9/etc/refdbdrc.mysql.example
+Index: refdb-0.9.9/doc/refdbctl.1.xml
===================================================================
---- refdb-0.9.9.orig/etc/refdbdrc.mysql.example 2012-12-28 17:38:29.000000000 +0100
-+++ refdb-0.9.9/etc/refdbdrc.mysql.example 2012-12-28 17:38:36.000000000 +0100
-@@ -75,7 +75,7 @@
+--- refdb-0.9.9.orig/doc/refdbctl.1.xml 2012-12-28 17:47:03.000000000 +0100
++++ refdb-0.9.9/doc/refdbctl.1.xml 2012-12-28 17:47:11.000000000 +0100
+@@ -62,7 +62,7 @@
- # The full path of the file where the refdbd stores the current process
- # ID of the parent process
--pidfile /var/run/refdbd.pid
-+pidfile /run/refdbd.pid
+ <refsect1 id='refdbctl-files'>
+ <title>Files</title>
+- <para><filename>/var/run/refdbd.pid</filename></para>
++ <para><filename>/run/refdbd.pid</filename></para>
- # Allow (t) or deny (f) remote administration of refdbd through refdba
- remoteadmin f
-Index: refdb-0.9.9/etc/refdbdrc.sqlite3
+ <para>The run file containing the process ID of the running refdbd process.</para>
+ </refsect1>
+Index: refdb-0.9.9/scripts/Makefile.in
===================================================================
---- refdb-0.9.9.orig/etc/refdbdrc.sqlite3 2012-12-28 17:38:05.000000000 +0100
-+++ refdb-0.9.9/etc/refdbdrc.sqlite3 2012-12-28 17:38:11.000000000 +0100
-@@ -75,7 +75,7 @@
+--- refdb-0.9.9.orig/scripts/Makefile.in 2012-12-28 17:47:29.000000000 +0100
++++ refdb-0.9.9/scripts/Makefile.in 2012-12-28 17:47:42.000000000 +0100
+@@ -418,7 +418,7 @@
- # The full path of the file where the refdbd stores the current process
- # ID of the parent process
--pidfile /var/run/refdbd.pid
-+pidfile /run/refdbd.pid
+ refdb-init: refdb-init.in
+ sed 's%/var/log%$(log_dir)%' < $(srcdir)/refdb-init.in | \
+- sed 's%/var/run%$(var_dir)%' | \
++ sed 's%/run%$(var_dir)%' | \
+ sed 's%<pkgdatadir>%$(pkgdatadir)%' | \
+ sed 's%<db_path>%$(db_dir)%' | \
+ sed 's%<myshell>%$(myshell)%' | \
+Index: refdb-0.9.9/etc/Makefile.in
+===================================================================
+--- refdb-0.9.9.orig/etc/Makefile.in 2012-12-28 17:47:54.000000000 +0100
++++ refdb-0.9.9/etc/Makefile.in 2012-12-28 17:47:59.000000000 +0100
+@@ -341,7 +341,7 @@
- # Allow (t) or deny (f) remote administration of refdbd through refdba
- remoteadmin f
-Index: refdb-0.9.9/etc/refdbdrc.sqlite.example
-===================================================================
---- refdb-0.9.9.orig/etc/refdbdrc.sqlite.example 2012-12-28 17:38:49.000000000 +0100
-+++ refdb-0.9.9/etc/refdbdrc.sqlite.example 2012-12-28 17:38:55.000000000 +0100
-@@ -75,7 +75,7 @@
-
- # The full path of the file where the refdbd stores the current process
- # ID of the parent process
--pidfile /var/run/refdbd.pid
-+pidfile /run/refdbd.pid
-
- # Allow (t) or deny (f) remote administration of refdbd through refdba
- remoteadmin f
-Index: refdb-0.9.9/etc/refdbdrc
-===================================================================
---- refdb-0.9.9.orig/etc/refdbdrc 2012-12-28 17:39:10.000000000 +0100
-+++ refdb-0.9.9/etc/refdbdrc 2012-12-28 17:39:16.000000000 +0100
-@@ -75,7 +75,7 @@
-
- # The full path of the file where the refdbd stores the current process
- # ID of the parent process
--pidfile /var/run/refdbd.pid
-+pidfile /run/refdbd.pid
-
- # Allow (t) or deny (f) remote administration of refdbd through refdba
- remoteadmin f
+ $(objects): %.example: %
+ sed 's%/var/log%$(log_dir)%' < $< | \
+- sed 's%/var/run%$(var_dir)%' | \
++ sed 's%/run%$(var_dir)%' | \
+ sed 's%<pkgdatadir>%$(pkgdatadir)%' | \
+ sed 's%<db_path>%$(db_dir)%' | \
+ sed 's%<classpath_root>%$(classpath_root)%' > $@
Modified: packages/refdb/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/refdb/trunk/debian/rules?rev=2134&op=diff
==============================================================================
--- packages/refdb/trunk/debian/rules (original)
+++ packages/refdb/trunk/debian/rules Fri Dec 28 16:49:17 2012
@@ -11,7 +11,7 @@
dh $@ --parallel --with autotools_dev
override_dh_auto_configure:
- dh_auto_configure -- $(BUILDDOC)
+ dh_auto_configure -- --with-var-dir=/run $(BUILDDOC)
pkg_clients = refdb-clients
pkg_server = refdb-server
More information about the debian-xml-sgml-commit
mailing list