New: jss-docs-update for unified documentation updates Int: lintian w…

…arnings removal Int: copyright format update Int: updated debian source format from 1.0 to 3.0 (native) to enable shared bz2 tarballs

Signed-off-by: Miroslav Safr <Miroslav.Safr@gmail.com>

debian/compat

@@ -1 +1 @@
-5
+7

debian/control

@@ -1,13 +1,14 @@
 Source: rpmmake
-Section: libs
+Section: utils
 Priority: optional
 Maintainer: Miroslav Safr <miroslav.safr@gmail.com>
-Build-Depends: debhelper (>= 5), appver, rpm, xsltproc, docbook-xsl
-Standards-Version: 1.0.0
+Build-Depends: debhelper (>= 5), appver, rpm, jenkins-support-scripts (>=1.2.3)
+Standards-Version: 3.8.1
+Homepage: http://safrm.net/projects/rpmmake
 
 Package: rpmmake
 Architecture: all
-Depends: rpm, tar, expect, ${misc:Depends}
-Description: create rpm package inside the git repo without being root 
-
+Depends: rpm,  expect, ${misc:Depends}
+Description: create rpm package inside the git repo without being root \
+	includes rpm and debian changelog creation scripts from git
 

debian/copyright

@@ -1,7 +1,8 @@
-Name: rpmmake
-Maintainer: Miroslav Safr <Miroslav.Safr@gmail.com>
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: rpmmake
+Upstream-Contact: Miroslav Safr <Miroslav.Safr@gmail.com>
 Source: http://safrm.net/projects/rpmmake
-Copyright: Miroslav Safr <Miroslav.Safr@gmail.com>
+Copyright: Copyright 2010 Miroslav Safr <Miroslav.Safr@gmail.com>
 License: LGPL-2.1
 
 On Debian systems the full text of the GNU LGPL v2.1 can be found

debian/rpmmake.install

@@ -5,5 +5,3 @@ rpmmake-expect /usr/bin/
 
 doc/manpages/* /usr/share/man/man1/
 
-README /usr/share/doc/rpmmake
-LICENSE.LGPL /usr/share/doc/rpmmake

debian/rules

@@ -1,11 +1,12 @@
 #!/usr/bin/make -f
+include /usr/share/dpkg/pkg-info.mk
 DEB_VERBOSE_ALL=yes
 export DH_VERBOSE=1
 
 %:
 	dh  $@
-	
+
 override_dh_auto_build:
-	DEBVERSION=$(dpkg-parsechangelog | sed -n -e 's/^Version: //p' 2>/dev/null)
-	cd doc && ./update_docs.sh $DEBVERSION && cd -
+	jss-docs-update ./doc -sv $(DEB_VERSION_UPSTREAM)
 	dh_auto_build
+

debian/source/format

@@ -0,0 +1 @@
+3.0 (native)

install.sh

@@ -2,7 +2,6 @@
 #fast script to create rpm package inside the git repo without being root  - http://safrm.net/projects/rpmmake
 #author:  Miroslav Safr <miroslav.safr@gmail.com>
 BINDIR=/usr/bin
-DOCDIR=/usr/share/doc
 MANDIR=/usr/share/man
 
 #root check
@@ -12,9 +11,9 @@ USERID=`id -u`
     exit 0
 }
 
-#automatic version 
-if command -v appver &>/dev/null; then . appver; else APP_SHORT_VERSION=NA ; APP_FULL_VERSION_TAG=NA ; APP_BUILD_DATE=`date +'%Y%m%d_%H%M'`; fi
-
+#automatic version
+if command -v appver 1>/dev/null 2>&1; then . appver; else APP_SHORT_VERSION=NA ; APP_FULL_VERSION_TAG=NA ; APP_BUILD_DATE=`date +'%Y%m%d_%H%M'`; fi
+#test
 for TEST in $(  grep -r -l -h "#\!/bin/sh" --exclude-dir=.git . )
 do
 		sh -n $TEST
@@ -25,9 +24,7 @@ do
 done
 
 #update documentation
-cd doc
-./update_docs.sh
-cd -
+jss-docs-update ./doc 
 
 mkdir -p -m 0755 $BINDIR
 install -m 0777 -v ./rpmmake  $BINDIR/
@@ -45,4 +42,3 @@ MANPAGES=`find ./doc/manpages -type f`
 install -d -m 755 $MANDIR/man1
 install -m 644 $MANPAGES $MANDIR/man1
 
-

rpmmake.spec

@@ -4,7 +4,7 @@ Name:       rpmmake
 Summary:    Create rpm package inside the git repo without beeing root 
 Version:    1.0.0
 Release:    1
-Group:      System/Libraries
+Group:      Development/Tools
 License:    LGPL v2.1
 BuildArch:  noarch
 URL:        http://safrm.net/projects/rpmmake 
@@ -14,11 +14,8 @@ Autoreq: on
 Autoreqprov: on
 Requires:  expect
 Requires:  rpm-sign
-#BuildRequires:  xsltproc
-BuildRequires:  libxslt
-#BuildRequires:  docbook-xsl
-BuildRequires: docbook-xsl-stylesheets
 BuildRequires:  appver >= 1.1.1
+BuildRequires: jenkins-support-scripts >= 1.2.3
 
 %description
 Fast script to create rpm package inside the git repo without beeing root 
@@ -27,7 +24,7 @@ Fast script to create rpm package inside the git repo without beeing root
 %setup -c -n ./%{name}-%{version}
 
 %build
-cd doc && ./update_docs.sh %{version} && cd -
+jss-docs-update ./doc -sv %{version} 
 
 %install
 mkdir -p %{buildroot}/usr/bin
@@ -47,20 +44,15 @@ MANPAGES=`find ./doc/manpages -type f`
 install -d -m 755 %{buildroot}%{_mandir}/man1
 install -m 644 $MANPAGES %{buildroot}%{_mandir}/man1
 
-DOCS="./README ./LICENSE.LGPL"
-install -d -m 755 %{buildroot}%{_docdir}/rpmmake
-install -m 644 $DOCS %{buildroot}%{_docdir}/rpmmake
-
 %check
 for TEST in $(  grep -r -l -h "#\!/bin/sh" . )
 do
-		sh -n $TEST
+		sh -n "$TEST"
 		if  [ $? != 0 ]; then
 			echo "syntax error in $TEST, exiting.." 
 			exit 1
 		fi
-done 
-
+done
 
 %files
 %defattr(-,root,root,-)
@@ -75,7 +67,4 @@ done
 %{_mandir}/man1/rpmmake-debchangelog.1*
 %{_mandir}/man1/rpmmake-expect.1*
 
-#other docs
-%{_docdir}/rpmmake/README
-%{_docdir}/rpmmake/LICENSE.LGPL