Merge pull request #4 from lscsoft/debvirtpackaging

Merge LIGO-managed CVMFS OSG configuration Debian package into upstream.

Author: DrDaveD

Makefile

@@ -17,12 +17,6 @@ install-common:
 	install -D -m 444 opensciencegrid.org.pub $(DESTDIR)/etc/cvmfs/keys/opensciencegrid.org
 
 install-debian: install-common
-	mkdir -p $(DESTDIR)/lib/systemd/system \
-	  $(DESTDIR)/lib/systemd/system/autofs.service.wants \
-	  $(DESTDIR)/usr/sbin
-	install -D -m 444 cvmfs-config-osg.service $(DESTDIR)/lib/systemd/system
-	ln -s ../cvmfs-config-osg.service $(DESTDIR)/lib/systemd/system/autofs.service.wants/cvmfs-config-osg.service
-	install -D -m 555 cvmfs-config-osgd $(DESTDIR)/usr/sbin
 
 # assume DESTDIR=$RPM_BUILD_ROOT is passed in
 install-redhat: install-common

cvmfs-config-osg.service

@@ -1,13 +1,17 @@
 Source: cvmfs-config-osg
 Maintainer: Dave Dykstra <[email protected]>
-Section: config
+Section: utils
 Priority: extra
-Standards-Version: 3.9.3.1
-Build-Depends: debhelper (>= 9) 
-Homepage: http://github.conf/opensciencegrid/cvmfs-config-osg
+Standards-Version: 3.9.6
+Build-Depends: debhelper (>= 9)
+Homepage: http://github.com/opensciencegrid/cvmfs-config-osg
 
 Package: cvmfs-config-osg
 Architecture: all
+Depends: ${misc:Depends}
 Provides: cvmfs-config
 Conflicts: cvmfs-config
-Description: CernVM File System configuration for OSG
+Description: CernVM File System configuration for Open Science Grid
+ The CernVM File System is a client for accessing remote file systems
+ using HTTP. This package provides the necessary configuration for
+ accessing filesystems maintained by the Open Science Grid.

cvmfs-config-osgd

@@ -1,17 +1,34 @@
-
 Copyright:
 
     Copyright (c) 2017, Fermi National Accelerator Laboratory
 
 License:
 
-    Distributed unter the BSD License.
+    Distributed under the BSD 3-Clause License.
 
 The Debian packaging is:
 
     Copyright (C) 2017 Dave Dykstra <[email protected]>
+    All rights reserved. 
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the Fermi National Accelerator Laboratory nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
 
-You are free to distribute this software under the terms of
-the BSD License.
-On Debian systems, the complete text of the BSD License can be 
-found in the file `/usr/share/common-licenses/BSD'.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.