Merge pull request #5 from DrDaveD/elevatepackaging

Eliminate 'packaging' source code level

Author: DrDaveD

packaging/debian/README.md renamed to debian/README.md

@@ -0,0 +1,25 @@
+# created by obsupdate.sh, do not edit by hand
+Debtransform-Tar: cvmfs-config-osg-2.1.tar.gz
+Format: 1.0
+Version: 2.1.1
+Binary: cvmfs-config-osg
+Source: cvmfs-config-osg
+Maintainer: Dave Dykstra <[email protected]>
+Section: utils
+Priority: extra
+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 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.
+Files:
+  ffffffffffffffffffffffffffffffff 99999 file1
+  ffffffffffffffffffffffffffffffff 99999 file2

packaging/debian/build.sh renamed to debian/build.sh

@@ -6,26 +6,19 @@
 HERE="`dirname $0`"
 ME="`basename $0`"
 PKG="`sed -n 's/^Source: //p' control`"
-SPECFILE="../redhat/$PKG.spec"
+SPECFILE="../rpm/$PKG.spec"
 VERSION="$(grep ^Version: $SPECFILE | awk '{print $2}')"
 RPMREL="$(grep '^%define release_prefix' $SPECFILE | awk '{print $3}')"
 if [ -z "$RPMREL" ]; then
     RPMREL="$(grep '^Release:' $SPECFILE | awk '{print $2}' | cut -d% -f1)"
 fi
-# if the version is current, increment the release number, else choose 1
-DEBREL="`sed -n "s/^Version: ${VERSION}\.${RPMREL}-//p" $PKG.dsc 2>/dev/null`"
-if [ -z "$DEBREL" ]; then
-    DEBREL=1
-else
-    let DEBREL+=1
-fi
 (
 echo "# created by $ME, do not edit by hand"
 # The following two lines are OBS "magic" to use the tarball from the rpm
 echo "Debtransform-Tar: ${PKG}-${VERSION}.tar.gz"
 #echo "Debtransform-Files-Tar: "
 echo "Format: 1.0"
-echo "Version: ${VERSION}.${RPMREL}-${DEBREL}"
+echo "Version: ${VERSION}.${RPMREL}"
 echo "Binary: $PKG"
 cat control
 echo "Files:"

packaging/debian/changelog renamed to debian/changelog

@@ -1,7 +1,7 @@
 Summary: CernVM File System OSG Configuration and Public Keys
 Name: cvmfs-config-osg
-Version: 2.0
-Release: 3%{?dist}
+Version: 2.1
+Release: 1%{?dist}
 # download with:
 # $ curl -L -o cvmfs-config-osg-%{version}.tar.gz \
 #   https://github.com/opensciencegrid/cvmfs-config-osg/archive/v%{version}.tar.gz
@@ -42,6 +42,11 @@ make install-redhat DESTDIR=$RPM_BUILD_ROOT
 %config %{_sysconfdir}/cvmfs/config.d/*
 
 %changelog
+* Fri Nov 17 2017 Dave Dykstra <[email protected]> - 2.1-1
+- Merge LIGO changes to debian packaging
+- Move packaging/debian to debian and packaging/redhat to rpm, to work
+  better with OBS and new OSG github packaging standard
+
 * Tue Feb 28 2017 Dave Dykstra <[email protected]> - 2.0-3
 - Use common install Makefile between debian and redhat