Changeset 1c72b25e1ee042e2a8e8a16eec7239c98e6cd892

Show
Ignore:
Timestamp:
06/09/11 22:53:52 (2 years ago)
Author:
Brandon Philips <brandon.philips@rackspace.com>
git-committer:
Brandon Philips <brandon.philips@rackspace.com> 1307660032 -0700
git-parent:

[d3e7ae2b8283e5d05460c2b3b6d365a6562216b8]

git-author:
Brandon Philips <brandon.philips@rackspace.com> 1307659189 -0700
Message:

pkg: fix up debian package to actually work

A number of changes have left the debian package broken including the
javalibdir changes and version bumps. Fix these minor issues.

Then I also automated the version number creation so that every time you
call pkg/build-debian.sh it generates a new version number if the HEAD
has moved. It is a little hacky but solves the version bumping issue for
now.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • .gitignore

    ra3e0dd2 r1c72b25  
    6161test/test-stratcon.key 
    6262test/t/logs 
     63pkg/debian/changelog 

  • configure.in

    r520106c r1c72b25  
    661661AC_SUBST(MODULES_DIR) 
    662662 
     663JAVA_LIB_DIR="$prefix/java" 
     664AC_ARG_WITH(java-libdir, 
     665        [--with-javalibdir=PFX  prefix to install java libs (optional)], 
     666        [JAVA_LIB_DIR=$withval],) 
     667AC_SUBST(JAVA_LIB_DIR) 
     668 
    663669AC_MSG_CHECKING([Resolving sysconfdir path...]) 
    664670fullpath=$sysconfdir 

  • pkg/build-debian.sh

    r665f9c6 r1c72b25  
    55ln -sf pkg/debian debian 
    66 
     7HEADFILE="pkg/HEAD" 
     8HEAD=`git log -1 HEAD --pretty=%h` 
     9[ -f $HEADFILE ] && OLDHEAD=`cat $HEADFILE` 
     10 
     11if [ "x$HEAD" != "x$OLDHEAD" ]; then 
     12        dch -v `date +"%Y%m%d%H%M%S"` "HEAD `git log -1 HEAD --abbrev-commit --pretty=oneline`" 
     13        echo $HEAD > $HEADFILE 
     14fi 
     15 
    716dpkg-buildpackage -rfakeroot -tc 
    817 

  • pkg/debian/changelog

    r665f9c6 r1c72b25  
    1 reconnoiter (0.0.1+20110411) lucid; urgency=low 
     1reconnoiter (20110609153158) lucid; urgency=low 
    22 
    3   * New git snapshot 
     3  * HEAD d3e7ae2 buildtools: fix == bashism in mkversion.sh 
    44 
    5  -- Thom May <thom@digital-science.com>  Mon, 11 Apr 2011 06:10:07 -0700 
    6  
    7 reconnoiter (0.0.1+20110204) lucid; urgency=low 
    8  
    9   * New svn snapshot 
    10  
    11  -- Thom May <thom@debian.org>  Fri, 04 Feb 2011 03:03:38 -0800 
    12  
    13 reconnoiter (0.0.1+20110125) lucid; urgency=low 
    14  
    15   * First upload. 
    16  
    17  -- Thom May <thom@debian.org>  Tue, 25 Jan 2011 16:14:40 +0000 
     5 -- Brandon Philips <brandon.philips@rackspace.com>  Thu, 09 Jun 2011 15:31:58 -0700 

  • pkg/debian/rules

    rb88ee05 r1c72b25  
    1111build-stamp: 
    1212        autoconf 
    13         ./configure --prefix=/usr --libexecdir=/usr/lib --sysconfdir=/etc/reconnoiter --localstatedir=/var/lib/reconnoiter --datarootdir=/usr/share 
     13        ./configure --prefix=/usr --libexecdir=/usr/lib --sysconfdir=/etc/reconnoiter --localstatedir=/var/lib/reconnoiter --datarootdir=/usr/share --with-java-libdir=/usr/share/java 
    1414        $(MAKE) 
    1515        touch $@ 

  • pkg/debian/stratcon.install

    r665f9c6 r1c72b25  
    88usr/share/java/lib/commons-io-1.2.jar 
    99usr/share/java/lib/commons-pool-1.4.jar 
    10 usr/share/java/lib/esper-3.5.0.jar 
     10usr/share/java/lib/esper-4.1.0.jar 
    1111usr/share/java/lib/postgresql-8.3-604.jdbc3.jar 
    12 usr/share/java/lib/rabbitmq-client.jar 
     12usr/share/java/lib/rabbitmq-client-2.4.1.jar 
    1313usr/share/java/lib/spring-beans-2.5.5.jar 
    1414usr/share/java/lib/spring-context-2.5.5.jar 

  • src/java/Makefile.in

    r4bb6079 r1c72b25  
    1111sbindir=@sbindir@ 
    1212libdir=@libdir@ 
    13 javalibdir=@prefix@/java 
     13javalibdir=@JAVA_LIB_DIR@ 
    1414includedir=${prefix}/include 
    1515libexecdir=@libexecdir@