diff options
author | ivan <ivan> | 2009-08-12 22:26:03 +0000 |
---|---|---|
committer | ivan <ivan> | 2009-08-12 22:26:03 +0000 |
commit | 91b98a755e164d2fee808fc19db5a402263e4d51 (patch) | |
tree | 26d15ac616475d1f9121945810682502bead5b68 | |
parent | 4ce9a16a64e3a720085582b3b095bba0b6e514de (diff) |
1.7.4rc2
-rw-r--r-- | Makefile | 4 | ||||
-rw-r--r-- | debian/changelog | 9 |
2 files changed, 11 insertions, 2 deletions
@@ -117,8 +117,8 @@ RT_PATH = /opt/rt3 FREESIDE_PATH = `pwd` PERL_INC_DEV_KLUDGE = /usr/local/share/perl/5.10.0/ -VERSION=1.7.4rc1 -TAG=freeside_1_7_4rc1 +VERSION=1.7.4rc2 +TAG=freeside_1_7_4rc2 DEBVERSION = `echo ${VERSION} | perl -pe 's/(\d)([a-z])/\1~\2/'`-1 diff --git a/debian/changelog b/debian/changelog index e017613db..33c2f7a01 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,18 @@ +<<<<<<< changelog +freeside (1.7.4~rc2-1) unstable; urgency=low + + * New upstream (RC) release + + -- Ivan Kohler <ivan-debian@420.am> Wed, 12 Aug 2009 14:18:29 -0700 + +======= freeside (1.7.4~rc1-1) unstable; urgency=low * New upstream release -- Ivan Kohler <ivan-debian@420.am> Thu, 23 Jul 2009 14:01:10 -0700 +>>>>>>> 1.2.6.7 freeside (1.7.3-1) unstable; urgency=low * New upstream release |