From df948db3be58a544fc54fc634686c0ec80ed51c0 Mon Sep 17 00:00:00 2001 From: Dana Jansens Date: Sat, 19 May 2007 01:33:40 +0000 Subject: i know we broke backwards compatibility but noone uses it except obconf and it still works, so just leave the pkgconfigs as -3.0, and obconf2 and require version >= 3.3.990 instead. --- Makefile.am | 8 ++++---- configure.ac | 4 ++-- parser/obparser-3.0.pc.in | 11 +++++++++++ parser/obparser-3.4.pc.in | 11 ----------- render/obrender-3.0.pc.in | 17 +++++++++++++++++ render/obrender-3.4.pc.in | 17 ----------------- 6 files changed, 34 insertions(+), 34 deletions(-) create mode 100644 parser/obparser-3.0.pc.in delete mode 100644 parser/obparser-3.4.pc.in create mode 100644 render/obrender-3.0.pc.in delete mode 100644 render/obrender-3.4.pc.in diff --git a/Makefile.am b/Makefile.am index 4562024a..8fad996c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -351,8 +351,8 @@ nodist_pubinclude_HEADERS = \ version.h nodist_pkgconfig_DATA = \ - render/obrender-3.4.pc \ - parser/obparser-3.4.pc + render/obrender-3.0.pc \ + parser/obparser-3.0.pc ## data ## @@ -451,8 +451,8 @@ dist_noinst_DATA = \ doc/openbox-gnome-session.1.in \ doc/openbox-kde-session.1.sgml \ doc/openbox-kde-session.1.in \ - render/obrender-3.4.pc.in \ - parser/obparser-3.4.pc.in \ + render/obrender-3.0.pc.in \ + parser/obparser-3.0.pc.in \ tools/themeupdate/themeupdate.py \ tests/hideshow.py \ tests/Makefile \ diff --git a/configure.ac b/configure.ac index f197d59b..afca4d8d 100644 --- a/configure.ac +++ b/configure.ac @@ -154,8 +154,8 @@ AC_CONFIG_FILES([ Makefile m4/Makefile po/Makefile.in - render/obrender-3.4.pc - parser/obparser-3.4.pc + render/obrender-3.0.pc + parser/obparser-3.0.pc version.h ]) AC_OUTPUT diff --git a/parser/obparser-3.0.pc.in b/parser/obparser-3.0.pc.in new file mode 100644 index 00000000..75d04c99 --- /dev/null +++ b/parser/obparser-3.0.pc.in @@ -0,0 +1,11 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ + +Name: ObParser +Description: Openbox config file parsing library +Version: @VERSION@ +Requires: libxml-2.0 glib-2.0 +Libs: -L${libdir} -lobparser +Cflags: -I${includedir}/openbox/@OB_VERSION@ diff --git a/parser/obparser-3.4.pc.in b/parser/obparser-3.4.pc.in deleted file mode 100644 index 75d04c99..00000000 --- a/parser/obparser-3.4.pc.in +++ /dev/null @@ -1,11 +0,0 @@ -prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ -includedir=@includedir@ - -Name: ObParser -Description: Openbox config file parsing library -Version: @VERSION@ -Requires: libxml-2.0 glib-2.0 -Libs: -L${libdir} -lobparser -Cflags: -I${includedir}/openbox/@OB_VERSION@ diff --git a/render/obrender-3.0.pc.in b/render/obrender-3.0.pc.in new file mode 100644 index 00000000..81c37218 --- /dev/null +++ b/render/obrender-3.0.pc.in @@ -0,0 +1,17 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ + +xcflags=@X_CFLAGS@ +xlibs=@X_LIBS@ + +pangocflags=@PANGO_CFLAGS@ +pangolibs=@PANGO_LIBS@ + +Name: ObRender +Description: Openbox Render Library +Version: @VERSION@ +Requires: obparser-3.4 glib-2.0 xft pangoxft +Libs: -L${libdir} -lobrender ${xlibs} ${pangolibs} +Cflags: -I${includedir}/openbox/@OB_VERSION@ ${xcflags} ${pangocflags} diff --git a/render/obrender-3.4.pc.in b/render/obrender-3.4.pc.in deleted file mode 100644 index 81c37218..00000000 --- a/render/obrender-3.4.pc.in +++ /dev/null @@ -1,17 +0,0 @@ -prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ -includedir=@includedir@ - -xcflags=@X_CFLAGS@ -xlibs=@X_LIBS@ - -pangocflags=@PANGO_CFLAGS@ -pangolibs=@PANGO_LIBS@ - -Name: ObRender -Description: Openbox Render Library -Version: @VERSION@ -Requires: obparser-3.4 glib-2.0 xft pangoxft -Libs: -L${libdir} -lobrender ${xlibs} ${pangolibs} -Cflags: -I${includedir}/openbox/@OB_VERSION@ ${xcflags} ${pangocflags} -- cgit v1.2.3