[xml/sgml-commit] r2133 - in /packages/refdb/trunk/debian: patches/series patches/use_sbin.patch patches/use_slashrun.patch refdb-server.install

malat at users.alioth.debian.org malat at users.alioth.debian.org
Fri Dec 28 16:40:35 UTC 2012


Author: malat
Date: Fri Dec 28 16:40:34 2012
New Revision: 2133

URL: http://svn.debian.org/wsvn/debian-xml-sgml/?sc=1&rev=2133
Log:
Fix /run and uses /sbin

Added:
    packages/refdb/trunk/debian/patches/use_sbin.patch
    packages/refdb/trunk/debian/patches/use_slashrun.patch
Modified:
    packages/refdb/trunk/debian/patches/series
    packages/refdb/trunk/debian/refdb-server.install

Modified: packages/refdb/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/refdb/trunk/debian/patches/series?rev=2133&op=diff
==============================================================================
--- packages/refdb/trunk/debian/patches/series (original)
+++ packages/refdb/trunk/debian/patches/series Fri Dec 28 16:40:34 2012
@@ -8,3 +8,5 @@
 fixfopjava.patch
 bug695846.patch
 bug696333.patch
+use_sbin.patch
+use_slashrun.patch

Added: 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=2133&op=file
==============================================================================
--- packages/refdb/trunk/debian/patches/use_sbin.patch (added)
+++ packages/refdb/trunk/debian/patches/use_sbin.patch Fri Dec 28 16:40:34 2012
@@ -1,0 +1,45 @@
+Index: refdb-0.9.9/scripts/refdbctl
+===================================================================
+--- 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
+@@ -32,13 +32,13 @@
+ NAME=refdb
+ 
+ # set some default path
+-PATH=/bin:/usr/bin:/usr/local/bin:/sbin:/usr/sbin
++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
+ 
+ # the full path to the script that actually starts and stops the application
+-REFDBCTL=/usr/bin/refdbctl
++REFDBCTL=/usr/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

Added: 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=2133&op=file
==============================================================================
--- packages/refdb/trunk/debian/patches/use_slashrun.patch (added)
+++ packages/refdb/trunk/debian/patches/use_slashrun.patch Fri Dec 28 16:40:34 2012
@@ -1,0 +1,104 @@
+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
+@@ -61,7 +61,7 @@
+ 
+ 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/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
+@@ -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 */
+ char log_level[PREFS_BUF_LEN] = "6"; /* the maximum priority that actually gets sent out - priorities are from 0 (only highest importance) to 7 (send all log info). -1 means nothing gets logged */
+-char pid_file[PREFS_BUF_LEN] = "/var/run/refdbd.pid"; /* default pid file */
++char pid_file[PREFS_BUF_LEN] = "/run/refdbd.pid"; /* default pid file */
+ char port_address[PREFS_BUF_LEN] = "9734"; /* default port */
+ char refdb_timeout[PREFS_BUF_LEN] = "180"; /* 3 minutes default timeout */
+ 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
+@@ -12,7 +12,7 @@
+ 
+ $(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)%' > $@
+Index: refdb-0.9.9/etc/refdbdrc.mysql
+===================================================================
+--- 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
+@@ -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.mysql.example
+===================================================================
+--- 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 @@
+ 
+ # 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.sqlite3
+===================================================================
+--- 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 @@
+ 
+ # 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.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

Modified: packages/refdb/trunk/debian/refdb-server.install
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/refdb/trunk/debian/refdb-server.install?rev=2133&op=diff
==============================================================================
--- packages/refdb/trunk/debian/refdb-server.install (original)
+++ packages/refdb/trunk/debian/refdb-server.install Fri Dec 28 16:40:34 2012
@@ -1,6 +1,6 @@
-usr/bin/refdb-init
-usr/bin/refdbd
-usr/bin/refdbctl
+usr/bin/refdb-init usr/sbin
+usr/bin/refdbd     usr/sbin
+usr/bin/refdbctl   usr/sbin
 usr/share/man/man8/refdb-init.8
 usr/share/man/man1/refdbd.1
 usr/share/man/man1/refdbctl.1




More information about the debian-xml-sgml-commit mailing list