r39836 - in /desktop/experimental/gjs/debian: changelog compat control control.in libgjs0c.install libgjs0c.symbols libgjs0d.install rules

sjoerd at users.alioth.debian.org sjoerd at users.alioth.debian.org
Sun Oct 13 21:19:35 UTC 2013


Author: sjoerd
Date: Sun Oct 13 21:19:35 2013
New Revision: 39836

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=39836
Log:
* Sync from Ubuntu (1.37.6-0ubuntu1)
  + Bump library package name to libgjs0d
* Bump build-dependency on gobject-introspect and libgirepository to 1.38

Added:
    desktop/experimental/gjs/debian/libgjs0d.install
Removed:
    desktop/experimental/gjs/debian/libgjs0c.install
    desktop/experimental/gjs/debian/libgjs0c.symbols
Modified:
    desktop/experimental/gjs/debian/changelog
    desktop/experimental/gjs/debian/compat
    desktop/experimental/gjs/debian/control
    desktop/experimental/gjs/debian/control.in
    desktop/experimental/gjs/debian/rules

Modified: desktop/experimental/gjs/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gjs/debian/changelog?rev=39836&op=diff
==============================================================================
--- desktop/experimental/gjs/debian/changelog	[utf-8] (original)
+++ desktop/experimental/gjs/debian/changelog	[utf-8] Sun Oct 13 21:19:35 2013
@@ -1,12 +1,14 @@
 gjs (1.38.1-1) UNRELEASED; urgency=low
 
-  * New upstream release
-    - Bump version of gobject B-dep
-    - Add B-dep on libmozjs-17.0-dev
+  [ Jackson Doak ]
   * Bump debhelper to 9
-  * Generate symbols
-
- -- Jackson Doak <noskcaj at ubuntu.com>  Sun, 13 Oct 2013 19:14:58 +1100
+
+  [ Sjoerd Simons ]
+  * Sync from Ubuntu (1.37.6-0ubuntu1)
+    + Bump library package name to libgjs0d
+  * Bump build-dependency on gobject-introspect and libgirepository to 1.38
+
+ -- Sjoerd Simons <sjoerd at debian.org>  Sun, 13 Oct 2013 23:18:22 +0200
 
 gjs (1.36.1-2) unstable; urgency=low
 

Modified: desktop/experimental/gjs/debian/compat
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gjs/debian/compat?rev=39836&op=diff
==============================================================================
--- desktop/experimental/gjs/debian/compat	[utf-8] (original)
+++ desktop/experimental/gjs/debian/compat	[utf-8] Sun Oct 13 21:19:35 2013
@@ -1 +1 @@
-9
+9

Modified: desktop/experimental/gjs/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gjs/debian/control?rev=39836&op=diff
==============================================================================
--- desktop/experimental/gjs/debian/control	[utf-8] (original)
+++ desktop/experimental/gjs/debian/control	[utf-8] Sun Oct 13 21:19:35 2013
@@ -2,6 +2,7 @@
 # 
 # Modifications should be made to debian/control.in instead.
 # This file is regenerated automatically in the clean target.
+
 Source: gjs
 Section: interpreters
 Priority: optional
@@ -14,16 +15,14 @@
                autotools-dev,
                dh-autoreconf,
                pkg-config,
-               libdbus-glib-1-dev,
                libglib2.0-dev (>= 2.36.0),
-               libgirepository1.0-dev (>= 1.38.0),
-               gobject-introspection (>= 1.38.0),
-               libmozjs185-dev,
+               libgirepository1.0-dev (>= 1.36.0),
+               gobject-introspection (>= 1.36.0),
+               libmozjs-17.0-dev,
                libreadline-dev,
                dbus-x11,
                uuid-runtime,
-               libcairo2-dev,
-               libmozjs-17.0-dev
+               libcairo2-dev
 Standards-Version: 3.9.4
 Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/gjs
 Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/gjs
@@ -40,13 +39,13 @@
  .
  This package contains the interactive console application.
 
-Package: libgjs0c
+Package: libgjs0d
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends},
          ${misc:Depends}
-Breaks: libgjs0, libgjs0a, libgjs0b
-Replaces: libgjs0, libgjs0a, libgjs0b
+Conflicts: libgjs0, libgjs0a, libgjs0b, libgjs0c
+Replaces: libgjs0, libgjs0a, libgjs0b, libgjs0c
 Provides: ${gjs:Provides}
 Description: Mozilla-based javascript bindings for the GNOME platform
  Makes it possible for applications to use all of GNOME's platform
@@ -59,10 +58,9 @@
 Architecture: any
 Section: libdevel
 Depends: ${misc:Depends},
-         libgjs0c (= ${binary:Version}),
+         libgjs0d (= ${binary:Version}),
          libgirepository1.0-dev (>= 1.36.0),
-         libmozjs185-dev,
-         libdbus-1-dev
+         libmozjs-17.0-dev
 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

Modified: desktop/experimental/gjs/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gjs/debian/control.in?rev=39836&op=diff
==============================================================================
--- desktop/experimental/gjs/debian/control.in	[utf-8] (original)
+++ desktop/experimental/gjs/debian/control.in	[utf-8] Sun Oct 13 21:19:35 2013
@@ -10,16 +10,14 @@
                autotools-dev,
                dh-autoreconf,
                pkg-config,
-               libdbus-glib-1-dev,
                libglib2.0-dev (>= 2.36.0),
                libgirepository1.0-dev (>= 1.38.0),
                gobject-introspection (>= 1.38.0),
-               libmozjs185-dev,
+               libmozjs-17.0-dev,
                libreadline-dev,
                dbus-x11,
                uuid-runtime,
-               libcairo2-dev,
-               libmozjs-17.0-dev
+               libcairo2-dev
 Standards-Version: 3.9.4
 Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/gjs
 Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/gjs
@@ -36,13 +34,13 @@
  .
  This package contains the interactive console application.
 
-Package: libgjs0c
+Package: libgjs0d
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends},
          ${misc:Depends}
-Breaks: libgjs0, libgjs0a, libgjs0b
-Replaces: libgjs0, libgjs0a, libgjs0b
+Conflicts: libgjs0, libgjs0a, libgjs0b, libgjs0c
+Replaces: libgjs0, libgjs0a, libgjs0b, libgjs0c
 Provides: ${gjs:Provides}
 Description: Mozilla-based javascript bindings for the GNOME platform
  Makes it possible for applications to use all of GNOME's platform
@@ -55,10 +53,9 @@
 Architecture: any
 Section: libdevel
 Depends: ${misc:Depends},
-         libgjs0c (= ${binary:Version}),
+         libgjs0d (= ${binary:Version}),
          libgirepository1.0-dev (>= 1.36.0),
-         libmozjs185-dev,
-         libdbus-1-dev
+         libmozjs-17.0-dev
 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

Added: desktop/experimental/gjs/debian/libgjs0d.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gjs/debian/libgjs0d.install?rev=39836&op=file
==============================================================================
--- desktop/experimental/gjs/debian/libgjs0d.install	(added)
+++ desktop/experimental/gjs/debian/libgjs0d.install	[utf-8] Sun Oct 13 21:19:35 2013
@@ -0,0 +1,3 @@
+usr/lib/libgjs*.so.*
+usr/lib/gjs/girepository-1.0/*.typelib
+usr/share/gjs-1.0

Modified: desktop/experimental/gjs/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gjs/debian/rules?rev=39836&op=diff
==============================================================================
--- desktop/experimental/gjs/debian/rules	[utf-8] (original)
+++ desktop/experimental/gjs/debian/rules	[utf-8] Sun Oct 13 21:19:35 2013
@@ -10,9 +10,9 @@
 # Use recursive variables since this variable must not be expanded until 
 # files have been installed.
 LIBMOZJS = $(shell objdump -p debian/tmp/usr/lib/libgjs.so | awk '$$1=="NEEDED" && $$2~/^libmozjs/ { print $$2 }' | sed s/\\.so\\./-/ )
-#DEB_DH_MAKESHLIBS_ARGS_libgjs0c = -Xusr/lib/gjs-1.0/ -V'libgjs0c (>= $(DEB_UPSTREAM_VERSION)), libgjs0-$(LIBMOZJS)' -- -c4
+DEB_DH_MAKESHLIBS_ARGS_libgjs0d = -Xusr/lib/gjs-1.0/ -V'libgjs0d (>= $(DEB_UPSTREAM_VERSION)), libgjs0-$(LIBMOZJS)' -- -c4
 
 DEB_MAKE_CHECK_TARGET := check || true
 
-install/libgjs0c::
+install/libgjs0d::
 	echo gjs:Provides=libgjs0-$(LIBMOZJS) >> debian/$(cdbs_curpkg).substvars




More information about the pkg-gnome-commits mailing list