From: Dana Jansens Date: Mon, 11 Jan 2010 21:20:53 +0000 (-0500) Subject: Merge branch 'backport' into work X-Git-Url: https://git.brokenzipper.com/gitweb?a=commitdiff_plain;h=567fd15eebdd44e50cef140419dbf7a336708109;p=chaz%2Fopenbox Merge branch 'backport' into work Conflicts: configure.ac data/rc.xml openbox/client.c openbox/event.c openbox/focus_cycle.c openbox/focus_cycle_popup.c openbox/openbox.c openbox/prop.c openbox/prop.h openbox/screen.c parser/parse.c version.h.in --- 567fd15eebdd44e50cef140419dbf7a336708109 diff --cc configure.ac index 99b416a5,eb11c03f..57f126a1 --- a/configure.ac +++ b/configure.ac @@@ -3,13 -3,13 +3,16 @@@ AC_INIT([openbox], [3.5.0-rc1], [http:/ AM_INIT_AUTOMAKE AC_CONFIG_SRCDIR([openbox/openbox.c]) ++OB_VERSION=$PACKAGE_VERSION ++AC_SUBST(OB_VERSION) ++ dnl Making releases: -dnl OB_MICRO_VERSION += 1; -dnl OB_INTERFACE_AGE += 1; -dnl OB_BINARY_AGE += 1; -dnl if any functions have been added, set OB_INTERFACE_AGE to 0. +dnl RR_MICRO_VERSION += 1; +dnl RR_INTERFACE_AGE += 1; +dnl R_BINARY_AGE += 1; +dnl if any functions have been added, set RR_INTERFACE_AGE to 0. dnl if backwards compatibility has been broken, -dnl set OB_BINARY_AGE and OB_INTERFACE_AGE to 0. +dnl set RR_BINARY_AGE and RR_INTERFACE_AGE to 0. dnl dnl if MAJOR or MINOR version changes, be sure to change AC_INIT above to match dnl @@@ -202,10 -154,9 +205,11 @@@ AC_CONFIG_FILES( Makefile m4/Makefile po/Makefile.in - render/obrender-3.0.pc - parser/obparser-3.0.pc + obrender/obrender-3.5.pc + obt/obt-3.5.pc + obrender/version.h + obt/version.h + version.h ]) AC_CONFIG_COMMANDS([doc], [test -d doc || mkdir doc]) diff --cc data/rc.xml index aa361920,a576ca60..ecc22bb9 --- a/data/rc.xml +++ b/data/rc.xml @@@ -693,19 -652,14 +693,16 @@@