r26286 - in /packages/experimental/gjs/debian: changelog compat control control.in copyright rules watch

bigon at users.alioth.debian.org bigon at users.alioth.debian.org
Thu Jan 13 20:42:51 UTC 2011


Author: bigon
Date: Thu Jan 13 20:42:49 2011
New Revision: 26286

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=26286
Log:
* debian/control.in:
  - Put the package under the GNOME team maintenance and use magic to
    populate Uploaders
  - Bump Standards-Version to 3.9.1 (no further changes)
  - Add Vcs-{Svn,Browser} fields
  - Add cdbs and gnome-pkg-tools and Build-dep
  - Bump xulrunner-dev Build-dependency to 1.9.2 (Closes: #609895)
  - Drop autoconf, automake1.11 and libtool, no needed for now
  - Remove ${gir:Depends} substitution from libgjs0b package (Closes: #592694)
  - Bump libgjs-deb package dependency against libmozjs-dev
* debian/rules:
  - Use cdbs instead of dh7
  - Do not run autoreconf
  - Drop explicit shlibs version, we have .symbols file anyway
  - Excludes libraries installed in /usr/lib/gjs-1.0/ from .symbols file
  - Remove bashism (Closes: #581455)
* Bump debhelper compatibility to 8
* debian/control: Copy BSD licence instead of linking to it to please
  lintian

Added:
    packages/experimental/gjs/debian/control.in
      - copied, changed from r26282, packages/experimental/gjs/debian/control
Modified:
    packages/experimental/gjs/debian/changelog
    packages/experimental/gjs/debian/compat
    packages/experimental/gjs/debian/control
    packages/experimental/gjs/debian/copyright
    packages/experimental/gjs/debian/rules
    packages/experimental/gjs/debian/watch

Modified: packages/experimental/gjs/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/gjs/debian/changelog?rev=26286&op=diff
==============================================================================
--- packages/experimental/gjs/debian/changelog [utf-8] (original)
+++ packages/experimental/gjs/debian/changelog [utf-8] Thu Jan 13 20:42:49 2011
@@ -1,3 +1,27 @@
+gjs (0.7.8-2) UNRELEASED; urgency=low
+
+  * debian/control.in:
+    - Put the package under the GNOME team maintenance and use magic to
+      populate Uploaders
+    - Bump Standards-Version to 3.9.1 (no further changes)
+    - Add Vcs-{Svn,Browser} fields
+    - Add cdbs and gnome-pkg-tools and Build-dep
+    - Bump xulrunner-dev Build-dependency to 1.9.2 (Closes: #609895)
+    - Drop autoconf, automake1.11 and libtool, no needed for now
+    - Remove ${gir:Depends} substitution from libgjs0b package (Closes: #592694)
+    - Bump libgjs-deb package dependency against libmozjs-dev
+  * debian/rules:
+    - Use cdbs instead of dh7
+    - Do not run autoreconf
+    - Drop explicit shlibs version, we have .symbols file anyway
+    - Excludes libraries installed in /usr/lib/gjs-1.0/ from .symbols file
+    - Remove bashism (Closes: #581455)
+  * Bump debhelper compatibility to 8
+  * debian/control: Copy BSD licence instead of linking to it to please
+    lintian
+
+ -- Laurent Bigonville <bigon at debian.org>  Thu, 13 Jan 2011 21:09:46 +0100
+
 gjs (0.7.8-1) experimental; urgency=low
 
   * New release.

Modified: packages/experimental/gjs/debian/compat
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/gjs/debian/compat?rev=26286&op=diff
==============================================================================
--- packages/experimental/gjs/debian/compat [utf-8] (original)
+++ packages/experimental/gjs/debian/compat [utf-8] Thu Jan 13 20:42:49 2011
@@ -1,1 +1,1 @@
-7
+8

Modified: packages/experimental/gjs/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/gjs/debian/control?rev=26286&op=diff
==============================================================================
--- packages/experimental/gjs/debian/control [utf-8] (original)
+++ packages/experimental/gjs/debian/control [utf-8] Thu Jan 13 20:42:49 2011
@@ -1,13 +1,17 @@
+# This file is autogenerated. DO NOT EDIT!
+# 
+# Modifications should be made to debian/control.in instead.
+# This file is regenerated automatically in the clean target.
+
 Source: gjs
 Section: interpreters
 Priority: extra
-Maintainer: Gustavo Noronha Silva <gustavo.noronha at collabora.co.uk>
-Uploaders: Gustavo Noronha Silva <kov at debian.org>
-Build-Depends: debhelper (>= 7.3.0),
+Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
+Uploaders: Gustavo Noronha Silva <kov at debian.org>, Laurent Bigonville <bigon at debian.org>
+Build-Depends: debhelper (>= 8),
+               cdbs,
+               gnome-pkg-tools,
                autotools-dev,
-               autoconf,
-               automake1.11,
-               libtool,
                chrpath,
                pkg-config,
                libdbus-glib-1-dev,
@@ -17,11 +21,13 @@
                gobject-introspection (>= 0.10.1),
                gir1.2-glib-2.0,
                gir1.2-freedesktop,
-               xulrunner-dev,
+               xulrunner-dev (>= 1.9.2),
                dbus-x11,
                uuid-runtime,
                libcairo2-dev
-Standards-Version: 3.8.4
+Standards-Version: 3.9.1
+Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/packages/experimental/gjs
+Vcs-Browser: http://svn.debian.org/viewsvn/pkg-gnome/packages/experimental/gjs
 Homepage: http://live.gnome.org/Gjs
 
 Package: gjs
@@ -37,7 +43,7 @@
 Package: libgjs0b
 Architecture: any
 Section: libs
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${gir:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Conflicts: libgjs0, libgjs0a
 Replaces: libgjs0, libgjs0a
 Description: Mozilla-based javascript bindings for the GNOME platform
@@ -52,7 +58,7 @@
 Section: libdevel
 Depends: libgjs0b (= ${binary:Version}),
          ${misc:Depends},
-         libmozjs-dev (>= 1.9),
+         libmozjs-dev (>= 1.9.2),
          libgirepository1.0-dev
 Description: Mozilla-based javascript bindings for the GNOME platform
  Makes it possible for applications to use all of GNOME's platform

Copied: packages/experimental/gjs/debian/control.in (from r26282, packages/experimental/gjs/debian/control)
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/gjs/debian/control.in?rev=26286&op=diff
==============================================================================
--- packages/experimental/gjs/debian/control [utf-8] (original)
+++ packages/experimental/gjs/debian/control.in [utf-8] Thu Jan 13 20:42:49 2011
@@ -1,13 +1,12 @@
 Source: gjs
 Section: interpreters
 Priority: extra
-Maintainer: Gustavo Noronha Silva <gustavo.noronha at collabora.co.uk>
-Uploaders: Gustavo Noronha Silva <kov at debian.org>
-Build-Depends: debhelper (>= 7.3.0),
+Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
+Uploaders: @GNOME_TEAM@
+Build-Depends: debhelper (>= 8),
+               cdbs,
+               gnome-pkg-tools,
                autotools-dev,
-               autoconf,
-               automake1.11,
-               libtool,
                chrpath,
                pkg-config,
                libdbus-glib-1-dev,
@@ -17,11 +16,13 @@
                gobject-introspection (>= 0.10.1),
                gir1.2-glib-2.0,
                gir1.2-freedesktop,
-               xulrunner-dev,
+               xulrunner-dev (>= 1.9.2),
                dbus-x11,
                uuid-runtime,
                libcairo2-dev
-Standards-Version: 3.8.4
+Standards-Version: 3.9.1
+Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/packages/experimental/gjs
+Vcs-Browser: http://svn.debian.org/viewsvn/pkg-gnome/packages/experimental/gjs
 Homepage: http://live.gnome.org/Gjs
 
 Package: gjs
@@ -37,7 +38,7 @@
 Package: libgjs0b
 Architecture: any
 Section: libs
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${gir:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Conflicts: libgjs0, libgjs0a
 Replaces: libgjs0, libgjs0a
 Description: Mozilla-based javascript bindings for the GNOME platform
@@ -52,7 +53,7 @@
 Section: libdevel
 Depends: libgjs0b (= ${binary:Version}),
          ${misc:Depends},
-         libmozjs-dev (>= 1.9),
+         libmozjs-dev (>= 1.9.2),
          libgirepository1.0-dev
 Description: Mozilla-based javascript bindings for the GNOME platform
  Makes it possible for applications to use all of GNOME's platform

Modified: packages/experimental/gjs/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/gjs/debian/copyright?rev=26286&op=diff
==============================================================================
--- packages/experimental/gjs/debian/copyright [utf-8] (original)
+++ packages/experimental/gjs/debian/copyright [utf-8] Thu Jan 13 20:42:49 2011
@@ -108,6 +108,25 @@
 
     Copyright © 2001 Robert Penner
     License: BSD
-
-The BSD license can be obtained, on Debian systems, at
-/usr/share/common-licenses/BSD.
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+ .
+ * Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+ * Neither the name of the author nor the names of contributors may be used to
+   endorse or promote products derived from this software without specific prior
+   written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
+ FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

Modified: packages/experimental/gjs/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/gjs/debian/rules?rev=26286&op=diff
==============================================================================
--- packages/experimental/gjs/debian/rules [utf-8] (original)
+++ packages/experimental/gjs/debian/rules [utf-8] Thu Jan 13 20:42:49 2011
@@ -1,49 +1,16 @@
 #!/usr/bin/make -f
 
-%:
-	dh  $@
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/autotools.mk
+include /usr/share/cdbs/1/rules/utils.mk
+include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
+include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
 
-# Hack to make it possible to run autoreconf without making the diff
-# big, and without requiring a patch that needs to be updated for
-# every release
-override_dh_auto_configure:
-	mkdir _build
-	cp -a * _build || true
-	cd _build && autoreconf -fi
-	dh_auto_configure --sourcedirectory=_build
+DEB_DH_MAKESHLIBS_ARGS_libgjs0b := -Xusr/lib/gjs-1.0/
 
-override_dh_auto_build:
-	dh_auto_build --sourcedirectory=_build
+ifeq ($(DEB_BUILD_ARCH_OS),linux)
+DEB_MAKE_CHECK_TARGET := check
+endif
 
-override_dh_auto_install:
-	dh_auto_install --sourcedirectory=_build
+install/libgjs0b::
 	chrpath -d "$(CURDIR)"/debian/tmp/usr/lib/libgjs.so.0.0.0
-
-	# install a lintian override for the mozilla rpath
-	install -d -m 775 debian/gjs/usr/share/lintian/overrides
-	install -m 644 debian/gjs.lintian-overrides debian/gjs/usr/share/lintian/overrides/gjs
-
-override_dh_makeshlibs:
-	dh_makeshlibs -plibgjs0b -V 'libgjs0b (>= 0.7.1)'
-
-override_dh_clean:
-	rm -rf _build
-	dh_clean
-
-override_dh_auto_test:
-	# Our gir-repository packages don't build Everything.typelib, so the
-	# Everything tests will fail.  Just remove them.
-	-rm _build/test/js/testEverythingBasic.js
-	-rm _build/test/js/testEverythingEncapsulated.js
-
-	# Temporarily disable running new tests that are failing. Some
-	# tests apparently depend on test API only available in later,
-	# incompatible versions of gobject-introspection.
-	-rm _build/test/js/testByteArray.js
-	-rm _build/test/js/testGI.js
-	-rm _build/test/js/testGIMarshalling.js
-
-	# Only run tests on linux. Other platforms break trying to run dbus.
-	if [ "$$(dpkg-architecture -qDEB_BUILD_ARCH_OS)" == "linux" ]; then \
-		dh_auto_test --sourcedirectory=_build; \
-	fi

Modified: packages/experimental/gjs/debian/watch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/gjs/debian/watch?rev=26286&op=diff
==============================================================================
--- packages/experimental/gjs/debian/watch [utf-8] (original)
+++ packages/experimental/gjs/debian/watch [utf-8] Thu Jan 13 20:42:49 2011
@@ -1,2 +1,2 @@
 version=3
-http://ftp.gnome.org/pub/GNOME/sources/gjs/([\d\.]+)\d/ mutter-(.*)\.tar\.gz debian uupdate
+http://ftp.gnome.org/pub/GNOME/sources/gjs/([\d\.]+)/gjs-(.*)\.tar\.gz debian uupdate




More information about the pkg-gnome-commits mailing list