← Back to branch summary

~ubuntu-branches/ubuntu/trusty/mira/trusty-proposed

« back to all changes in this revision

Viewing changes to build-aux/git-version-gen

  • Committer: Package Import Robot
  • Author(s): Thorsten Alteholz, Thorsten Alteholz, Andreas Tille
  • Date: 2014-02-02 22:51:35 UTC
  • mfrom: (7.1.1 sid)
  • Revision ID: package-import@ubuntu.com-20140202225135-nesemzj59jjgogh0
Tags: 4.0-1
http://bugs.debian.org/735798
[ Thorsten Alteholz ]
* New upstream version 
* debian/rules: add boost dir in auto_configure (Closes: #735798)

[ Andreas Tille ]
* cme fix dpkg-control
* debian/patches/{make.patch,spelling.patch}: applied upstream (thus removed)

Show diffs side-by-side

added added

removed removed

Lines of Context:
build-aux/git-version-gen
143
143
 
144
144
    # on master?
145
145
    case $b in
146
 
        master-* | rel_*)
 
146
        master* | rel_*)
147
147
            : we are on master or release branch
148
148
            # then use version taken from tag version of git describe.
149
149
            v=`git describe --long --tags 2>/dev/null`