Changeset 6569


Ignore:
Timestamp:
04/22/10 06:18:46 (3 years ago)
Author:
alanbach-guest
Message:
  • Revert back to xklavier 4.0
    • Regenerate 70_relibtoolize.patch
Location:
pkg/frankie/main/gnome-settings-daemon/trunk/debian
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • pkg/frankie/main/gnome-settings-daemon/trunk/debian/changelog

    r6562 r6569  
     1gnome-settings-daemon (2.28.2-parsix2) unstable; urgency=low 
     2 
     3  * Revert back to xklavier 4.0 
     4  * Regenerate 70_relibtoolize.patch 
     5 
     6 -- Alan Baghumian <alan@technotux.org>  Wed, 21 Apr 2010 21:17:52 -0700 
     7 
    18gnome-settings-daemon (2.28.2-parsix1) unstable; urgency=low 
    29 

  • pkg/frankie/main/gnome-settings-daemon/trunk/debian/patches/70_relibtoolize.patch

    r6562 r6569  
    1995219952-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libgnomekbd >= 2.21.4 libxklavier >= 4.0\""; } >&5 
    1995319953-  ($PKG_CONFIG --exists --print-errors "libgnomekbd >= 2.21.4 libxklavier >= 4.0") 2>&5 
    19954 +    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libgnomekbd >= 2.21.4 libxklavier >= 5.0\""; } >&5 
    19955 +  ($PKG_CONFIG --exists --print-errors "libgnomekbd >= 2.21.4 libxklavier >= 5.0") 2>&5 
     19954+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libgnomekbd >= 2.21.4 libxklavier >= 4.0\""; } >&5 
     19955+  ($PKG_CONFIG --exists --print-errors "libgnomekbd >= 2.21.4 libxklavier >= 4.0") 2>&5 
    1995619956   ac_status=$? 
    1995719957   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 
    1995819958   test $ac_status = 0; }; then 
    1995919959-  pkg_cv_LIBGNOMEKBD_CFLAGS=`$PKG_CONFIG --cflags "libgnomekbd >= 2.21.4 libxklavier >= 4.0" 2>/dev/null` 
    19960 +  pkg_cv_LIBGNOMEKBD_CFLAGS=`$PKG_CONFIG --cflags "libgnomekbd >= 2.21.4 libxklavier >= 5.0" 2>/dev/null` 
     19960+  pkg_cv_LIBGNOMEKBD_CFLAGS=`$PKG_CONFIG --cflags "libgnomekbd >= 2.21.4 libxklavier >= 4.0" 2>/dev/null` 
    1996119961 else 
    1996219962   pkg_failed=yes 
    … …  
    1996819968-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libgnomekbd >= 2.21.4 libxklavier >= 4.0\""; } >&5 
    1996919969-  ($PKG_CONFIG --exists --print-errors "libgnomekbd >= 2.21.4 libxklavier >= 4.0") 2>&5 
    19970 +    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libgnomekbd >= 2.21.4 libxklavier >= 5.0\""; } >&5 
    19971 +  ($PKG_CONFIG --exists --print-errors "libgnomekbd >= 2.21.4 libxklavier >= 5.0") 2>&5 
     19970+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libgnomekbd >= 2.21.4 libxklavier >= 4.0\""; } >&5 
     19971+  ($PKG_CONFIG --exists --print-errors "libgnomekbd >= 2.21.4 libxklavier >= 4.0") 2>&5 
    1997219972   ac_status=$? 
    1997319973   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 
    1997419974   test $ac_status = 0; }; then 
    1997519975-  pkg_cv_LIBGNOMEKBD_LIBS=`$PKG_CONFIG --libs "libgnomekbd >= 2.21.4 libxklavier >= 4.0" 2>/dev/null` 
    19976 +  pkg_cv_LIBGNOMEKBD_LIBS=`$PKG_CONFIG --libs "libgnomekbd >= 2.21.4 libxklavier >= 5.0" 2>/dev/null` 
     19976+  pkg_cv_LIBGNOMEKBD_LIBS=`$PKG_CONFIG --libs "libgnomekbd >= 2.21.4 libxklavier >= 4.0" 2>/dev/null` 
    1997719977 else 
    1997819978   pkg_failed=yes 
    … …  
    1998319983         if test $_pkg_short_errors_supported = yes; then 
    1998419984-               LIBGNOMEKBD_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libgnomekbd >= 2.21.4 libxklavier >= 4.0"` 
    19985 +               LIBGNOMEKBD_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libgnomekbd >= 2.21.4 libxklavier >= 5.0"` 
     19985+               LIBGNOMEKBD_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libgnomekbd >= 2.21.4 libxklavier >= 4.0"` 
    1998619986         else 
    1998719987-               LIBGNOMEKBD_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libgnomekbd >= 2.21.4 libxklavier >= 4.0"` 
    19988 +               LIBGNOMEKBD_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libgnomekbd >= 2.21.4 libxklavier >= 5.0"` 
     19988+               LIBGNOMEKBD_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libgnomekbd >= 2.21.4 libxklavier >= 4.0"` 
    1998919989         fi 
    1999019990        # Put the nasty error message in config.log where it belongs 
    … …  
    1999219992  
    1999319993-       as_fn_error "Package requirements (libgnomekbd >= 2.21.4 libxklavier >= 4.0) were not met: 
    19994 +       as_fn_error "Package requirements (libgnomekbd >= 2.21.4 libxklavier >= 5.0) were not met: 
     19994+       as_fn_error "Package requirements (libgnomekbd >= 2.21.4 libxklavier >= 4.0) were not met: 
    1999519995  
    1999619996 $LIBGNOMEKBD_PKG_ERRORS 

  • pkg/frankie/main/gnome-settings-daemon/trunk/debian/patches/series

    r6562 r6569  
    6620_gstreamer.patch 
    7730_pkgconfig-path.patch 
    8 40_xklavier_5.0.patch 
    9870_relibtoolize.patch 
    10999_ltmain_as-needed.patch 
Note: See TracChangeset for help on using the changeset viewer.