Hello community,
here is the log from the commit of package geany for openSUSE:Factory checked in at 2013-05-28 11:44:14
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/geany (Old)
and /work/SRC/openSUSE:Factory/.geany.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "geany"
Changes:
--------
--- /work/SRC/openSUSE:Factory/geany/geany.changes 2013-03-25 20:18:20.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.geany.new/geany.changes 2013-05-28 11:44:16.000000000 +0200
@@ -1,0 +2,9 @@
+Thu May 23 10:55:34 UTC 2013 - dimstar@opensuse.org
+
+- Update to version 1.23.1:
+ + Fix custom styles under KDE and for people using gtk-chtheme
+ (sf#3607935).
+ + Fix broken opening files from command line on Windows
+ (sf#3613096).
+
+-------------------------------------------------------------------
Old:
----
geany-1.23.tar.bz2
New:
----
geany-1.23.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ geany.spec ++++++
--- /var/tmp/diff_new_pack.yCkIFH/_old 2013-05-28 11:44:17.000000000 +0200
+++ /var/tmp/diff_new_pack.yCkIFH/_new 2013-05-28 11:44:17.000000000 +0200
@@ -17,7 +17,7 @@
Name: geany
-Version: 1.23
+Version: 1.23.1
Release: 0
Summary: Small and lightweight IDE
License: GPL-2.0+
++++++ geany-1.23.tar.bz2 -> geany-1.23.1.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/geany-1.23/ChangeLog new/geany-1.23.1/ChangeLog
--- old/geany-1.23/ChangeLog 2013-03-10 15:28:26.000000000 +0100
+++ new/geany-1.23.1/ChangeLog 2013-05-19 15:13:58.000000000 +0200
@@ -1,5 +1,86 @@
# Generated by Makefile. Do not edit.
+commit b65284d973219cec41ed6b8f9905c130eeb5721d
+Author: Colomban Wendling
+Date: Sun May 19 14:55:57 2013 +0200
+
+ Pre-release version bump for 1.23.1
+
+ configure.ac | 2 +-
+ doc/geany.1.in | 2 +-
+ doc/geany.html | 14 +++++++-------
+ doc/geany.txt | 4 ++--
+ geany.nsi | 4 ++--
+ geany_private.rc | 4 ++--
+ win32-config.h | 2 +-
+ wscript | 2 +-
+ 8 files changed, 17 insertions(+), 17 deletions(-)
+
+commit 9b015febb26cc6649edc5ce0a41dd7728e44e9f6
+Author: Enrico Tröger
+Date: Sun May 19 15:44:03 2013 +0300
+
+ Update NEWS for 1.23.1
+
+ NEWS | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+commit eea7ffbff0c5bf14a9662483d989c4213f1392f7
+Author: unknown
+Date: Sat May 18 15:45:18 2013 +0200
+
+ Fix #3613096 by remembering the directory Geany was started from
+
+ This is one for more workaround for the current directory handling
+ on Windows: we now remember the directory from which Geany was started
+ to use this to resolve relative paths used to load files from
+ the command line.
+
+ src/main.c | 10 +++++++++-
+ 1 file changed, 9 insertions(+), 1 deletion(-)
+
+commit a97b56e19c36bd083e0c8290da7870e6721927a9
+Author: Colomban Wendling
+Date: Fri Mar 15 15:54:00 2013 +0100
+
+ Fix our custom styles under KDE and for people using gtk-chtheme
+
+ We have a custom RC file defining various styles we need, and we want
+ the user to be able to override them (e.g. if they want -- or need --
+ other colors). Fair enough, one would simply call gtk_rc_parse() with
+ the appropriate filename. However, the styling rules applies in the
+ order they are loaded, then if we load our styles after GTK has loaded
+ the user's ones we'd override them.
+
+ There are 2 solutions to fix this:
+ 1) set our styles' priority to something with lower than "user"
+ (actually "theme" priority because rules precedence are first
+ calculated depending on the priority no matter of how precise the
+ rules is, so we need to override the theme).
+ 2) prepend our custom style to GTK's list while keeping priority to
+ user (which is the default), so it gets loaded before real user's
+ ones and so gets overridden by them.
+
+ One would normally go for 1 because it's ways simpler and requires less
+ code: you just have to add the priorities to your styles, which is a
+ matter of adding a few ":theme" in the RC file. However, KDE being a
+ bitch it doesn't set the gtk-theme-name but rather directly includes
+ the style to use in a user gtkrc file, which makes the theme have
+ "user" priority, hence overriding our styles. So, we cannot set
+ priorities in the RC file if we want to support running under KDE,
+ which pretty much leave us with no choice but to go with solution 2,
+ which unfortunately requires writing ugly code since GTK don't have a
+ gtk_rc_prepend_default_file() function. Thank you very much KDE.
+
+ Though, as a side benefit it also makes the code work with people using
+ gtk-chtheme, which also found it funny to include the theme in the user
+ RC file.
+
+ data/geany.gtkrc | 14 +++++++-------
+ src/main.c | 45 +++++++++++++++++++++++++++++++++++++++++++++
+ src/ui_utils.c | 11 +----------
+ 3 files changed, 53 insertions(+), 17 deletions(-)
+
commit ee1cd3a3e41a01f83bdd17f80d7cf21c213fb4a4
Author: Colomban Wendling
Date: Sun Mar 10 15:24:47 2013 +0100
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/geany-1.23/Makefile.in new/geany-1.23.1/Makefile.in
--- old/geany-1.23/Makefile.in 2013-03-10 15:26:24.000000000 +0100
+++ new/geany-1.23.1/Makefile.in 2013-05-19 15:13:24.000000000 +0200
@@ -58,7 +58,7 @@
$(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \
THANKS TODO build-aux/config.guess build-aux/config.sub \
build-aux/depcomp build-aux/install-sh build-aux/ltmain.sh \
- build-aux/missing build-aux/mkinstalldirs
+ build-aux/missing
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/geany-binreloc.m4 \
$(top_srcdir)/m4/geany-i18n.m4 $(top_srcdir)/m4/geany-mingw.m4 \
@@ -76,7 +76,7 @@
$(ACLOCAL_M4)
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
configure.lineno config.status.lineno
-mkinstalldirs = $(SHELL) $(top_srcdir)/build-aux/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = config.h
CONFIG_CLEAN_FILES = geany.spec geany.pc
CONFIG_CLEAN_VPATH_FILES =
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/geany-1.23/NEWS new/geany-1.23.1/NEWS
--- old/geany-1.23/NEWS 2013-03-10 15:25:52.000000000 +0100
+++ new/geany-1.23.1/NEWS 2013-05-19 15:12:59.000000000 +0200
@@ -1,3 +1,11 @@
+Geany 1.23.1 (May 19, 2013)
+
+ Bug fixes
+ * Fix custom styles under KDE and for people using gtk-chtheme
+ (corrects tab coloring, #3607935).
+ * Fix broken opening files from command line on Windows (#3613096).
+
+
Geany 1.23 (March 10, 2013)
General
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/geany-1.23/build-aux/mkinstalldirs new/geany-1.23.1/build-aux/mkinstalldirs
--- old/geany-1.23/build-aux/mkinstalldirs 2013-03-10 15:26:20.000000000 +0100
+++ new/geany-1.23.1/build-aux/mkinstalldirs 1970-01-01 01:00:00.000000000 +0100
@@ -1,162 +0,0 @@
-#! /bin/sh
-# mkinstalldirs --- make directory hierarchy
-
-scriptversion=2009-04-28.21; # UTC
-
-# Original author: Noah Friedman
-# Created: 1993-05-16
-# Public domain.
-#
-# This file is maintained in Automake, please report
-# bugs to or send patches to
-# .
-
-nl='
-'
-IFS=" "" $nl"
-errstatus=0
-dirmode=
-
-usage="\
-Usage: mkinstalldirs [-h] [--help] [--version] [-m MODE] DIR ...
-
-Create each directory DIR (with mode MODE, if specified), including all
-leading file name components.
-
-Report bugs to ."
-
-# process command line arguments
-while test $# -gt 0 ; do
- case $1 in
- -h | --help | --h*) # -h for help
- echo "$usage"
- exit $?
- ;;
- -m) # -m PERM arg
- shift
- test $# -eq 0 && { echo "$usage" 1>&2; exit 1; }
- dirmode=$1
- shift
- ;;
- --version)
- echo "$0 $scriptversion"
- exit $?
- ;;
- --) # stop option processing
- shift
- break
- ;;
- -*) # unknown option
- echo "$usage" 1>&2
- exit 1
- ;;
- *) # first non-opt arg
- break
- ;;
- esac
-done
-
-for file
-do
- if test -d "$file"; then
- shift
- else
- break
- fi
-done
-
-case $# in
- 0) exit 0 ;;
-esac
-
-# Solaris 8's mkdir -p isn't thread-safe. If you mkdir -p a/b and
-# mkdir -p a/c at the same time, both will detect that a is missing,
-# one will create a, then the other will try to create a and die with
-# a "File exists" error. This is a problem when calling mkinstalldirs
-# from a parallel make. We use --version in the probe to restrict
-# ourselves to GNU mkdir, which is thread-safe.
-case $dirmode in
- '')
- if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
- echo "mkdir -p -- $*"
- exec mkdir -p -- "$@"
- else
- # On NextStep and OpenStep, the `mkdir' command does not
- # recognize any option. It will interpret all options as
- # directories to create, and then abort because `.' already
- # exists.
- test -d ./-p && rmdir ./-p
- test -d ./--version && rmdir ./--version
- fi
- ;;
- *)
- if mkdir -m "$dirmode" -p --version . >/dev/null 2>&1 &&
- test ! -d ./--version; then
- echo "mkdir -m $dirmode -p -- $*"
- exec mkdir -m "$dirmode" -p -- "$@"
- else
- # Clean up after NextStep and OpenStep mkdir.
- for d in ./-m ./-p ./--version "./$dirmode";
- do
- test -d $d && rmdir $d
- done
- fi
- ;;
-esac
-
-for file
-do
- case $file in
- /*) pathcomp=/ ;;
- *) pathcomp= ;;
- esac
- oIFS=$IFS
- IFS=/
- set fnord $file
- shift
- IFS=$oIFS
-
- for d
- do
- test "x$d" = x && continue
-
- pathcomp=$pathcomp$d
- case $pathcomp in
- -*) pathcomp=./$pathcomp ;;
- esac
-
- if test ! -d "$pathcomp"; then
- echo "mkdir $pathcomp"
-
- mkdir "$pathcomp" || lasterr=$?
-
- if test ! -d "$pathcomp"; then
- errstatus=$lasterr
- else
- if test ! -z "$dirmode"; then
- echo "chmod $dirmode $pathcomp"
- lasterr=
- chmod "$dirmode" "$pathcomp" || lasterr=$?
-
- if test ! -z "$lasterr"; then
- errstatus=$lasterr
- fi
- fi
- fi
- fi
-
- pathcomp=$pathcomp/
- done
-done
-
-exit $errstatus
-
-# Local Variables:
-# mode: shell-script
-# sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
-# time-stamp-end: "; # UTC"
-# End:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/geany-1.23/configure new/geany-1.23.1/configure
--- old/geany-1.23/configure 2013-03-10 15:26:25.000000000 +0100
+++ new/geany-1.23.1/configure 2013-05-19 15:13:24.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for Geany 1.23.
+# Generated by GNU Autoconf 2.69 for Geany 1.23.1.
#
# Report bugs to https://sourceforge.net/tracker/?group_id=153444&atid=787791.
#
@@ -591,8 +591,8 @@
# Identity of this package.
PACKAGE_NAME='Geany'
PACKAGE_TARNAME='geany'
-PACKAGE_VERSION='1.23'
-PACKAGE_STRING='Geany 1.23'
+PACKAGE_VERSION='1.23.1'
+PACKAGE_STRING='Geany 1.23.1'
PACKAGE_BUGREPORT='https://sourceforge.net/tracker/?group_id=153444&atid=787791'
PACKAGE_URL=''
@@ -1398,7 +1398,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures Geany 1.23 to adapt to many kinds of systems.
+\`configure' configures Geany 1.23.1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1468,7 +1468,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of Geany 1.23:";;
+ short | recursive ) echo "Configuration of Geany 1.23.1:";;
esac
cat <<\_ACEOF
@@ -1597,7 +1597,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-Geany configure 1.23
+Geany configure 1.23.1
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2141,7 +2141,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by Geany $as_me 1.23, which was
+It was created by Geany $as_me 1.23.1, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2958,7 +2958,7 @@
# Define the identity of the package.
PACKAGE='geany'
- VERSION='1.23'
+ VERSION='1.23.1'
cat >>confdefs.h <<_ACEOF
@@ -18761,7 +18761,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by Geany $as_me 1.23, which was
+This file was extended by Geany $as_me 1.23.1, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -18827,7 +18827,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-Geany config.status 1.23
+Geany config.status 1.23.1
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/geany-1.23/configure.ac new/geany-1.23.1/configure.ac
--- old/geany-1.23/configure.ac 2013-03-10 13:47:58.000000000 +0100
+++ new/geany-1.23.1/configure.ac 2013-05-19 15:12:59.000000000 +0200
@@ -1,7 +1,7 @@
dnl Process this file with autoconf to produce a configure script.
AC_PREREQ([2.60])
-AC_INIT([Geany], [1.23],
+AC_INIT([Geany], [1.23.1],
[https://sourceforge.net/tracker/?group_id=153444&atid=787791])
AC_CONFIG_SRCDIR([src/geany.h])
AC_CONFIG_AUX_DIR([build-aux])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/geany-1.23/data/geany.gtkrc new/geany-1.23.1/data/geany.gtkrc
--- old/geany-1.23/data/geany.gtkrc 2013-03-10 13:47:58.000000000 +0100
+++ new/geany-1.23.1/data/geany.gtkrc 2013-05-19 14:57:33.000000000 +0200
@@ -7,21 +7,21 @@
xthickness = 0
ythickness = 0
}
-widget "*.geany-close-tab-button" style:theme "geany-close-tab-button-style"
+widget "*.geany-close-tab-button" style "geany-close-tab-button-style"
# use monospaced font in search entries for easier reading of regexp (#1907117)
style "geany-monospace" {
font_name = "Monospace"
}
-widget "GeanyDialogSearch.*.GtkEntry" style:theme "geany-monospace"
-widget "GeanyDialogSearch.*.geany-search-entry-no-match" style:theme "geany-monospace"
+widget "GeanyDialogSearch.*.GtkEntry" style "geany-monospace"
+widget "GeanyDialogSearch.*.geany-search-entry-no-match" style "geany-monospace"
# set red background for GtkEntries showing unmatched searches
style "geany-search-entry-no-match-style" {
base[NORMAL] = "#ffff66666666"
text[NORMAL] = "#ffffffffffff"
}
-widget "*.geany-search-entry-no-match" style:theme "geany-search-entry-no-match-style"
+widget "*.geany-search-entry-no-match" style "geany-search-entry-no-match-style"
# document status colors
style "geany-document-status-changed-style" {
@@ -36,6 +36,6 @@
fg[NORMAL] = "#00007fff0000"
fg[ACTIVE] = "#00007fff0000"
}
-widget "*.geany-document-status-changed" style:theme "geany-document-status-changed-style"
-widget "*.geany-document-status-disk-changed" style:theme "geany-document-status-disk-changed-style"
-widget "*.geany-document-status-readonly" style:theme "geany-document-status-readonly-style"
+widget "*.geany-document-status-changed" style "geany-document-status-changed-style"
+widget "*.geany-document-status-disk-changed" style "geany-document-status-disk-changed-style"
+widget "*.geany-document-status-readonly" style "geany-document-status-readonly-style"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/geany-1.23/doc/Makefile.in new/geany-1.23.1/doc/Makefile.in
--- old/geany-1.23/doc/Makefile.in 2013-03-10 15:26:23.000000000 +0100
+++ new/geany-1.23.1/doc/Makefile.in 2013-05-19 15:13:23.000000000 +0200
@@ -68,7 +68,7 @@
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/build-aux/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES = geany.1 Doxyfile
CONFIG_CLEAN_VPATH_FILES =
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/geany-1.23/doc/geany.1 new/geany-1.23.1/doc/geany.1
--- old/geany-1.23/doc/geany.1 2013-03-10 15:26:33.000000000 +0100
+++ new/geany-1.23.1/doc/geany.1 2013-05-19 15:13:35.000000000 +0200
@@ -1,4 +1,4 @@
-.TH "GEANY" "1" "March 10, 2013" "geany 1.23" ""
+.TH "GEANY" "1" "May 19, 2013" "geany 1.23.1" ""
.SH "NAME"
Geany \(em a small and lightweight IDE
.SH "SYNOPSIS"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/geany-1.23/doc/geany.1.in new/geany-1.23.1/doc/geany.1.in
--- old/geany-1.23/doc/geany.1.in 2013-03-10 13:47:58.000000000 +0100
+++ new/geany-1.23.1/doc/geany.1.in 2013-05-19 15:12:59.000000000 +0200
@@ -1,4 +1,4 @@
-.TH "GEANY" "1" "March 10, 2013" "geany @VERSION@" ""
+.TH "GEANY" "1" "May 19, 2013" "geany @VERSION@" ""
.SH "NAME"
Geany \(em a small and lightweight IDE
.SH "SYNOPSIS"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/geany-1.23/doc/geany.html new/geany-1.23.1/doc/geany.html
--- old/geany-1.23/doc/geany.html 2013-03-10 13:47:58.000000000 +0100
+++ new/geany-1.23.1/doc/geany.html 2013-05-19 15:12:59.000000000 +0200
@@ -3,10 +3,10 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.8.1: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.10: http://docutils.sourceforge.net/" />
<title>Geany</title>
<meta name="authors" content="Enrico Tröger Nick Treleaven Frank Lanitz Colomban Wendling Matthew Brush" />
-<meta name="date" content="2013-03-10" />
+<meta name="date" content="2013-05-19" />
<style type="text/css">
/*
@@ -141,9 +141,9 @@
<br />Colomban Wendling
<br />Matthew Brush</td></tr>
<tr><th class="docinfo-name">Date:</th>
-<td>2013-03-10</td></tr>
+<td>2013-05-19</td></tr>
<tr><th class="docinfo-name">Version:</th>
-<td>1.23</td></tr>
+<td>1.23.1</td></tr>
</tbody>
</table>
<p>Copyright © 2005-2012</p>
@@ -5696,7 +5696,7 @@
</tr>
<tr><td>geanyversion</td>
<td>The actual Geany version, e.g.
-"Geany 1.23".</td>
+"Geany 1.23.1".</td>
<td>file templates, file header,
function description, ChangeLog entry,
bsd, gpl, snippets.</td>
@@ -6028,7 +6028,7 @@
look, run "<tt class="docutils literal">make doc</tt>" in the subdirectory <tt class="docutils literal">doc</tt> of Geany's source
directory. This regenerates the <tt class="docutils literal">geany.html</tt> file. To generate a PDF
file, use the command "<tt class="docutils literal">make pdf</tt>" which should generate a file called
-geany-1.23.pdf.</p>
+geany-1.23.1.pdf.</p>
<p>After you are happy with your changes, create a patch e.g. by using:</p>
<pre class="literal-block">
% git diff geany.txt > foo.patch
@@ -6836,7 +6836,7 @@
<div class="footer">
<hr class="footer" />
<a class="reference external" href="geany.txt">View document source</a>.
-Generated on: 2013-03-10 12:45 UTC.
+Generated on: 2013-05-19 13:09 UTC.
Generated by <a class="reference external" href="http://docutils.sourceforge.net/">Docutils</a> from <a class="reference external" href="http://docutils.sourceforge.net/rst.html">reStructuredText</a> source.
</div>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/geany-1.23/doc/geany.txt new/geany-1.23.1/doc/geany.txt
--- old/geany-1.23/doc/geany.txt 2013-03-10 13:47:58.000000000 +0100
+++ new/geany-1.23.1/doc/geany.txt 2013-05-19 15:12:59.000000000 +0200
@@ -1,4 +1,4 @@
-.. |(version)| replace:: 1.23
+.. |(version)| replace:: 1.23.1
=======
Geany
@@ -13,7 +13,7 @@
Frank Lanitz,
Colomban Wendling,
Matthew Brush
-:Date: 2013-03-10
+:Date: 2013-05-19
:Version: |(version)|
Copyright © 2005-2012
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/geany-1.23/geany.spec new/geany-1.23.1/geany.spec
--- old/geany-1.23/geany.spec 2013-03-10 15:26:33.000000000 +0100
+++ new/geany-1.23.1/geany.spec 2013-05-19 15:13:35.000000000 +0200
@@ -3,7 +3,7 @@
# It's stronly recommended to use packages of your own distributor
Name: geany
-Version: 1.23
+Version: 1.23.1
Release: 1
Summary: A fast and lightweight IDE using GTK2
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/geany-1.23/geany_private.rc new/geany-1.23.1/geany_private.rc
--- old/geany-1.23/geany_private.rc 2013-03-10 15:25:44.000000000 +0100
+++ new/geany-1.23.1/geany_private.rc 2013-05-19 15:12:59.000000000 +0200
@@ -1,8 +1,8 @@
#include // include for version info constants
-#define VER_FILEVERSION 1,23,0,0
-#define VER_FILEVERSION_STR "1.23"
+#define VER_FILEVERSION 1,23,1,0
+#define VER_FILEVERSION_STR "1.23.1"
#define APP_MANIFEST 1
A ICON MOVEABLE PURE LOADONCALL DISCARDABLE "../icons/geany.ico"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/geany-1.23/icons/16x16/Makefile.in new/geany-1.23.1/icons/16x16/Makefile.in
--- old/geany-1.23/icons/16x16/Makefile.in 2013-03-10 15:26:23.000000000 +0100
+++ new/geany-1.23.1/icons/16x16/Makefile.in 2013-05-19 15:13:23.000000000 +0200
@@ -69,7 +69,7 @@
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/build-aux/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/geany-1.23/icons/24x24/Makefile.in new/geany-1.23.1/icons/24x24/Makefile.in
--- old/geany-1.23/icons/24x24/Makefile.in 2013-03-10 15:26:23.000000000 +0100
+++ new/geany-1.23.1/icons/24x24/Makefile.in 2013-05-19 15:13:23.000000000 +0200
@@ -69,7 +69,7 @@
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/build-aux/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/geany-1.23/icons/32x32/Makefile.in new/geany-1.23.1/icons/32x32/Makefile.in
--- old/geany-1.23/icons/32x32/Makefile.in 2013-03-10 15:26:23.000000000 +0100
+++ new/geany-1.23.1/icons/32x32/Makefile.in 2013-05-19 15:13:23.000000000 +0200
@@ -69,7 +69,7 @@
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/build-aux/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/geany-1.23/icons/48x48/Makefile.in new/geany-1.23.1/icons/48x48/Makefile.in
--- old/geany-1.23/icons/48x48/Makefile.in 2013-03-10 15:26:23.000000000 +0100
+++ new/geany-1.23.1/icons/48x48/Makefile.in 2013-05-19 15:13:23.000000000 +0200
@@ -69,7 +69,7 @@
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/build-aux/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/geany-1.23/icons/Makefile.in new/geany-1.23.1/icons/Makefile.in
--- old/geany-1.23/icons/Makefile.in 2013-03-10 15:26:23.000000000 +0100
+++ new/geany-1.23.1/icons/Makefile.in 2013-05-19 15:13:23.000000000 +0200
@@ -69,7 +69,7 @@
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/build-aux/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/geany-1.23/icons/scalable/Makefile.in new/geany-1.23.1/icons/scalable/Makefile.in
--- old/geany-1.23/icons/scalable/Makefile.in 2013-03-10 15:26:23.000000000 +0100
+++ new/geany-1.23.1/icons/scalable/Makefile.in 2013-05-19 15:13:23.000000000 +0200
@@ -69,7 +69,7 @@
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/build-aux/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/geany-1.23/icons/tango/16x16/Makefile.in new/geany-1.23.1/icons/tango/16x16/Makefile.in
--- old/geany-1.23/icons/tango/16x16/Makefile.in 2013-03-10 15:26:23.000000000 +0100
+++ new/geany-1.23.1/icons/tango/16x16/Makefile.in 2013-05-19 15:13:23.000000000 +0200
@@ -69,7 +69,7 @@
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/build-aux/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/geany-1.23/icons/tango/24x24/Makefile.in new/geany-1.23.1/icons/tango/24x24/Makefile.in
--- old/geany-1.23/icons/tango/24x24/Makefile.in 2013-03-10 15:26:23.000000000 +0100
+++ new/geany-1.23.1/icons/tango/24x24/Makefile.in 2013-05-19 15:13:23.000000000 +0200
@@ -69,7 +69,7 @@
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/build-aux/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/geany-1.23/icons/tango/32x32/Makefile.in new/geany-1.23.1/icons/tango/32x32/Makefile.in
--- old/geany-1.23/icons/tango/32x32/Makefile.in 2013-03-10 15:26:23.000000000 +0100
+++ new/geany-1.23.1/icons/tango/32x32/Makefile.in 2013-05-19 15:13:23.000000000 +0200
@@ -69,7 +69,7 @@
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/build-aux/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/geany-1.23/icons/tango/48x48/Makefile.in new/geany-1.23.1/icons/tango/48x48/Makefile.in
--- old/geany-1.23/icons/tango/48x48/Makefile.in 2013-03-10 15:26:23.000000000 +0100
+++ new/geany-1.23.1/icons/tango/48x48/Makefile.in 2013-05-19 15:13:23.000000000 +0200
@@ -69,7 +69,7 @@
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/build-aux/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/geany-1.23/icons/tango/Makefile.in new/geany-1.23.1/icons/tango/Makefile.in
--- old/geany-1.23/icons/tango/Makefile.in 2013-03-10 15:26:23.000000000 +0100
+++ new/geany-1.23.1/icons/tango/Makefile.in 2013-05-19 15:13:23.000000000 +0200
@@ -69,7 +69,7 @@
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/build-aux/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/geany-1.23/icons/tango/scalable/Makefile.in new/geany-1.23.1/icons/tango/scalable/Makefile.in
--- old/geany-1.23/icons/tango/scalable/Makefile.in 2013-03-10 15:26:23.000000000 +0100
+++ new/geany-1.23.1/icons/tango/scalable/Makefile.in 2013-05-19 15:13:23.000000000 +0200
@@ -69,7 +69,7 @@
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/build-aux/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/geany-1.23/plugins/Makefile.in new/geany-1.23.1/plugins/Makefile.in
--- old/geany-1.23/plugins/Makefile.in 2013-03-10 15:26:24.000000000 +0100
+++ new/geany-1.23.1/plugins/Makefile.in 2013-05-19 15:13:23.000000000 +0200
@@ -72,7 +72,7 @@
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/build-aux/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/geany-1.23/scintilla/Makefile.in new/geany-1.23.1/scintilla/Makefile.in
--- old/geany-1.23/scintilla/Makefile.in 2013-03-10 15:26:24.000000000 +0100
+++ new/geany-1.23.1/scintilla/Makefile.in 2013-05-19 15:13:24.000000000 +0200
@@ -68,7 +68,7 @@
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/build-aux/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/geany-1.23/scintilla/include/Makefile.in new/geany-1.23.1/scintilla/include/Makefile.in
--- old/geany-1.23/scintilla/include/Makefile.in 2013-03-10 15:26:24.000000000 +0100
+++ new/geany-1.23.1/scintilla/include/Makefile.in 2013-05-19 15:13:24.000000000 +0200
@@ -69,7 +69,7 @@
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/build-aux/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/geany-1.23/src/Makefile.in new/geany-1.23.1/src/Makefile.in
--- old/geany-1.23/src/Makefile.in 2013-03-10 15:26:24.000000000 +0100
+++ new/geany-1.23.1/src/Makefile.in 2013-05-19 15:13:24.000000000 +0200
@@ -71,7 +71,7 @@
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/build-aux/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/geany-1.23/src/main.c new/geany-1.23.1/src/main.c
--- old/geany-1.23/src/main.c 2013-03-10 13:47:58.000000000 +0100
+++ new/geany-1.23.1/src/main.c 2013-05-19 14:57:33.000000000 +0200
@@ -91,6 +91,7 @@
GeanyStatus main_status;
CommandLineOptions cl_options; /* fields initialised in parse_command_line_options */
+static gchar *original_cwd = NULL;
static const gchar geany_lib_versions[] = "GTK %u.%u.%u, GLib %u.%u.%u";
@@ -310,7 +311,11 @@
else
{
/* use current dir */
- gchar *cur_dir = g_get_current_dir();
+ gchar *cur_dir = NULL;
+ if (original_cwd == NULL)
+ cur_dir = g_get_current_dir();
+ else
+ cur_dir = g_strdup(original_cwd);
result = g_strjoin(
G_DIR_SEPARATOR_S, cur_dir, filename, NULL);
@@ -379,6 +384,8 @@
#ifdef G_OS_WIN32
static void change_working_directory_on_windows(const gchar *install_dir)
{
+ /* remember original working directory for use with opening files from the command line */
+ original_cwd = g_get_current_dir();
/* On Windows, change the working directory to the Geany installation path to not lock
* the directory of a file passed as command line argument (see bug #2626124).
* This also helps if plugins or other code uses relative paths to load
@@ -969,6 +976,50 @@
}
+/* This prepends our own gtkrc file to the list of RC files to be loaded by GTK at startup.
+ * This function *has* to be called before gtk_init().
+ *
+ * We have a custom RC file defining various styles we need, and we want the user to be
+ * able to override them (e.g. if they want -- or need -- other colors). Fair enough, one
+ * would simply call gtk_rc_parse() with the appropriate filename. However, the styling
+ * rules applies in the order they are loaded, then if we load our styles after GTK has
+ * loaded the user's ones we'd override them.
+ *
+ * There are 2 solutions to fix this:
+ * 1) set our styles' priority to something with lower than "user" (actually "theme"
+ * priority because rules precedence are first calculated depending on the priority
+ * no matter of how precise the rules is, so we need to override the theme).
+ * 2) prepend our custom style to GTK's list while keeping priority to user (which is the
+ * default), so it gets loaded before real user's ones and so gets overridden by them.
+ *
+ * One would normally go for 1 because it's ways simpler and requires less code: you just
+ * have to add the priorities to your styles, which is a matter of adding a few ":theme" in
+ * the RC file. However, KDE being a bitch it doesn't set the gtk-theme-name but rather
+ * directly includes the style to use in a user gtkrc file, which makes the theme have
+ * "user" priority, hence overriding our styles. So, we cannot set priorities in the RC
+ * file if we want to support running under KDE, which pretty much leave us with no choice
+ * but to go with solution 2, which unfortunately requires writing ugly code since GTK
+ * don't have a gtk_rc_prepend_default_file() function. Thank you very much KDE.
+ *
+ * Though, as a side benefit it also makes the code work with people using gtk-chtheme,
+ * which also found it funny to include the theme in the user RC file. */
+static void setup_gtk2_styles(void)
+{
+ gchar **gtk_files = gtk_rc_get_default_files();
+ gchar **new_files = g_malloc(sizeof *new_files * (g_strv_length(gtk_files) + 2));
+ guint i = 0;
+
+ new_files[i++] = g_build_filename(app->datadir, "geany.gtkrc", NULL);
+ for (; *gtk_files; gtk_files++)
+ new_files[i++] = g_strdup(*gtk_files);
+ new_files[i] = NULL;
+
+ gtk_rc_set_default_files(new_files);
+
+ g_strfreev(new_files);
+}
+
+
gint main(gint argc, gchar **argv)
{
GeanyDocument *doc;
@@ -990,6 +1041,7 @@
memset(&ui_widgets, 0, sizeof(UIWidgets));
setup_paths();
+ setup_gtk2_styles();
#ifdef ENABLE_NLS
main_locale_init(GEANY_LOCALEDIR, GETTEXT_PACKAGE);
#endif
@@ -1264,6 +1316,7 @@
g_object_unref(geany_object);
geany_object = NULL;
+ g_free(original_cwd);
g_free(app);
ui_finalize_builder();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/geany-1.23/src/ui_utils.c new/geany-1.23.1/src/ui_utils.c
--- old/geany-1.23/src/ui_utils.c 2013-03-10 13:47:59.000000000 +0100
+++ new/geany-1.23.1/src/ui_utils.c 2013-05-19 14:57:33.000000000 +0200
@@ -2158,18 +2158,9 @@
}
-static void init_custom_style(void)
-{
- gchar *gtkrc_file = g_build_filename(app->datadir, "geany.gtkrc", NULL);
-
- gtk_rc_parse(gtkrc_file);
- g_free(gtkrc_file);
-}
-
-
void ui_init(void)
{
- init_custom_style();
+ /* custom styles are initialized in setup_gtk2_styles() in main.c */
init_recent_files();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/geany-1.23/tagmanager/Makefile.in new/geany-1.23.1/tagmanager/Makefile.in
--- old/geany-1.23/tagmanager/Makefile.in 2013-03-10 15:26:24.000000000 +0100
+++ new/geany-1.23.1/tagmanager/Makefile.in 2013-05-19 15:13:24.000000000 +0200
@@ -67,7 +67,7 @@
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/build-aux/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/geany-1.23/tagmanager/ctags/Makefile.in new/geany-1.23.1/tagmanager/ctags/Makefile.in
--- old/geany-1.23/tagmanager/ctags/Makefile.in 2013-03-10 15:26:24.000000000 +0100
+++ new/geany-1.23.1/tagmanager/ctags/Makefile.in 2013-05-19 15:13:24.000000000 +0200
@@ -68,7 +68,7 @@
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/build-aux/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/geany-1.23/tagmanager/mio/Makefile.in new/geany-1.23.1/tagmanager/mio/Makefile.in
--- old/geany-1.23/tagmanager/mio/Makefile.in 2013-03-10 15:26:24.000000000 +0100
+++ new/geany-1.23.1/tagmanager/mio/Makefile.in 2013-05-19 15:13:24.000000000 +0200
@@ -69,7 +69,7 @@
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/build-aux/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/geany-1.23/tagmanager/src/Makefile.in new/geany-1.23.1/tagmanager/src/Makefile.in
--- old/geany-1.23/tagmanager/src/Makefile.in 2013-03-10 15:26:24.000000000 +0100
+++ new/geany-1.23.1/tagmanager/src/Makefile.in 2013-05-19 15:13:24.000000000 +0200
@@ -70,7 +70,7 @@
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/build-aux/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/geany-1.23/win32-config.h new/geany-1.23.1/win32-config.h
--- old/geany-1.23/win32-config.h 2013-03-10 13:47:59.000000000 +0100
+++ new/geany-1.23.1/win32-config.h 2013-05-19 15:12:59.000000000 +0200
@@ -314,7 +314,7 @@
/* #undef volatile */
/* Version number of package */
-#define VERSION "1.23"
+#define VERSION "1.23.1"
#define REVISION "-1"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/geany-1.23/wscript new/geany-1.23.1/wscript
--- old/geany-1.23/wscript 2013-03-10 13:47:59.000000000 +0100
+++ new/geany-1.23.1/wscript 2013-05-19 15:12:59.000000000 +0200
@@ -49,7 +49,7 @@
APPNAME = 'geany'
-VERSION = '1.23'
+VERSION = '1.23.1'
LINGUAS_FILE = 'po/LINGUAS'
MINIMUM_GTK_VERSION = '2.16.0'
MINIMUM_GLIB_VERSION = '2.20.0'
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org