projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
4ce9a16
)
1.7.4rc2
author
ivan
<ivan>
Wed, 12 Aug 2009 22:26:03 +0000
(22:26 +0000)
committer
ivan
<ivan>
Wed, 12 Aug 2009 22:26:03 +0000
(22:26 +0000)
Makefile
patch
|
blob
|
history
debian/changelog
patch
|
blob
|
history
diff --git
a/Makefile
b/Makefile
index
99f843b
..
6b99a8b
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-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.4rc
1
-TAG=freeside_1_7_4rc
1
+VERSION=1.7.4rc
2
+TAG=freeside_1_7_4rc
2
DEBVERSION = `echo ${VERSION} | perl -pe 's/(\d)([a-z])/\1~\2/'`-1
diff --git
a/debian/changelog
b/debian/changelog
index
e017613
..
33c2f7a
100644
(file)
--- 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