gnome-terminal r3360 - trunk

[chpe svn gnome org]

Author: chpe
Date: Sun Mar 15 13:23:40 2009
New Revision: 3360
URL: http://svn.gnome.org/viewvc/gnome-terminal?rev=3360&view=rev

Log:
Prepare 2.26.0

Modified:
   trunk/Makefile.am
   trunk/configure.ac

Modified: trunk/Makefile.am
==============================================================================
--- trunk/Makefile.am	(original)
+++ trunk/Makefile.am	Sun Mar 15 13:23:40 2009
@@ -3,7 +3,7 @@
 DISTCHECK_CONFIGURE_FLAGS = --disable-scrollkeeper --disable-schemas-install
 
 desktopdir = $(datadir)/applications
-desktop_in_files = gnome-terminal.desktop.in.in
+desktop_in_files = @PACKAGE  desktop in in
 desktop_DATA = $(desktop_in_files:.desktop.in.in=.desktop)
 @INTLTOOL_DESKTOP_RULE@
 
@@ -27,18 +27,9 @@
 distuninstallcheck_listfiles = 	\
         find -regex '.*/var/scrollkeeper/.*' -prune -or -type f -print
 
-# Build ChangeLog from GIT or SVN history
-# (SVN r2446 was the first ChangeLog-less checkin).
-# Only build this when in a git or svn checkout.
-
-ChangeLog:
-	@if test -f $(top_srcdir)/.git/HEAD; then \
-		git log --stat > $@; \
-	elif test -f $(top_srcdir)/.svn/entries; then \
-		svn log -v --xml -r HEAD:2446 $(SVN_ROOT)/$(SVN_MODULE)/$(SVN_BRANCH) | \
-			xsltproc --stringparam strip-prefix "$(SVN_MODULE)/$(SVN_BRANCH)" \
-				 --stringparam include-rev "yes" $(top_srcdir)/svn2cl.xsl - > $@; \
-	fi
+# Build ChangeLog from GIT  history
+ChangeLog: $(top_srcdir)/.git/HEAD
+	git log --stat > $@
 
 dist: ChangeLog
 

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Sun Mar 15 13:23:40 2009
@@ -1,12 +1,9 @@
 m4_define([gt_version_major],[2])
-m4_define([gt_version_minor],[25])
-m4_define([gt_version_micro],[91])
+m4_define([gt_version_minor],[26])
+m4_define([gt_version_micro],[0])
 m4_define([gt_version_extra],[])
 m4_define([gt_version],[gt_version_major().gt_version_minor().gt_version_micro()gt_version_extra])
 
-# This can be either "trunk" or "branches/gnome-x-y"
-m4_define([gt_branch],["trunk"])
-
 AC_INIT([GNOME Terminal],[gt_version],[http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-terminal],[gnome-terminal])
 AC_CONFIG_SRCDIR([src/terminal.c])
 AC_CONFIG_HEADERS([config.h])
@@ -112,14 +109,6 @@
 GNOME_DOC_INIT
 
 # ****************************
-# SVN for ChangeLog generation
-# ****************************
-
-AC_SUBST([SVN_ROOT],[http://svn.gnome.org/svn])
-AC_SUBST([SVN_MODULE],[gnome-terminal])
-AC_SUBST([SVN_BRANCH],[gt_branch])
-
-# ****************************
 
 AC_CONFIG_FILES([
 Makefile