[maemo-commits] [maemo-commits] r16206 - in projects/haf/trunk/apt: . debian
From: subversion at stage.maemo.org subversion at stage.maemo.orgDate: Wed Sep 24 14:31:59 EEST 2008
- Previous message: [maemo-commits] r16205 - in projects/haf/trunk/gtk+: . gtk
- Next message: [maemo-commits] r16207 - projects/haf/tags/apt
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
Author: marivoll Date: 2008-09-24 14:31:58 +0300 (Wed, 24 Sep 2008) New Revision: 16206 Modified: projects/haf/trunk/apt/configure projects/haf/trunk/apt/configure.in projects/haf/trunk/apt/debian/changelog Log: apt (0.7.14maemo3) unstable; urgency=low * Updated maemostrip.patch -- Marius Vollmer <marius.vollmer at nokia.com> Wed, 24 Sep 2008 10:35:36 +0300 Modified: projects/haf/trunk/apt/configure =================================================================== --- projects/haf/trunk/apt/configure 2008-09-24 11:05:27 UTC (rev 16205) +++ projects/haf/trunk/apt/configure 2008-09-24 11:31:58 UTC (rev 16206) @@ -1798,7 +1798,7 @@ cat >>confdefs.h <<_ACEOF -#define VERSION "0.7.14maemo3~unreleased" +#define VERSION "0.7.14maemo3" _ACEOF PACKAGE="apt" @@ -4498,209 +4498,9 @@ LIBS="$saveLIBS" -{ echo "$as_me:$LINENO: checking for curl_easy_init in -lcurl" >&5 -echo $ECHO_N "checking for curl_easy_init in -lcurl... $ECHO_C" >&6; } -if test "${ac_cv_lib_curl_curl_easy_init+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lcurl $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char curl_easy_init (); -int -main () -{ -return curl_easy_init (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_lib_curl_curl_easy_init=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_lib_curl_curl_easy_init=no -fi -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_curl_curl_easy_init" >&5 -echo "${ECHO_T}$ac_cv_lib_curl_curl_easy_init" >&6; } -if test $ac_cv_lib_curl_curl_easy_init = yes; then - if test "${ac_cv_header_curl_curl_h+set}" = set; then - { echo "$as_me:$LINENO: checking for curl/curl.h" >&5 -echo $ECHO_N "checking for curl/curl.h... $ECHO_C" >&6; } -if test "${ac_cv_header_curl_curl_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_curl_curl_h" >&5 -echo "${ECHO_T}$ac_cv_header_curl_curl_h" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking curl/curl.h usability" >&5 -echo $ECHO_N "checking curl/curl.h usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <curl/curl.h> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } - -# Is the header present? -{ echo "$as_me:$LINENO: checking curl/curl.h presence" >&5 -echo $ECHO_N "checking curl/curl.h presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <curl/curl.h> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: curl/curl.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: curl/curl.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: curl/curl.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: curl/curl.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: curl/curl.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: curl/curl.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: curl/curl.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: curl/curl.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: curl/curl.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: curl/curl.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: curl/curl.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: curl/curl.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: curl/curl.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: curl/curl.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: curl/curl.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: curl/curl.h: in the future, the compiler will take precedence" >&2;} - - ;; -esac -{ echo "$as_me:$LINENO: checking for curl/curl.h" >&5 -echo $ECHO_N "checking for curl/curl.h... $ECHO_C" >&6; } -if test "${ac_cv_header_curl_curl_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_curl_curl_h=$ac_header_preproc -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_curl_curl_h" >&5 -echo "${ECHO_T}$ac_cv_header_curl_curl_h" >&6; } - -fi -if test $ac_cv_header_curl_curl_h = yes; then - curl_ok=yes -else - curl_ok=no -fi - - -else - { { echo "$as_me:$LINENO: error: failed: I need CURL due https support" >&5 -echo "$as_me: error: failed: I need CURL due https support" >&2;} - { (exit 1); exit 1; }; } -fi - - - - { echo "$as_me:$LINENO: checking debian architecture" >&5 echo $ECHO_N "checking debian architecture... $ECHO_C" >&6; } archset="`dpkg-architecture -qDEB_HOST_ARCH`" Modified: projects/haf/trunk/apt/configure.in =================================================================== --- projects/haf/trunk/apt/configure.in 2008-09-24 11:05:27 UTC (rev 16205) +++ projects/haf/trunk/apt/configure.in 2008-09-24 11:31:58 UTC (rev 16206) @@ -18,7 +18,7 @@ AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in) dnl -- SET THIS TO THE RELEASE VERSION -- -AC_DEFINE_UNQUOTED(VERSION,"0.7.14maemo3~unreleased") +AC_DEFINE_UNQUOTED(VERSION,"0.7.14maemo3") PACKAGE="apt" AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE") AC_SUBST(PACKAGE) Modified: projects/haf/trunk/apt/debian/changelog =================================================================== --- projects/haf/trunk/apt/debian/changelog 2008-09-24 11:05:27 UTC (rev 16205) +++ projects/haf/trunk/apt/debian/changelog 2008-09-24 11:31:58 UTC (rev 16206) @@ -1,4 +1,4 @@ -apt (0.7.14maemo3~unreleased) unstable; urgency=low +apt (0.7.14maemo3) unstable; urgency=low * Updated maemostrip.patch
- Previous message: [maemo-commits] r16205 - in projects/haf/trunk/gtk+: . gtk
- Next message: [maemo-commits] r16207 - projects/haf/tags/apt
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]