[Lsb-messages] /var/www/bzr/lsb/devel/build_env r2227: revert eight more function returns from earlier change (bug 3937)

Mats Wichmann mats at linuxfoundation.org
Wed Mar 5 13:49:09 UTC 2014


------------------------------------------------------------
revno: 2227
committer: Mats Wichmann <mats at linuxfoundation.org>
branch nick: build_env
timestamp: Wed 2014-03-05 06:49:09 -0700
message:
  revert eight more function returns from earlier change (bug 3937)
modified:
  headers/gtk-2.0/gtk/gtk.h
  headers/gtk-2.0/gtk/gtktextbufferrichtext.h
  package/Makefile
-------------- next part --------------
=== modified file 'headers/gtk-2.0/gtk/gtk.h'
--- a/headers/gtk-2.0/gtk/gtk.h	2014-03-05 01:24:15 +0000
+++ b/headers/gtk-2.0/gtk/gtk.h	2014-03-05 13:49:09 +0000
@@ -14,7 +14,6 @@
 #include <gtk-2.0/gtk/gtkprintoperationpreview.h>
 #include <gtk-2.0/gtk/gtkrecentfilter.h>
 #include <gtk-2.0/gtk/gtkrecentmanager.h>
-#include <gtk-3.0/gdk/gdk.h>
 
 #if !defined(LSB_DECL_DEPRECATED)
 #if defined(__GNUC__) && !defined(__INTEL_COMPILER) && (__GNUC__ - 0 > 3 || (__GNUC__ - 0 == 3 && __GNUC_MINOR__ - 0 >= 2))

=== modified file 'headers/gtk-2.0/gtk/gtktextbufferrichtext.h'
--- a/headers/gtk-2.0/gtk/gtktextbufferrichtext.h	2014-03-05 01:24:15 +0000
+++ b/headers/gtk-2.0/gtk/gtktextbufferrichtext.h	2014-03-05 13:49:09 +0000
@@ -6,7 +6,6 @@
 #include <glib-2.0/glib-object.h>
 #include <gtk-2.0/gdk/gdk.h>
 #include <gtk-2.0/gtk/gtk.h>
-#include <gtk-3.0/gdk/gdk.h>
 
 #ifdef __cplusplus
 extern "C" {

=== modified file 'package/Makefile'
--- a/package/Makefile	2014-03-05 01:24:15 +0000
+++ b/package/Makefile	2014-03-05 13:49:09 +0000
@@ -50,7 +50,7 @@
 
 # We define this here instead of directly in the spec file as
 # we need to be able to work out what the produced rpm files will be called
-RPM_PACKAGE_RELEASE=11
+RPM_PACKAGE_RELEASE=12
 
 # Initialize LIB64 to proper value for 64-bit architectures
 export LIB64:=$(shell case `uname -m` in (ppc64 | s390x | x86_64) echo 64 ;; esac)



More information about the lsb-messages mailing list