[Glibc-bsd-commits] r5608 - trunk/fuse4bsd/debian

Sun Oct 5 22:26:12 UTC 2014

Author: stevenc-guest
Date: 2014-10-05 22:26:12 +0000 (Sun, 05 Oct 2014)
New Revision: 5608

Removed:
   trunk/fuse4bsd/debian/fuse4bsd-dkms.dkms
   trunk/fuse4bsd/debian/fuse4bsd-dkms.fuse.init
Modified:
   trunk/fuse4bsd/debian/changelog
   trunk/fuse4bsd/debian/control
   trunk/fuse4bsd/debian/rules
Log:
* Add myself to uploaders
* Stop building fuse4bsd-dkms, obsoleted by kfreebsd-10 in-tree module


Modified: trunk/fuse4bsd/debian/changelog
===================================================================

--- trunk/fuse4bsd/debian/changelog	2014-10-05 19:28:28 UTC (rev 5607)
+++ trunk/fuse4bsd/debian/changelog	2014-10-05 22:26:12 UTC (rev 5608)
@@ -1,3 +1,10 @@
+fuse4bsd (0.3.9~pre1.20080208-9) UNRELEASED; urgency=low
+
+  * Add myself to uploaders
+  * Stop building fuse4bsd-dkms, obsoleted by kfreebsd-10 in-tree module
+
+ -- Steven Chamberlain <steven at pyro.eu.org>  Sun, 05 Oct 2014 23:21:28 +0100
+
 fuse4bsd (0.3.9~pre1.20080208-8) unstable; urgency=low
 
   * Switch fuse4bsd-dkms to kfreebsd-any.

Modified: trunk/fuse4bsd/debian/control
===================================================================
--- trunk/fuse4bsd/debian/control	2014-10-05 19:28:28 UTC (rev 5607)
+++ trunk/fuse4bsd/debian/control	2014-10-05 22:26:12 UTC (rev 5608)
@@ -2,35 +2,21 @@
 Section: libs
 Priority: optional
 Maintainer: GNU/kFreeBSD Maintainers <debian-bsd at lists.debian.org>
-Uploaders: Robert Millan <rmh at debian.org>
+Uploaders:
+ Robert Millan <rmh at debian.org>,
+ Steven Chamberlain <steven at pyro.eu.org>,
 Build-Depends: debhelper (>= 7), po-debconf,
  freebsd-buildutils,
  libbsd-dev,
- kldutils,
- dkms,
 Standards-Version: 3.9.2
 
 Package: fuse4bsd
 Section: utils
 Architecture: kfreebsd-any
 Depends: ${shlibs:Depends}, ${misc:Depends}, kldutils
-Recommends: fuse4bsd-dkms
 Description: Filesystem in USErspace (utilities)
  Simple interface for userspace programs to export a virtual
  filesystem to kFreeBSD.
  .
  This package contains the fusermount utility which is necessary to
  mount fuse filesystems.
-
-Package: fuse4bsd-dkms
-Architecture: kfreebsd-any
-Depends: ${shlibs:Depends}, ${misc:Depends},
-# first version that supports kFreeBSD
- dkms (>= 2.2.0.1-3),
- freebsd-buildutils,
- kfreebsd-headers-9 | kfreebsd-headers,
-Replaces:
-# Due to /etc/init.d/fuse file conflict
- fuse4bsd (<= 0.3.9~pre1.20080208-4),
-Description: FUSE module for kFreeBSD
- This package provides FUSE module for kernel of FreeBSD.

Deleted: trunk/fuse4bsd/debian/fuse4bsd-dkms.dkms
===================================================================
--- trunk/fuse4bsd/debian/fuse4bsd-dkms.dkms	2014-10-05 19:28:28 UTC (rev 5607)
+++ trunk/fuse4bsd/debian/fuse4bsd-dkms.dkms	2014-10-05 22:26:12 UTC (rev 5608)
@@ -1,8 +0,0 @@
-PACKAGE_NAME="fuse4bsd"
-PACKAGE_VERSION="#MODULE_VERSION#"
-MAKE[0]="PATH=/usr/lib/freebsd:$PATH WERROR= make -C fuse_module"
-CLEAN="PATH=/usr/lib/freebsd:$PATH make clean"
-BUILT_MODULE_NAME[0]="fuse"
-BUILT_MODULE_LOCATION[0]="fuse_module/"
-DEST_MODULE_LOCATION[0]="/extra"
-AUTOINSTALL="yes"

Deleted: trunk/fuse4bsd/debian/fuse4bsd-dkms.fuse.init
===================================================================
--- trunk/fuse4bsd/debian/fuse4bsd-dkms.fuse.init	2014-10-05 19:28:28 UTC (rev 5607)
+++ trunk/fuse4bsd/debian/fuse4bsd-dkms.fuse.init	2014-10-05 22:26:12 UTC (rev 5608)
@@ -1,87 +0,0 @@
-#!/bin/sh
-### BEGIN INIT INFO
-# Provides:		fuse
-# Required-Start:	$local_fs
-# Required-Stop:	$local_fs
-# Default-Start:	S
-# Default-Stop:		0 1 6
-# Short-Description:	Filesystem in userspace
-### END INIT INFO
-
-PATH=/sbin:/bin
-DESC="filesystem in userspace"
-NAME=fuse
-SCRIPTNAME=/etc/init.d/$NAME
-
-# Load the VERBOSE setting and other rcS variables
-. /lib/init/vars.sh
-
-# Define LSB log_* functions.
-# Depend on lsb-base (>= 3.0-6) to ensure that this file is present.
-. /lib/lsb/init-functions
-
-#
-# Function that starts the daemon/service
-#
-do_start()
-{
-	kldload fuse
-}
-
-#
-# Function that stops the daemon/service
-#
-do_stop()
-{
-	kldunload fuse
-}
-
-case "$1" in
-  start)
-    log_daemon_msg "Starting $DESC " "$NAME"
-    do_start
-    case "$?" in
-		0|1) log_end_msg 0 ;;
-		2) log_end_msg 1 ;;
-	esac
-  ;;
-  stop)
-	log_daemon_msg "Stopping $DESC" "$NAME"
-	do_stop
-	case "$?" in
-		0|1) log_end_msg 0 ;;
-		2) log_end_msg 1 ;;
-	esac
-	;;
-  status)
-       status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $?
-       ;;
-  restart|force-reload)
-	#
-	# If the "reload" option is implemented then remove the
-	# 'force-reload' alias
-	#
-	log_daemon_msg "Restarting $DESC" "$NAME"
-	do_stop
-	case "$?" in
-	  0|1)
-		do_start
-		case "$?" in
-			0) log_end_msg 0 ;;
-			1) log_end_msg 1 ;; # Old process is still running
-			*) log_end_msg 1 ;; # Failed to start
-		esac
-		;;
-	  *)
-	  	# Failed to stop
-		log_end_msg 1
-		;;
-	esac
-	;;
-  *)
-	echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2
-	exit 3
-	;;
-esac
-
-:

Modified: trunk/fuse4bsd/debian/rules
===================================================================
--- trunk/fuse4bsd/debian/rules	2014-10-05 19:28:28 UTC (rev 5607)
+++ trunk/fuse4bsd/debian/rules	2014-10-05 22:26:12 UTC (rev 5608)
@@ -46,10 +46,6 @@
 	dh_prep -i
 	dh_installdirs -i
 	dh_install -i
-	mkdir -p debian/fuse4bsd-dkms/usr/src/fuse4bsd-$(VERSION)/tools
-	cp -a fuse_module Makefile.common include \
-		debian/fuse4bsd-dkms/usr/src/fuse4bsd-$(VERSION)/
-	install -m755 tools/genopnames.awk debian/fuse4bsd-dkms/usr/src/fuse4bsd-$(VERSION)/tools/
 
 install-arch:
 	dh_testdir
@@ -69,13 +65,11 @@
 	dh_installchangelogs
 	dh_installdocs
 	dh_installdebconf
-	dh_installinit -pfuse4bsd-dkms --name=fuse -- start 20 S . stop 20 0 1 6 .
 	dh_installman
 	dh_link
 	dh_strip
 	dh_compress
 	dh_fixperms
-	dh_dkms -V $(VERSION)
 	dh_makeshlibs
 	dh_installdeb
 	dh_shlibdeps


