[Lsb-messages] /var/www/bzr/lsb/devel/build_env r2182: reset accidentally changed cups enum appeared-ins (bug 3901)

Mats Wichmann mats at linuxfoundation.org
Fri Jan 17 14:31:42 UTC 2014


------------------------------------------------------------
revno: 2182
committer: Mats Wichmann <mats at linuxfoundation.org>
branch nick: build_env
timestamp: Fri 2014-01-17 07:31:42 -0700
message:
  reset accidentally changed cups enum appeared-ins (bug 3901)
modified:
  headers/All/3.2/cups/cups.h.defs
  headers/All/4.0/cups/cups.h.defs
  headers/cups/cups.h
  package/Makefile
-------------- next part --------------
=== modified file 'headers/All/3.2/cups/cups.h.defs'
--- a/headers/All/3.2/cups/cups.h.defs	2011-04-15 20:53:18 +0000
+++ b/headers/All/3.2/cups/cups.h.defs	2014-01-17 14:31:42 +0000
@@ -60,6 +60,76 @@
     int num_options;
     cups_option_t *options;
 } cups_dest_t;
+typedef enum {
+    HTTP_WAITING = 0,
+    HTTP_OPTIONS = 1,
+    HTTP_GET = 2,
+    HTTP_GET_SEND = 3,
+    HTTP_HEAD = 4,
+    HTTP_POST = 5,
+    HTTP_POST_RECV = 6,
+    HTTP_POST_SEND = 7,
+    HTTP_PUT = 8,
+    HTTP_PUT_RECV = 9,
+    HTTP_DELETE = 10,
+    HTTP_TRACE = 11,
+    HTTP_CLOSE = 12,
+    HTTP_STATUS = 13
+} http_state_t;
+typedef enum {
+    HTTP_ERROR = -1,
+    HTTP_CONTINUE = 100,
+    HTTP_SWITCHING_PROTOCOLS = 101,
+    HTTP_OK = 200,
+    HTTP_CREATED = 201,
+    HTTP_ACCEPTED = 202,
+    HTTP_NOT_AUTHORITATIVE = 203,
+    HTTP_NO_CONTENT = 204,
+    HTTP_RESET_CONTENT = 205,
+    HTTP_PARTIAL_CONTENT = 206,
+    HTTP_MULTIPLE_CHOICES = 300,
+    HTTP_MOVED_PERMANENTLY = 301,
+    HTTP_MOVED_TEMPORARILY = 302,
+    HTTP_SEE_OTHER = 303,
+    HTTP_NOT_MODIFIED = 304,
+    HTTP_USE_PROXY = 305,
+    HTTP_BAD_REQUEST = 400,
+    HTTP_UNAUTHORIZED = 401,
+    HTTP_PAYMENT_REQUIRED = 402,
+    HTTP_FORBIDDEN = 403,
+    HTTP_NOT_FOUND = 404,
+    HTTP_METHOD_NOT_ALLOWED = 405,
+    HTTP_NOT_ACCEPTABLE = 406,
+    HTTP_PROXY_AUTHENTICATION = 407,
+    HTTP_REQUEST_TIMEOUT = 408,
+    HTTP_CONFLICT = 409,
+    HTTP_GONE = 410,
+    HTTP_LENGTH_REQUIRED = 411,
+    HTTP_PRECONDITION = 412,
+    HTTP_REQUEST_TOO_LARGE = 413,
+    HTTP_URI_TOO_LONG = 414,
+    HTTP_UNSUPPORTED_MEDIATYPE = 415,
+    HTTP_UPGRADE_REQUIRED = 426,
+    HTTP_SERVER_ERROR = 500,
+    HTTP_NOT_IMPLEMENTED = 501,
+    HTTP_BAD_GATEWAY = 502,
+    HTTP_SERVICE_UNAVAILABLE = 503,
+    HTTP_GATEWAY_TIMEOUT = 504,
+    HTTP_NOT_SUPPORTED = 505
+} http_status_t;
+typedef enum {
+    HTTP_0_9 = 9,
+    HTTP_1_0 = 100,
+    HTTP_1_1 = 101
+} http_version_t;
+typedef enum {
+    HTTP_KEEPALIVE_OFF = 0,
+    HTTP_KEEPALIVE_ON = 1
+} http_keepalive_t;
+typedef enum {
+    HTTP_ENCODE_LENGTH = 0,
+    HTTP_ENCODE_CHUNKED = 1
+} http_encoding_t;
 typedef unsigned int md5_word_t;
 typedef unsigned char md5_byte_t;
 typedef struct md5_state_s {

=== modified file 'headers/All/4.0/cups/cups.h.defs'
--- a/headers/All/4.0/cups/cups.h.defs	2011-04-15 20:53:18 +0000
+++ b/headers/All/4.0/cups/cups.h.defs	2014-01-17 14:31:42 +0000
@@ -61,6 +61,76 @@
     cups_option_t *options;
 } cups_dest_t;
 typedef enum {
+    HTTP_WAITING = 0,
+    HTTP_OPTIONS = 1,
+    HTTP_GET = 2,
+    HTTP_GET_SEND = 3,
+    HTTP_HEAD = 4,
+    HTTP_POST = 5,
+    HTTP_POST_RECV = 6,
+    HTTP_POST_SEND = 7,
+    HTTP_PUT = 8,
+    HTTP_PUT_RECV = 9,
+    HTTP_DELETE = 10,
+    HTTP_TRACE = 11,
+    HTTP_CLOSE = 12,
+    HTTP_STATUS = 13
+} http_state_t;
+typedef enum {
+    HTTP_ERROR = -1,
+    HTTP_CONTINUE = 100,
+    HTTP_SWITCHING_PROTOCOLS = 101,
+    HTTP_OK = 200,
+    HTTP_CREATED = 201,
+    HTTP_ACCEPTED = 202,
+    HTTP_NOT_AUTHORITATIVE = 203,
+    HTTP_NO_CONTENT = 204,
+    HTTP_RESET_CONTENT = 205,
+    HTTP_PARTIAL_CONTENT = 206,
+    HTTP_MULTIPLE_CHOICES = 300,
+    HTTP_MOVED_PERMANENTLY = 301,
+    HTTP_MOVED_TEMPORARILY = 302,
+    HTTP_SEE_OTHER = 303,
+    HTTP_NOT_MODIFIED = 304,
+    HTTP_USE_PROXY = 305,
+    HTTP_BAD_REQUEST = 400,
+    HTTP_UNAUTHORIZED = 401,
+    HTTP_PAYMENT_REQUIRED = 402,
+    HTTP_FORBIDDEN = 403,
+    HTTP_NOT_FOUND = 404,
+    HTTP_METHOD_NOT_ALLOWED = 405,
+    HTTP_NOT_ACCEPTABLE = 406,
+    HTTP_PROXY_AUTHENTICATION = 407,
+    HTTP_REQUEST_TIMEOUT = 408,
+    HTTP_CONFLICT = 409,
+    HTTP_GONE = 410,
+    HTTP_LENGTH_REQUIRED = 411,
+    HTTP_PRECONDITION = 412,
+    HTTP_REQUEST_TOO_LARGE = 413,
+    HTTP_URI_TOO_LONG = 414,
+    HTTP_UNSUPPORTED_MEDIATYPE = 415,
+    HTTP_UPGRADE_REQUIRED = 426,
+    HTTP_SERVER_ERROR = 500,
+    HTTP_NOT_IMPLEMENTED = 501,
+    HTTP_BAD_GATEWAY = 502,
+    HTTP_SERVICE_UNAVAILABLE = 503,
+    HTTP_GATEWAY_TIMEOUT = 504,
+    HTTP_NOT_SUPPORTED = 505
+} http_status_t;
+typedef enum {
+    HTTP_0_9 = 9,
+    HTTP_1_0 = 100,
+    HTTP_1_1 = 101
+} http_version_t;
+typedef enum {
+    HTTP_KEEPALIVE_OFF = 0,
+    HTTP_KEEPALIVE_ON = 1
+} http_keepalive_t;
+typedef enum {
+    HTTP_ENCODE_LENGTH = 0,
+    HTTP_ENCODE_CHUNKED = 1
+} http_encoding_t;
+typedef enum {
     IPP_JOB_PENDING = 3,
     IPP_JOB_HELD = 4,
     IPP_JOB_PROCESSING = 5,

=== modified file 'headers/cups/cups.h'
--- a/headers/cups/cups.h	2012-05-29 20:01:41 +0000
+++ b/headers/cups/cups.h	2014-01-17 14:31:42 +0000
@@ -73,6 +73,81 @@
     } cups_dest_t;
 
     typedef enum {
+	HTTP_WAITING = 0,
+	HTTP_OPTIONS = 1,
+	HTTP_GET = 2,
+	HTTP_GET_SEND = 3,
+	HTTP_HEAD = 4,
+	HTTP_POST = 5,
+	HTTP_POST_RECV = 6,
+	HTTP_POST_SEND = 7,
+	HTTP_PUT = 8,
+	HTTP_PUT_RECV = 9,
+	HTTP_DELETE = 10,
+	HTTP_TRACE = 11,
+	HTTP_CLOSE = 12,
+	HTTP_STATUS = 13
+    } http_state_t;
+
+    typedef enum {
+	HTTP_ERROR = -1,
+	HTTP_CONTINUE = 100,
+	HTTP_SWITCHING_PROTOCOLS = 101,
+	HTTP_OK = 200,
+	HTTP_CREATED = 201,
+	HTTP_ACCEPTED = 202,
+	HTTP_NOT_AUTHORITATIVE = 203,
+	HTTP_NO_CONTENT = 204,
+	HTTP_RESET_CONTENT = 205,
+	HTTP_PARTIAL_CONTENT = 206,
+	HTTP_MULTIPLE_CHOICES = 300,
+	HTTP_MOVED_PERMANENTLY = 301,
+	HTTP_MOVED_TEMPORARILY = 302,
+	HTTP_SEE_OTHER = 303,
+	HTTP_NOT_MODIFIED = 304,
+	HTTP_USE_PROXY = 305,
+	HTTP_BAD_REQUEST = 400,
+	HTTP_UNAUTHORIZED = 401,
+	HTTP_PAYMENT_REQUIRED = 402,
+	HTTP_FORBIDDEN = 403,
+	HTTP_NOT_FOUND = 404,
+	HTTP_METHOD_NOT_ALLOWED = 405,
+	HTTP_NOT_ACCEPTABLE = 406,
+	HTTP_PROXY_AUTHENTICATION = 407,
+	HTTP_REQUEST_TIMEOUT = 408,
+	HTTP_CONFLICT = 409,
+	HTTP_GONE = 410,
+	HTTP_LENGTH_REQUIRED = 411,
+	HTTP_PRECONDITION = 412,
+	HTTP_REQUEST_TOO_LARGE = 413,
+	HTTP_URI_TOO_LONG = 414,
+	HTTP_UNSUPPORTED_MEDIATYPE = 415,
+	HTTP_UPGRADE_REQUIRED = 426,
+	HTTP_SERVER_ERROR = 500,
+	HTTP_NOT_IMPLEMENTED = 501,
+	HTTP_BAD_GATEWAY = 502,
+	HTTP_SERVICE_UNAVAILABLE = 503,
+	HTTP_GATEWAY_TIMEOUT = 504,
+	HTTP_NOT_SUPPORTED = 505
+    } http_status_t;
+
+    typedef enum {
+	HTTP_0_9 = 9,
+	HTTP_1_0 = 100,
+	HTTP_1_1 = 101
+    } http_version_t;
+
+    typedef enum {
+	HTTP_KEEPALIVE_OFF = 0,
+	HTTP_KEEPALIVE_ON = 1
+    } http_keepalive_t;
+
+    typedef enum {
+	HTTP_ENCODE_LENGTH = 0,
+	HTTP_ENCODE_CHUNKED = 1
+    } http_encoding_t;
+
+    typedef enum {
 	IPP_JOB_PENDING = 3,
 	IPP_JOB_HELD = 4,
 	IPP_JOB_PROCESSING = 5,
@@ -159,81 +234,6 @@
 #if __LSB_VERSION__ >= 41
     typedef struct cups_lang_s cups_lang_t;
 
-    typedef enum {
-	HTTP_WAITING = 0,
-	HTTP_OPTIONS = 1,
-	HTTP_GET = 2,
-	HTTP_GET_SEND = 3,
-	HTTP_HEAD = 4,
-	HTTP_POST = 5,
-	HTTP_POST_RECV = 6,
-	HTTP_POST_SEND = 7,
-	HTTP_PUT = 8,
-	HTTP_PUT_RECV = 9,
-	HTTP_DELETE = 10,
-	HTTP_TRACE = 11,
-	HTTP_CLOSE = 12,
-	HTTP_STATUS = 13
-    } http_state_t;
-
-    typedef enum {
-	HTTP_ERROR = -1,
-	HTTP_CONTINUE = 100,
-	HTTP_SWITCHING_PROTOCOLS = 101,
-	HTTP_OK = 200,
-	HTTP_CREATED = 201,
-	HTTP_ACCEPTED = 202,
-	HTTP_NOT_AUTHORITATIVE = 203,
-	HTTP_NO_CONTENT = 204,
-	HTTP_RESET_CONTENT = 205,
-	HTTP_PARTIAL_CONTENT = 206,
-	HTTP_MULTIPLE_CHOICES = 300,
-	HTTP_MOVED_PERMANENTLY = 301,
-	HTTP_MOVED_TEMPORARILY = 302,
-	HTTP_SEE_OTHER = 303,
-	HTTP_NOT_MODIFIED = 304,
-	HTTP_USE_PROXY = 305,
-	HTTP_BAD_REQUEST = 400,
-	HTTP_UNAUTHORIZED = 401,
-	HTTP_PAYMENT_REQUIRED = 402,
-	HTTP_FORBIDDEN = 403,
-	HTTP_NOT_FOUND = 404,
-	HTTP_METHOD_NOT_ALLOWED = 405,
-	HTTP_NOT_ACCEPTABLE = 406,
-	HTTP_PROXY_AUTHENTICATION = 407,
-	HTTP_REQUEST_TIMEOUT = 408,
-	HTTP_CONFLICT = 409,
-	HTTP_GONE = 410,
-	HTTP_LENGTH_REQUIRED = 411,
-	HTTP_PRECONDITION = 412,
-	HTTP_REQUEST_TOO_LARGE = 413,
-	HTTP_URI_TOO_LONG = 414,
-	HTTP_UNSUPPORTED_MEDIATYPE = 415,
-	HTTP_UPGRADE_REQUIRED = 426,
-	HTTP_SERVER_ERROR = 500,
-	HTTP_NOT_IMPLEMENTED = 501,
-	HTTP_BAD_GATEWAY = 502,
-	HTTP_SERVICE_UNAVAILABLE = 503,
-	HTTP_GATEWAY_TIMEOUT = 504,
-	HTTP_NOT_SUPPORTED = 505
-    } http_status_t;
-
-    typedef enum {
-	HTTP_0_9 = 9,
-	HTTP_1_0 = 100,
-	HTTP_1_1 = 101
-    } http_version_t;
-
-    typedef enum {
-	HTTP_KEEPALIVE_OFF = 0,
-	HTTP_KEEPALIVE_ON = 1
-    } http_keepalive_t;
-
-    typedef enum {
-	HTTP_ENCODE_LENGTH = 0,
-	HTTP_ENCODE_CHUNKED = 1
-    } http_encoding_t;
-
     typedef struct _cups_array_s cups_array_t;
 
 #endif				/* __LSB_VERSION__ >= 4.1 */

=== modified file 'package/Makefile'
--- a/package/Makefile	2014-01-14 20:15:59 +0000
+++ b/package/Makefile	2014-01-17 14:31:42 +0000
@@ -42,7 +42,7 @@
 # Should have leading "."
 # a big number (80-99) is leading up to the next minor spec
 # build_env is version-independent so can wait till late to bump this
-SUB_VERSION=.52
+SUB_VERSION=.53
 
 # 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



More information about the lsb-messages mailing list