[Lsb-messages] /var/www/bzr/lsb/devel/build_env r1956: don't include SANE_CAP_ALWAYS_SETTABLE after all (bug 2199)

Mats Wichmann mats at linuxfoundation.org
Tue May 15 18:05:44 UTC 2012


------------------------------------------------------------
revno: 1956
committer: Mats Wichmann <mats at linuxfoundation.org>
branch nick: build_env
timestamp: Tue 2012-05-15 12:05:44 -0600
message:
  don't include SANE_CAP_ALWAYS_SETTABLE after all (bug 2199)
modified:
  headers/All/5.0/sane/sane.h.defs
  headers/sane/sane.h
  package/Makefile
-------------- next part --------------
=== modified file 'headers/All/5.0/sane/sane.h.defs'
--- a/headers/All/5.0/sane/sane.h.defs	2012-04-26 14:45:36 +0000
+++ b/headers/All/5.0/sane/sane.h.defs	2012-05-15 18:05:44 +0000
@@ -18,7 +18,6 @@
 #define SANE_CAP_AUTOMATIC	(1 << 4)
 #define SANE_CAP_INACTIVE	(1 << 5)
 #define SANE_CAP_ADVANCED	(1 << 6)
-#define SANE_CAP_ALWAYS_SETTABLE	(1 << 7)
 #define SANE_CURRENT_MINOR	0
 #define SANE_FALSE	0
 #define SANE_CURRENT_MAJOR	1

=== modified file 'headers/sane/sane.h'
--- a/headers/sane/sane.h	2012-04-26 14:45:36 +0000
+++ b/headers/sane/sane.h	2012-05-15 18:05:44 +0000
@@ -27,7 +27,6 @@
 #define SANE_CAP_AUTOMATIC	(1 << 4)
 #define SANE_CAP_INACTIVE	(1 << 5)
 #define SANE_CAP_ADVANCED	(1 << 6)
-#define SANE_CAP_ALWAYS_SETTABLE	(1 << 7)
 #define SANE_CURRENT_MINOR	0
 #define SANE_FALSE	0
 #define SANE_CURRENT_MAJOR	1

=== modified file 'package/Makefile'
--- a/package/Makefile	2012-05-15 13:44:37 +0000
+++ b/package/Makefile	2012-05-15 18:05:44 +0000
@@ -46,7 +46,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=5
+RPM_PACKAGE_RELEASE=6
 
 # 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