diff -u gjs-0.4/debian/changelog gjs-0.4/debian/changelog --- gjs-0.4/debian/changelog +++ gjs-0.4/debian/changelog @@ -1,10 +1,14 @@ -gjs (0.4-3ubuntu1) lucid; urgency=low +gjs (0.4-3ubuntu2) lucid; urgency=low - * Merge from Debian unstable (needed for gnome-shell). - Remaining Ubuntu changes: - - Replaced libmozjs-dev dependencies with xulrunner-dev. + * Reupload my version which got dropped on floor by launchpad yesterday, + somebody else did a similar upload between but forgot to use correct + replaces and conflicts + * Sync on Debian + * debian/control: + - don't use libmozjs this is not a different binary from xulrunner in ubuntu + - use conflicts,replaces on the old ubuntu naming - -- Maia Kozheva Fri, 04 Dec 2009 11:24:41 +0600 + -- Sebastien Bacher Thu, 03 Dec 2009 22:55:45 +0100 gjs (0.4-3) unstable; urgency=low @@ -30,74 +33,0 @@ - -gjs (0.4-0ubuntu2) karmic; urgency=low - - * Rebuild using the new xulrunner version - - -- Sebastien Bacher Wed, 30 Sep 2009 23:22:43 +0200 - -gjs (0.4-0ubuntu1) karmic; urgency=low - - * New upstream version - - -- Sebastien Bacher Tue, 08 Sep 2009 00:56:53 +0200 - -gjs (0.3-0ubuntu4) karmic; urgency=low - - * debian/control: - - updated xulrunner build-depends - - -- Sebastien Bacher Tue, 11 Aug 2009 19:39:56 +0200 - -gjs (0.3-0ubuntu3) karmic; urgency=low - - * also fix libgirepository1.0-dev dependency of -dev package - - -- Alexander Sack Fri, 31 Jul 2009 15:06:54 +0200 - -gjs (0.3-0ubuntu2) karmic; urgency=low - - * rebuild for gobject-introspection lib rename - * adjust Build-Depends to use libgirepository1.0-dev - - -- Alexander Sack Fri, 31 Jul 2009 14:57:47 +0200 - -gjs (0.3-0ubuntu1) karmic; urgency=low - - * New upstream version - * debian/control: - - updated gir requirement - - -- Sebastien Bacher Fri, 10 Jul 2009 12:02:21 +0200 - -gjs (0.3~git20090702-0ubuntu0.2) karmic; urgency=low - - * debian/control: - - build-depends on libdbus-glib-1-dev - - -- Sebastien Bacher Thu, 02 Jul 2009 15:31:51 +0200 - -gjs (0.3~git20090702-0ubuntu0.1) karmic; urgency=low - - * Updated to a git version since the current tarball is outdated - - -- Sebastien Bacher Thu, 02 Jul 2009 14:18:56 +0200 - -gjs (0.2-0ubuntu0.3) karmic; urgency=low - - * debian/control: gjs-dev depends on gjs too - - -- Sebastien Bacher Thu, 02 Jul 2009 02:10:55 +0200 - -gjs (0.2-0ubuntu0.2) karmic; urgency=low - - * debian/control: - - updated the depends - - -- Sebastien Bacher Tue, 30 Jun 2009 21:19:55 +0200 - -gjs (0.2-0ubuntu0.1) karmic; urgency=low - - * Initial ppa version, the binary split will need to be reviewed before - uploading to karmic - - -- Sebastien Bacher Tue, 30 Jun 2009 18:20:13 +0200 - diff -u gjs-0.4/debian/control gjs-0.4/debian/control --- gjs-0.4/debian/control +++ gjs-0.4/debian/control @@ -1,7 +1,7 @@ Source: gjs Section: interpreters Priority: extra -Maintainer: Ubuntu MOTU Developers +Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Gustavo Noronha Silva Build-Depends: debhelper (>= 7.0.50~), autotools-dev, @@ -29,6 +29,8 @@ Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends}, ${gir:Depends} +Conflicts: gjs (<< 0.4-3) +Replaces: gjs (<< 0.4-3) Description: Mozilla-based javascript bindings for the GNOME platform Makes it possible for applications to use all of GNOME's platform libraries using the Javascript language. It's mainly based on the @@ -41,8 +43,9 @@ Section: libdevel Depends: libgjs0 (= ${binary:Version}), ${misc:Depends}, - xulrunner-dev (>= 1.9), libgirepository1.0-dev +Conflicts: gjs-dev (<< 0.4-3) +Replaces: gjs-dev (<< 0.4-3) Description: Mozilla-based javascript bindings for the GNOME platform Makes it possible for applications to use all of GNOME's platform libraries using the Javascript language. It's mainly based on the