Comment 11 for bug 494481

Thanks. Next up is gjs:

This one is slightly interesting, as an Ubuntu developer has attempted to manually commit the current oneiric package into the oneiric branch.

Unfortunately, this has been done without any upstream revision at all, which makes the importer very upset. I don't see any way around this short of manually uncommitting this manual revision:

bzr uncommit bzr+ssh://bazaar.launchpad.net/+branch/ubuntu/oneiric/gjs

and removing the tag pointing to the uncommitted revision:

bzr tag -d bzr+ssh://bazaar.launchpad.net/+branch/ubuntu/oneiric/gjs \
  --delete 0.7.14-1ubuntu1

and then fixing the missing upstream tags which were the underlying issue:

for d in lucid maverick natty oneiric; do
bzr tag -d bzr+ssh://bazaar.launchpad.net/+branch/ubuntu/$d/gjs \
  -r <email address hidden> \
  upstream-0.5
done

and then requeueing the package.

For the record, here the diff between the "old" (manual, incorrect import of 0.7.14-1ubuntu1) and the "new" (result of running the importer locally):

Only in new: .pc
diff -ru old/gi/function.c new/gi/function.c
--- old/gi/function.c 2011-05-18 13:20:10.000000000 +0100
+++ new/gi/function.c 2011-05-18 13:20:20.000000000 +0100
@@ -646,6 +646,23 @@
             gboolean arg_failed;

             g_assert_cmpuint(next_rval, <, function->js_out_argc);
+#if G_BYTE_ORDER == G_BIG_ENDIAN
+ switch (return_tag) {
+ case GI_TYPE_TAG_INT8:
+ return_value.v_int8 = return_value.v_int;
+ break;
+ case GI_TYPE_TAG_UINT8:
+ return_value.v_uint8 = return_value.v_uint;
+ break;
+ case GI_TYPE_TAG_INT16:
+ return_value.v_int16 = return_value.v_int;
+ break;
+ case GI_TYPE_TAG_UINT16:
+ return_value.v_uint16 = return_value.v_uint;
+ default:
+ break;
+ }
+#endif
             arg_failed = !gjs_value_from_g_argument(context, &return_values[next_rval],
                                                     &return_info, (GArgument*)&return_value);
             if (arg_failed)
diff -ru old/gjs-internals-1.0.pc.in new/gjs-internals-1.0.pc.in
--- old/gjs-internals-1.0.pc.in 2011-05-18 13:20:10.000000000 +0100
+++ new/gjs-internals-1.0.pc.in 2011-05-18 13:20:20.000000000 +0100
@@ -11,7 +11,6 @@
 mozjslibdir=@FIREFOX_JS_LIBDIR@

 Cflags: -I${includedir}/gjs-1.0 @JS_EXTRA_CFLAGS@
-Libs: -Wl,--rpath=${mozjslibdir}
 Requires: gjs-1.0 gobject-introspection-1.0 @JS_PACKAGE@

 Name: gjs-internals-1.0