Changeset 47105bc in git


Ignore:
Timestamp:
03/06/10 13:25:14 (9 years ago)
Author:
Olly Betts <olly@…>
Branches:
add-show-splays, line_contents, master, stereo, svn/github/master, svn/origin/master, svn/survex-1_1, svn/tags/1.1.14, svn/tags/1.1.15, svn/tags/1.1.16, svn/tags/1.2.0, svn/tags/1.2.1, svn/tags/1.2.2, svn/tags/1.2.3, svn/tags/1.2.4, svn/tags/1.2.5, svn/tags/v1_1_13, svn/trunk, travis-osx
Children:
0dbc323
Parents:
9fe15ea
Message:

Remove .deb building machinery from upstream Makefile.

git-svn-id: file:///home/survex-svn/survex/branches/survex-1_1@3378 4b37db11-9a0c-4f06-9ece-9ab7cdaee568

Files:
1 deleted
3 edited

Legend:

Unmodified
Added
Removed
  • Makefile.am

    r9fe15ea r47105bc  
    77GNU_FILES = INSTALL NEWS README COPYING AUTHORS ChangeLog
    88
    9 SUBDIRS = . lib src doc tests debian
     9SUBDIRS = . lib src doc tests
    1010
    1111# We never want to implicitly recurse into the vim subdirectory, but we still
     
    4949        : #
    5050        rpmbuild -bs --clean --rcfile /usr/lib/rpm/rpmrc:`pwd`/rpmrc survex.spec
    51 
    52 debian : dist
    53         : # overkill maybe - we could probably just use this tree
    54         : # but then the .deb-s go in the parent directory, plus we get
    55         : # lintian moaning about the directory name not having the
    56         : # version number
    57         -rm -rf deb
    58         mkdir deb
    59         cd deb && tar zxvf ../${PACKAGE}-${VERSION}.tar.gz
    60         : # -us and -uc mean don't sign packages
    61         cd deb/${PACKAGE}-${VERSION} && debuild --no-tgz-check -us -uc
    62         mv deb/*.deb deb/*.dsc deb/*.changes deb/*.gz .
    63         rm -rf deb
    6451
    6552mingw : all mingw_iss
     
    118105        cd doc && zip -9 -l ../$(dos_doc_zip_name) @DOCS_OTHER@
    119106
    120 .PHONY: rpm debian mingw mingw_iss dos_doc_exe dos_doc_zip
     107.PHONY: rpm mingw mingw_iss dos_doc_exe dos_doc_zip
  • configure.in

    r9fe15ea r47105bc  
    88AC_INIT(src/aven.cc)
    99
    10 AM_INIT_AUTOMAKE(survex, 1.1.12)
     10AM_INIT_AUTOMAKE(survex, 1.1.13)
    1111RELEASE=1
    1212
     
    384384AC_CONFIG_FILES([
    385385 Makefile src/Makefile doc/Makefile lib/Makefile lib/icons/Makefile
    386  tests/Makefile vim/Makefile debian/Makefile survex.iss doc/index.htm doc/survex.1
    387  doc/version.ent debian/copyright survex.spec src/svxedit lib/survex.keys
    388  make_release
     386 tests/Makefile vim/Makefile survex.iss doc/index.htm doc/survex.1
     387 doc/version.ent survex.spec src/svxedit lib/survex.keys
    389388 ])
    390389AC_OUTPUT
  • debian/changelog

    r9fe15ea r47105bc  
     1survex (1.1.13-1) karmic; urgency=low
     2
     3  * New upstream release.
     4
     5 -- Olly Betts <olly@survex.com>  Thu, 03 Jun 2010 05:26:38 +0000
     6
    17survex (1.1.12-1) unstable; urgency=low
    28
Note: See TracChangeset for help on using the changeset viewer.