Changeset 892


Ignore:
Timestamp:
05/21/13 12:17:14 (8 years ago)
Author:
olahaye
Message:

[deb packaging] Updated the changelog with VERSION from Makefile when building.

Location:
branches/1.0
Files:
2 edited
1 moved

Legend:

Unmodified
Added
Removed
  • branches/1.0/Makefile

    r862 r892  
    3232tarball:        tarball-gzip tarball-bzip
    3333
    34 tarball-gzip:   ${REQUIRED} ./pkg/rpm/jobmonarch.spec
     34tarball-gzip:   ${REQUIRED} ./pkg/rpm/jobmonarch.spec ./debian/changelog
    3535        mkdir -p ${TMPDIR}/.monarch_buildroot/ganglia_jobmonarch-${VERSION}
    3636        ( rsync -a --exclude=.svn --exclude=*_test* --exclude=*-example.php \
     
    3939        mv ${TMPDIR}/.monarch_buildroot/ganglia_jobmonarch-${VERSION}.tar.gz ..
    4040
    41 tarball-bzip:   ${REQUIRED} ./pkg/rpm/jobmonarch.spec
     41tarball-bzip:   ${REQUIRED} ./pkg/rpm/jobmonarch.spec ./debian/changelog
    4242        mkdir -p ${TMPDIR}/.monarch_buildroot/ganglia_jobmonarch-${VERSION}
    4343        ( rsync -a --exclude=.svn --exclude=*_test* --exclude=*-example.php \
     
    4949
    5050./pkg/rpm/jobmonarch.spec: pkg/rpm/jobmonarch.spec.in Makefile
    51         sed -e 's/__VERSION__/$(VERSION)/g' -e 's/__RELEASE__/$(RELEASE)/g' ./pkg/rpm/jobmonarch.spec.in > ./pkg/rpm/jobmonarch.spec
     51        sed -e 's/__VERSION__/${VERSION}/g' -e 's/__RELEASE__/${RELEASE}/g' ./pkg/rpm/jobmonarch.spec.in > ./pkg/rpm/jobmonarch.spec
    5252
    5353rpm: tarball-bzip
     
    5757        rpmbuild -ts --define '%dist %{nil}' ../ganglia_jobmonarch-${VERSION}.tar.bz2
    5858
    59 deb: ${REQUIRED} ./debian
    60         # FIXME set $(VERSION)-$(RELEASE) in ./debian/changelog
     59debchangelog: ./debian/changelog
     60
     61./debian/changelog: ./debian/changelog.in Makefile
     62        sed -e 's/__VERSION__/${VERSION}/g' -e 's/__RELEASE__/${RELEASE}/g' ./debian/changelog.in > ./debian/changelog
     63
     64deb: ${REQUIRED} ./debian ./debian/changelog
    6165        dpkg-buildpackage -b -uc -us
    6266
  • branches/1.0/debian/changelog.in

    r881 r892  
    1 jobmonarch (1.0-1) unstable; urgency=low
     1jobmonarch (__VERSION__-__RELEASE__) sid; urgency=low
     2
     3  * New upstream version
     4
     5 -- Job Monarch Development team <jobmonarch-developers@lists.sourceforge.net>  Fri, 17 May 2013 20:47:52 +0200
     6
     7jobmonarch (1.0-1) sid; urgency=low
    28
    39  * Initial packaging.
  • branches/1.0/jobarchived/jobarchived.conf

    r841 r892  
    6969# Where to store the archived rrd's
    7070#
    71 ARCHIVE_PATH                    : /var/lib/jobarchive
     71ARCHIVE_PATH                    : /usr/local/jobmonarch
    7272
    7373# Archive's SQL dbase to use
Note: See TracChangeset for help on using the changeset viewer.