This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project wmaker-crm.git.
The branch, master has been updated
via a2de2c34eea348aaff5f39434ce297a322672140 (commit)
via 0706471a1049a742071337dc89859dc69b6a4189 (commit)
via 0d441c3b986a313e4ff5b1015eb956c93f34bdc2 (commit)
via 18437e0309bbb9d9d9791b384625b15bc52a65f1 (commit)
from 3d470167882799fc38699ec22f5198450cfe5df0 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://repo.or.cz/w/wmaker-crm.git/commit/a2de2c34eea348aaff5f39434ce297a322672140
commit a2de2c34eea348aaff5f39434ce297a322672140
Author: Carlos R. Mafra <[email protected]>
Date: Thu Jan 3 23:29:16 2013 +0000
Window Maker 0.95.4
diff --git a/configure.ac b/configure.ac
index c32b391..d8acbeb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ dnl
dnl
-AC_INIT(WindowMaker, 0.95.3, , WindowMaker, http://www.windowmaker.org/)
+AC_INIT(WindowMaker, 0.95.4, , WindowMaker, http://www.windowmaker.org/)
AC_CONFIG_SRCDIR(src/WindowMaker.h)
AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_HEADERS(config.h)
http://repo.or.cz/w/wmaker-crm.git/commit/0706471a1049a742071337dc89859dc69b6a4189
commit 0706471a1049a742071337dc89859dc69b6a4189
Author: Kamil Rytarowski <[email protected]>
Date: Thu Jan 3 23:07:00 2013 +0100
Fix build with automake-1.13 and modernize .am files.
The following macro: AM_CONFIG_HEADER is deprecated and replaced with
AC_CONFIG_HEADERS. INCLUDES is an old version of AM_CPPLAGS.
diff --git a/WINGs/Examples/Makefile.am b/WINGs/Examples/Makefile.am
index 924d378..98836c0 100644
--- a/WINGs/Examples/Makefile.am
+++ b/WINGs/Examples/Makefile.am
@@ -25,5 +25,5 @@ server_DEPENDENCIES = $(top_builddir)/WINGs/libWUtil.la
server_LDADD = $(top_builddir)/WINGs/libWUtil.la @LIBRARY_SEARCH_PATH@
@INTLIBS@
-INCLUDES = -I$(top_srcdir)/WINGs -I$(top_srcdir)/wrlib -I$(top_srcdir)/src
+AM_CPPFLAGS = -I$(top_srcdir)/WINGs -I$(top_srcdir)/wrlib -I$(top_srcdir)/src
-DRESOURCE_PATH="$(datadir)/WINGs" @HEADER_SEARCH_PATH@
diff --git a/WINGs/Extras/Makefile.am b/WINGs/Extras/Makefile.am
index f1dc17f..14b1271 100644
--- a/WINGs/Extras/Makefile.am
+++ b/WINGs/Extras/Makefile.am
@@ -20,7 +20,7 @@ libExtraWINGs_la_SOURCES = wtableview.h
wtabledelegates.h
-INCLUDES = -I$(top_srcdir)/wrlib -I$(top_srcdir)/WINGs +AM_CPPFLAGS =
-I$(top_srcdir)/wrlib -I$(top_srcdir)/WINGs
-DRESOURCE_PATH="$(datadir)/WINGs" @HEADER_SEARCH_PATH@
LDADD= $(top_builddir)/WINGs/libWINGs.la $(top_builddir)/wrlib/libwraster.la
diff --git a/WINGs/Makefile.am b/WINGs/Makefile.am
index 8792ae6..d28aff9 100644
--- a/WINGs/Makefile.am
+++ b/WINGs/Makefile.am
@@ -86,10 +86,10 @@ libWUtil_la_SOURCES = wutil.c
-AM_CPPFLAGS = -DLOCALEDIR="$(NLSDIR)" -DRESOURCE_PATH="$(datadir)/WINGs"
AM_CFLAGS =
-INCLUDES = -I$(top_srcdir)/WINGs/WINGs -I$(top_srcdir)/wrlib
-I$(top_srcdir)/src +AM_CPPFLAGS = -DLOCALEDIR="$(NLSDIR)"
-DRESOURCE_PATH="$(datadir)/WINGs" + -I$(top_srcdir)/WINGs/WINGs
-I$(top_srcdir)/wrlib -I$(top_srcdir)/src @XFTFLAGS@
@HEADER_SEARCH_PATH@
pkgconfigdir = $(libdir)/pkgconfig
diff --git a/WINGs/Tests/Makefile.am b/WINGs/Tests/Makefile.am
index 2609171..de6070e 100644
--- a/WINGs/Tests/Makefile.am
+++ b/WINGs/Tests/Makefile.am
@@ -16,5 +16,5 @@ wtest_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la
EXTRA_DIST = logo.xpm upbtn.xpm wm.html wm.png
-INCLUDES = -I$(top_srcdir)/WINGs -I$(top_srcdir)/wrlib -I$(top_srcdir)/src
+AM_CPPFLAGS = -I$(top_srcdir)/WINGs -I$(top_srcdir)/wrlib -I$(top_srcdir)/src
-DRESOURCE_PATH="$(datadir)/WINGs" @XFTFLAGS@ @HEADER_SEARCH_PATH@
diff --git a/WPrefs.app/Makefile.am b/WPrefs.app/Makefile.am
index 3f66428..7929f4a 100644
--- a/WPrefs.app/Makefile.am
+++ b/WPrefs.app/Makefile.am
@@ -40,10 +40,10 @@ WPrefs_SOURCES = editmenu.h xmodifier.c
-AM_CPPFLAGS = -DLOCALEDIR="$(NLSDIR)" -DRESOURCE_PATH="$(wpdatadir)"
-DWMAKER_RESOURCE_PATH="$(pkgdatadir)"
AM_CFLAGS =
-INCLUDES = -I$(top_srcdir)/wrlib -I$(top_srcdir)/WINGs @HEADER_SEARCH_PATH@
+AM_CPPFLAGS = -DLOCALEDIR="$(NLSDIR)" -DRESOURCE_PATH="$(wpdatadir)"
-DWMAKER_RESOURCE_PATH="$(pkgdatadir)" + -I$(top_srcdir)/wrlib
-I$(top_srcdir)/WINGs @HEADER_SEARCH_PATH@
WPrefs_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la
diff --git a/configure.ac b/configure.ac
index c55a5c5..c32b391 100644
--- a/configure.ac
+++ b/configure.ac
@@ -14,7 +14,7 @@ dnl
AC_INIT(WindowMaker, 0.95.3, , WindowMaker, http://www.windowmaker.org/)
AC_CONFIG_SRCDIR(src/WindowMaker.h)
AC_CONFIG_MACRO_DIR([m4])
-AM_CONFIG_HEADER(config.h)
+AC_CONFIG_HEADERS(config.h)
AM_INIT_AUTOMAKE([1.11 silent-rules])
AH_BOTTOM([#include "config-paths.h"])
diff --git a/src/Makefile.am b/src/Makefile.am
index fbedb98..9c77bb4 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -104,10 +104,10 @@ wmaker_SOURCES =
EXTRA_wmaker_SOURCES = osdep_bsd.c osdep_darwin.c osdep_linux.c osdep_stub.c
-AM_CPPFLAGS = $(DFLAGS) -DLOCALEDIR="$(NLSDIR)"
AM_CFLAGS =
-INCLUDES = +AM_CPPFLAGS = + $(DFLAGS) -DLOCALEDIR="$(NLSDIR)"
-I$(top_srcdir)/wrlib -I$(top_srcdir)/WINGs @HEADER_SEARCH_PATH@
diff --git a/test/Makefile.am b/test/Makefile.am
index 2f80174..b89a697 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -10,4 +10,4 @@ wtest_SOURCES = wtest.c
wtest_LDADD = $(top_builddir)/wmlib/libWMaker.la @XLFLAGS@ @XLIBS@
-INCLUDES = -g -D_BSD_SOURCE @XCFLAGS@ -I$(top_srcdir)/wmlib
+AM_CPPFLAGS = -g -D_BSD_SOURCE @XCFLAGS@ -I$(top_srcdir)/wmlib
diff --git a/util/Makefile.am b/util/Makefile.am
index 43fd988..d177818 100644
--- a/util/Makefile.am
+++ b/util/Makefile.am
@@ -11,9 +11,8 @@ bin_SCRIPTS = wmaker.inst wm-oldmenu2new wkdemenu.pl
EXTRA_DIST = wmaker.inst.in bughint wm-oldmenu2new directjpeg.c wkdemenu.pl
-AM_CPPFLAGS = -DLOCALEDIR="$(NLSDIR)"
-
-INCLUDES = $(DFLAGS) -I$(top_srcdir)/WINGs -I$(top_srcdir)/wrlib +AM_CPPFLAGS
= -DLOCALEDIR="$(NLSDIR)" + $(DFLAGS) -I$(top_srcdir)/WINGs
-I$(top_srcdir)/wrlib @HEADER_SEARCH_PATH@ -DETCDIR="sysconfdir"
-DDATADIR="pkgdatadir"
@@ -82,4 +81,4 @@ wmaker.inst: $(srcdir)/wmaker.inst.in ./Makefile
$(srcdir)/wmaker.inst.in >wmaker.inst
chmod 755 wmaker.inst
-
+
diff --git a/wmlib/Makefile.am b/wmlib/Makefile.am
index 4d7c521..3a5ff27 100644
--- a/wmlib/Makefile.am
+++ b/wmlib/Makefile.am
@@ -6,7 +6,7 @@ lib_LTLIBRARIES = libWMaker.la
include_HEADERS = WMaker.h
-INCLUDES = $(DFLAGS) @XCFLAGS@
+AM_CPPFLAGS = $(DFLAGS) @XCFLAGS@
libWMaker_la_SOURCES = menu.c diff --git
a/wrlib/Makefile.am b/wrlib/Makefile.am
index b191158..0aa8db2 100644
--- a/wrlib/Makefile.am
+++ b/wrlib/Makefile.am
@@ -46,7 +46,7 @@ libwraster_la_SOURCES = LTCOMPILE2=`echo $(LTCOMPILE)
| sed -e s/-fomit-frame-pointer//`
COMPILE2=`echo $(COMPILE) | sed -e s/-fomit-frame-pointer//`
-INCLUDES = $(DFLAGS) @HEADER_SEARCH_PATH@
+AM_CPPFLAGS = $(DFLAGS) @HEADER_SEARCH_PATH@
libwraster_la_LIBADD = @LIBRARY_SEARCH_PATH@ @GFXLIBS@ @XLIBS@ @LIBXMU@ -lm
diff --git a/wrlib/tests/Makefile.am b/wrlib/tests/Makefile.am
index ceec40a..e447e97 100644
--- a/wrlib/tests/Makefile.am
+++ b/wrlib/tests/Makefile.am
@@ -6,7 +6,7 @@ noinst_PROGRAMS = testdraw testgrad testrot view
EXTRA_DIST = test.png tile.xpm ballot_box.xpm
-INCLUDES = -I$(srcdir)/.. $(DFLAGS) @HEADER_SEARCH_PATH@
+AM_CPPFLAGS = -I$(srcdir)/.. $(DFLAGS) @HEADER_SEARCH_PATH@
LIBLIST = $(top_builddir)/wrlib/libwraster.la
http://repo.or.cz/w/wmaker-crm.git/commit/0d441c3b986a313e4ff5b1015eb956c93f34bdc2
commit 0d441c3b986a313e4ff5b1015eb956c93f34bdc2
Author: Rodolfo GarcÃa Peñas (kix) <[email protected]>
Date: Thu Jan 3 20:41:01 2013 +0100
Debian changes for final 0.95.4
These are the final changes for the new version 0.95.4. The main change
is set right the symbols for the new version, that include:
- Changes in debian/libwutil2.symbols from the git version to 0.95.4
- Changes in debian/changelog about the comments for the new version
On the other hand, the new debug schema is using hashes, therefore
the /usr/lib/debug/wmaker folder not longer exists. The new folder
is /usr/lib/debug/.build-id. This folder is auto-created and then
we don't need create it in debian/wmaker-dbg.dirs. Therefore, the file
debian/wmaker-dbg.dirs is empty and can be removed.
Finally, a little comment about folder in debian/README.Debian.
diff --git a/debian/README.Debian b/debian/README.Debian
index a20cb47..d8ccc11 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -183,7 +183,7 @@ theme.
If you don't like the arrangement of the Appearance menu, you can put
a file "appearance.menu" in ~/GNUstep/Library/WindowMaker, and it will
-override the default one. Look at /etc/X11/WindowMaker/appearance.menu
+override the default one. Look at /etc/GNUstep/Defaults/appearance.menu
for an example.
Shortcuts
diff --git a/debian/changelog b/debian/changelog
index 9833614..30761d5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,6 @@
-wmaker (0.95.3+20120825-1) experimental; urgency=low
+wmaker (0.95.4-1) experimental; urgency=low
- * THIS PACKAGE VERSION MUST NOT BE UPLOADED TO DEBIAN
- - The debian/libwutil2.symbols must include a real version.
- * New upstream version (git 20120825)
+ * New upstream version 0.95.4.
- Better icon management. [Closes: #35587, #404729]
- Now cpp is not needed. Updated the debian/README.Debian file
- New symbols in debian/libwutil2.symbols
@@ -17,8 +15,12 @@ wmaker (0.95.3+20120825-1) experimental; urgency=low
* debian/rules:
- Removed the get-*-flags scripts fix. Not needed (and was wrong).
- Removed the HOSTSPEC stuff. Not needed with debconf 9.
+ * debian/README.Debian:
+ - Changed /etc path for appearance.menu.
+ * Removed debian/wmaker-dbg.dirs, because the path for debug files
+ is now using hashes (/usr/lib/debug/build-id).
- -- Rodolfo GarcÃa Peñas (kix) <[email protected]> Sun, 9 Sep 2012 11:07:21 +0200
+ -- Rodolfo GarcÃa Peñas (kix) <[email protected]> Wed, 3 Jan 2013 00:17:31 +0100
wmaker (0.95.3-2) unstable; urgency=low
diff --git a/debian/libwutil2.symbols b/debian/libwutil2.symbols
index 22b1305..744be2b 100644
--- a/debian/libwutil2.symbols
+++ b/debian/libwutil2.symbols
@@ -187,12 +187,12 @@ libWUtil.so.2 libwutil2 #MINVER#
WMTreeWalk@Base 0.95.0
WMUserDefaultsDidChangeNotification@Base 0.95.0
WMWritePropListToFile@Base 0.95.0
- WMenuParserCreate@Base 0.95.3+20120825
- WMenuParserDelete@Base 0.95.3+20120825
- WMenuParserError@Base 0.95.3+20120825
- WMenuParserGetFilename@Base 0.95.3+20120825
- WMenuParserGetLine@Base 0.95.3+20120825
- WMenuParserRegisterSimpleMacro@Base 0.95.3+20120825
+ WMenuParserCreate@Base 0.95.4
+ WMenuParserDelete@Base 0.95.4
+ WMenuParserError@Base 0.95.4
+ WMenuParserGetFilename@Base 0.95.4
+ WMenuParserGetLine@Base 0.95.4
+ WMenuParserRegisterSimpleMacro@Base 0.95.4
W_ApplicationInitialized@Base 0.95.0
W_CheckIdleHandlers@Base 0.95.0
W_CheckTimerHandlers@Base 0.95.0
@@ -205,13 +205,13 @@ libWUtil.so.2 libwutil2 #MINVER#
__wmessage@Base 0.95.0
wcopy_file@Base 0.95.1
destroyNode@Base 0.95.0
- isnamechr@Base 0.95.3+20120825-1
- menu_parser_define_macro@Base 0.95.3+20120825
- menu_parser_expand_macro@Base 0.95.3+20120825
- menu_parser_find_macro@Base 0.95.3+20120825
- menu_parser_free_macros@Base 0.95.3+20120825
- menu_parser_register_preset_macros@Base 0.95.3+20120825
- menu_parser_skip_spaces_and_comments@Base 0.95.3+20120825
+ isnamechr@Base 0.95.4
+ menu_parser_define_macro@Base 0.95.4
+ menu_parser_expand_macro@Base 0.95.4
+ menu_parser_find_macro@Base 0.95.4
+ menu_parser_free_macros@Base 0.95.4
+ menu_parser_register_preset_macros@Base 0.95.4
+ menu_parser_skip_spaces_and_comments@Base 0.95.4
wdefaultspathfordomain@Base 0.95.0
wexpandpath@Base 0.95.0
wfindfile@Base 0.95.0
diff --git a/debian/rules b/debian/rules
old mode 100644
new mode 100755
diff --git a/debian/wmaker-dbg.dirs b/debian/wmaker-dbg.dirs
deleted file mode 100644
index f4d025b..0000000
--- a/debian/wmaker-dbg.dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/debug/usr/lib/WindowMaker
-----------------------------------------------------------------------
Summary of changes:
WINGs/Examples/Makefile.am | 2 +-
WINGs/Extras/Makefile.am | 2 +-
WINGs/Makefile.am | 4 ++--
WINGs/Tests/Makefile.am | 2 +-
WINGs/wtextfield.c | 14 ++++----------
WPrefs.app/Makefile.am | 4 ++--
configure.ac | 4 ++--
debian/README.Debian | 2 +-
debian/changelog | 12 +++++++-----
debian/libwutil2.symbols | 26 +++++++++++++-------------
debian/wmaker-dbg.dirs | 1 -
src/Makefile.am | 4 ++--
test/Makefile.am | 2 +-
util/Makefile.am | 7 +++----
wmlib/Makefile.am | 2 +-
wrlib/Makefile.am | 2 +-
wrlib/tests/Makefile.am | 2 +-
17 files changed, 43 insertions(+), 49 deletions(-)
mode change 100644 => 100755 debian/rules
delete mode 100644 debian/wmaker-dbg.dirs
repo.or.cz automatic notification. Contact project admin [email protected]
if you want to unsubscribe, or site admin [email protected] if you receive
no reply.
--
wmaker-crm.git ("The Window Maker window manager")
--
To unsubscribe, send mail to [email protected].
