Hi, I've prepared an NMU for boinc and uploaded it to DELAYED/2.
debdiff is attached. Cheers, Michael -- Why is it that all of the instruments seeking intelligent life in the universe are pointed away from Earth?
diff -Nru boinc-6.12.33+dfsg/debian/changelog boinc-6.12.33+dfsg/debian/changelog --- boinc-6.12.33+dfsg/debian/changelog 2011-06-20 20:47:42.000000000 +0200 +++ boinc-6.12.33+dfsg/debian/changelog 2011-08-06 05:58:21.000000000 +0200 @@ -1,3 +1,15 @@ +boinc (6.12.33+dfsg-1.1) unstable; urgency=low + + * Non-maintainer upload. + * Port to libnotify 0.7. (Closes: #636296) + - Bump Build-Depends on libnotify to (>= 0.7.0). + - Add debian/patches/libnotify-0.7.patch. + - Update build system to properly set gtk+-2.0 cflags/ldflags for the + boincmgr GUI application. + - Update to the new libnotify 0.7 API. + + -- Michael Biebl <bi...@debian.org> Sat, 06 Aug 2011 05:50:23 +0200 + boinc (6.12.33+dfsg-1) unstable; urgency=low [Steffen] diff -Nru boinc-6.12.33+dfsg/debian/control boinc-6.12.33+dfsg/debian/control --- boinc-6.12.33+dfsg/debian/control 2011-06-19 16:47:28.000000000 +0200 +++ boinc-6.12.33+dfsg/debian/control 2011-08-06 05:49:11.000000000 +0200 @@ -12,7 +12,7 @@ libtool, autoconf (>= 2.59), autotools-dev, automake1.9 (>= 1.9.3), gettext, docbook2x, docbook-xml, libxml2-utils, zlib1g-dev, libssl-dev, libcurl4-openssl-dev (>= 7.17.1), - libsm-dev, libice-dev, libxmu-dev, libxi-dev, libx11-dev, libnotify-dev, + libsm-dev, libice-dev, libxmu-dev, libxi-dev, libx11-dev, libnotify-dev (>= 0.7.0), freeglut3-dev, libwxgtk2.8-dev, libgtk2.0-dev, libsqlite3-dev, libmysqlclient-dev, python, libfcgi-dev, libjpeg62-dev, Homepage: http://boinc.berkeley.edu/ diff -Nru boinc-6.12.33+dfsg/debian/patches/libnotify-0.7.patch boinc-6.12.33+dfsg/debian/patches/libnotify-0.7.patch --- boinc-6.12.33+dfsg/debian/patches/libnotify-0.7.patch 1970-01-01 01:00:00.000000000 +0100 +++ boinc-6.12.33+dfsg/debian/patches/libnotify-0.7.patch 2011-08-06 05:55:34.000000000 +0200 @@ -0,0 +1,68 @@ +Index: boinc-6.12.33+dfsg/clientgui/Makefile.am +=================================================================== +--- boinc-6.12.33+dfsg.orig/clientgui/Makefile.am 2011-08-06 05:52:53.953762602 +0200 ++++ boinc-6.12.33+dfsg/clientgui/Makefile.am 2011-08-06 05:52:54.169759886 +0200 +@@ -118,9 +118,9 @@ + ../lib/error_numbers.h \ + locale $(mac_headers) + +-boincmgr_CPPFLAGS = $(AM_CPPFLAGS) $(WX_CPPFLAGS) $(SQLITE3_CPPFLAGS) $(LIBNOTIFY_CFLAGS) $(CLIENTGUIFLAGS) +-boincmgr_CXXFLAGS = $(AM_CXXFLAGS) $(WX_CXXFLAGS) $(SQLITE3_CPPFLAGS) $(LIBNOTIFY_CFLAGS) $(CLIENTGUIFLAGS) +-boincmgr_LDADD = $(LIBBOINC) $(SQLITE3_LIBS) $(LIBNOTIFY_LIBS) $(CLIENTGUILIBS) $(BOINC_EXTRA_LIBS) $(CLIENTLIBS) ++boincmgr_CPPFLAGS = $(AM_CPPFLAGS) $(WX_CPPFLAGS) $(SQLITE3_CPPFLAGS) $(LIBNOTIFY_CFLAGS) $(CLIENTGUIFLAGS) $(GTK_CLFAGS) ++boincmgr_CXXFLAGS = $(AM_CXXFLAGS) $(WX_CXXFLAGS) $(SQLITE3_CPPFLAGS) $(LIBNOTIFY_CFLAGS) $(CLIENTGUIFLAGS) $(GTK_CFLAGS) ++boincmgr_LDADD = $(LIBBOINC) $(SQLITE3_LIBS) $(LIBNOTIFY_LIBS) $(CLIENTGUILIBS) $(BOINC_EXTRA_LIBS) $(CLIENTLIBS) $(GTK_LIBS) + + win_config.h: $(top_srcdir)/config.h + grep '#define.*BOINC.*VERSION' $^ > $@ +Index: boinc-6.12.33+dfsg/configure.ac +=================================================================== +--- boinc-6.12.33+dfsg.orig/configure.ac 2011-08-06 05:52:53.929762904 +0200 ++++ boinc-6.12.33+dfsg/configure.ac 2011-08-06 05:55:32.043775140 +0200 +@@ -702,14 +702,12 @@ + + dnl ---------- libNotify -------------------------------------------------- + if test "${enable_manager}" = yes ; then +- pkg_config_args=libnotify +- AC_PATH_PROG(PKG_CONFIG, pkg-config, no) +- +- LIBNOTIFY_CFLAGS=`$PKG_CONFIG libnotify --cflags` +- LIBNOTIFY_LIBS=`$PKG_CONFIG libnotify --libs` ++ PKG_CHECK_MODULES(LIBNOTIFY, [libnotify >= 0.7.0]) ++fi + +- AC_SUBST(LIBNOTIFY_CFLAGS) +- AC_SUBST(LIBNOTIFY_LIBS) ++dnl ---------- GTK2 ------------------------------------------------------- ++if test "${enable_manager}" = yes ; then ++ PKG_CHECK_MODULES(GTK, [gtk+-2.0]) + fi + + dnl ---------- Sqlite3 ---------------------------------------------------- +@@ -846,7 +844,7 @@ + ], + [enable_wx_debug="no"]) + +-CLIENTGUILIBS="${WX_LIBS} ${SQLITE3_LIBS} ${GTK_LIBS}" ++CLIENTGUILIBS="${WX_LIBS} ${SQLITE3_LIBS}" + + if test "${enable_client_release}" = "yes" ; then + if test "x${WX_LIBS_STATIC}" = "x" ; then +Index: boinc-6.12.33+dfsg/clientgui/gtk/taskbarex.cpp +=================================================================== +--- boinc-6.12.33+dfsg.orig/clientgui/gtk/taskbarex.cpp 2011-08-06 05:52:34.806003323 +0200 ++++ boinc-6.12.33+dfsg/clientgui/gtk/taskbarex.cpp 2011-08-06 05:52:54.173759836 +0200 +@@ -227,11 +227,10 @@ + if (!g_pNotification) + { + g_pNotification = +- notify_notification_new_with_status_icon( ++ notify_notification_new( + title.mb_str(), + message.mb_str(), +- desired_icon, +- g_pStatusIcon ++ desired_icon + ); + + g_signal_connect( diff -Nru boinc-6.12.33+dfsg/debian/patches/series boinc-6.12.33+dfsg/debian/patches/series --- boinc-6.12.33+dfsg/debian/patches/series 2011-06-20 20:50:56.000000000 +0200 +++ boinc-6.12.33+dfsg/debian/patches/series 2011-08-06 05:48:26.000000000 +0200 @@ -14,3 +14,4 @@ upstream_sztaki_ProperArrayPhpIndexCheck_JobTimes.patch debian_debian_AdjustBoincTopdirPython.patch debian-changes-6.12.33+dfsg-1 +libnotify-0.7.patch
signature.asc
Description: OpenPGP digital signature
