r28765 - in /packages/unstable/clutter-1.0/debian: changelog compat control control.in gir1.2-clutter-1.0.install libclutter-1.0-0.install libclutter-1.0-dev.install rules watch

bigon at users.alioth.debian.org bigon at users.alioth.debian.org
Thu Jul 7 11:41:16 UTC 2011


Author: bigon
Date: Thu Jul  7 11:41:16 2011
New Revision: 28765

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=28765
Log:
* New upstream release
* debian/control.in:
  - Drop gir packages as build-dependencies, they are now pulled by -dev
    packages
  - Bump cdbs and debhelper build-dependencies for multiarch policy
  - Add required multiarch fields
  - Drop duplicates Sections to please lintian
  - Use Breaks instead of Conflicts when versionized
* debian/rules:
  - Rely on cdbs to call dh_girepository
  - Pass --libdir to configure for multiarch
  - Fix GNOME_DOWNLOAD_URL URL
* debian/gir1.2-clutter-1.0.install, debian/libclutter-1.0-0.install,
  debian/libclutter-1.0-dev.install: Adjust for multiarch paths
* debian/watch:
  - Fix URL
  - Switch to .bz2 tarballs.
  - Bump version to 3

Modified:
    packages/unstable/clutter-1.0/debian/changelog
    packages/unstable/clutter-1.0/debian/compat
    packages/unstable/clutter-1.0/debian/control
    packages/unstable/clutter-1.0/debian/control.in
    packages/unstable/clutter-1.0/debian/gir1.2-clutter-1.0.install
    packages/unstable/clutter-1.0/debian/libclutter-1.0-0.install
    packages/unstable/clutter-1.0/debian/libclutter-1.0-dev.install
    packages/unstable/clutter-1.0/debian/rules
    packages/unstable/clutter-1.0/debian/watch

Modified: packages/unstable/clutter-1.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/clutter-1.0/debian/changelog?rev=28765&op=diff
==============================================================================
--- packages/unstable/clutter-1.0/debian/changelog [utf-8] (original)
+++ packages/unstable/clutter-1.0/debian/changelog [utf-8] Thu Jul  7 11:41:16 2011
@@ -1,3 +1,26 @@
+clutter-1.0 (1.6.16-1) UNRELEASED; urgency=low
+
+  * New upstream release
+  * debian/control.in:
+    - Drop gir packages as build-dependencies, they are now pulled by -dev
+      packages
+    - Bump cdbs and debhelper build-dependencies for multiarch policy
+    - Add required multiarch fields
+    - Drop duplicates Sections to please lintian
+    - Use Breaks instead of Conflicts when versionized
+  * debian/rules:
+    - Rely on cdbs to call dh_girepository
+    - Pass --libdir to configure for multiarch
+    - Fix GNOME_DOWNLOAD_URL URL
+  * debian/gir1.2-clutter-1.0.install, debian/libclutter-1.0-0.install,
+    debian/libclutter-1.0-dev.install: Adjust for multiarch paths
+  * debian/watch:
+    - Fix URL
+    - Switch to .bz2 tarballs.
+    - Bump version to 3
+
+ -- Laurent Bigonville <bigon at debian.org>  Thu, 07 Jul 2011 12:03:07 +0200
+
 clutter-1.0 (1.6.14-1) unstable; urgency=low
 
   [ Josselin Mouette ]

Modified: packages/unstable/clutter-1.0/debian/compat
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/clutter-1.0/debian/compat?rev=28765&op=diff
==============================================================================
--- packages/unstable/clutter-1.0/debian/compat [utf-8] (original)
+++ packages/unstable/clutter-1.0/debian/compat [utf-8] Thu Jul  7 11:41:16 2011
@@ -1,1 +1,1 @@
-5
+8

Modified: packages/unstable/clutter-1.0/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/clutter-1.0/debian/control?rev=28765&op=diff
==============================================================================
--- packages/unstable/clutter-1.0/debian/control [utf-8] (original)
+++ packages/unstable/clutter-1.0/debian/control [utf-8] Thu Jul  7 11:41:16 2011
@@ -7,9 +7,9 @@
 Section: libs
 Priority: optional
 Maintainer: Ross Burton <ross at debian.org>
-Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Emilio Pozuelo Monfort <pochu at debian.org>, Sjoerd Simons <sjoerd at debian.org>
-Build-Depends: debhelper (>= 5),
-               cdbs (>= 0.4.41),
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Emilio Pozuelo Monfort <pochu at debian.org>, Laurent Bigonville <bigon at debian.org>, Sjoerd Simons <sjoerd at debian.org>
+Build-Depends: debhelper (>= 8.1.3~),
+               cdbs (>= 0.4.93~),
                dh-autoreconf,
                autopoint,
                gnome-pkg-tools,
@@ -28,33 +28,32 @@
                gtk-doc-tools (>= 1.13),
                libgirepository1.0-dev (>= 0.9.12),
                gobject-introspection (>= 0.9.12-4~),
-               gir1.2-glib-2.0,
-               libatk1.0-dev (>= 1.32-3),
-               libgdk-pixbuf2.0-dev (>= 2.0),
-               gir1.2-pango-1.0,
-               gir1.2-atk-1.0 (>= 1.32.0),
-               gir1.2-json-glib-1.0 (>= 0.12.0)
-Standards-Version: 3.9.1
+               libatk1.0-dev (>= 1.32.0-3~),
+               libgdk-pixbuf2.0-dev (>= 2.0)
+Standards-Version: 3.9.2
 Homepage: http://www.clutter-project.org/
+Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/packages/unstable/clutter-1.0
+Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/packages/unstable/clutter-1.0/
 
 Package: libclutter-1.0-0
-Section: libs
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
 Recommends: libclutter-1.0-common
 Breaks: python-clutter (<< 1.3.2)
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
 Description: Open GL based interactive canvas library
  Clutter is an Open GL based interactive canvas library, designed for creating
  fast, mainly 2D single window applications such as media box UIs,
  presentations, kiosk style applications and so on.
 
 Package: libclutter-1.0-common
-Section: libs
 Architecture: all
 Depends: ${shlibs:Depends},
          ${misc:Depends}
-Description: Open GL based interactive canvas library
+Multi-Arch: foreign
+Description: Open GL based interactive canvas library (common files)
  Clutter is an Open GL based interactive canvas library, designed for creating
  fast, mainly 2D single window applications such as media box UIs,
  presentations, kiosk style applications and so on.
@@ -96,6 +95,7 @@
 Architecture: any
 Depends: libclutter-1.0-0 (= ${binary:Version}),
          ${misc:Depends}
+Multi-Arch: same
 Description: Open GL based interactive canvas library (debug files)
  Clutter is an Open GL based interactive canvas library, designed for creating
  fast, mainly 2D single window applications such as media box UIs,
@@ -118,13 +118,12 @@
  This package contains the documentation.
 
 Package: gir1.2-clutter-1.0
-Section: libs
 Architecture: any
 Depends: ${gir:Depends},
          ${shlibs:Depends},
          ${misc:Depends}
-Conflicts: libclutter-1.0-0 (<< 1.0.8),
-           gir1.0-clutter-1.0
+Breaks: libclutter-1.0-0 (<< 1.0.8),
+Conflicts: gir1.0-clutter-1.0
 Replaces: libclutter-1.0-0 (<< 1.0.8),
           gir1.0-clutter-1.0
 Description: GObject introspection data for the Clutter 1.0 library

Modified: packages/unstable/clutter-1.0/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/clutter-1.0/debian/control.in?rev=28765&op=diff
==============================================================================
--- packages/unstable/clutter-1.0/debian/control.in [utf-8] (original)
+++ packages/unstable/clutter-1.0/debian/control.in [utf-8] Thu Jul  7 11:41:16 2011
@@ -3,8 +3,8 @@
 Priority: optional
 Maintainer: Ross Burton <ross at debian.org>
 Uploaders: @GNOME_TEAM@
-Build-Depends: debhelper (>= 5),
-               cdbs (>= 0.4.41),
+Build-Depends: debhelper (>= 8.1.3~),
+               cdbs (>= 0.4.93~),
                dh-autoreconf,
                autopoint,
                gnome-pkg-tools,
@@ -23,33 +23,32 @@
                gtk-doc-tools (>= 1.13),
                libgirepository1.0-dev (>= 0.9.12),
                gobject-introspection (>= 0.9.12-4~),
-               gir1.2-glib-2.0,
-               libatk1.0-dev (>= 1.32-3),
-               libgdk-pixbuf2.0-dev (>= 2.0),
-               gir1.2-pango-1.0,
-               gir1.2-atk-1.0 (>= 1.32.0),
-               gir1.2-json-glib-1.0 (>= 0.12.0)
-Standards-Version: 3.9.1
+               libatk1.0-dev (>= 1.32.0-3~),
+               libgdk-pixbuf2.0-dev (>= 2.0)
+Standards-Version: 3.9.2
 Homepage: http://www.clutter-project.org/
+Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/packages/unstable/clutter-1.0
+Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/packages/unstable/clutter-1.0/
 
 Package: libclutter-1.0-0
-Section: libs
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
 Recommends: libclutter-1.0-common
 Breaks: python-clutter (<< 1.3.2)
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
 Description: Open GL based interactive canvas library
  Clutter is an Open GL based interactive canvas library, designed for creating
  fast, mainly 2D single window applications such as media box UIs,
  presentations, kiosk style applications and so on.
 
 Package: libclutter-1.0-common
-Section: libs
 Architecture: all
 Depends: ${shlibs:Depends},
          ${misc:Depends}
-Description: Open GL based interactive canvas library
+Multi-Arch: foreign
+Description: Open GL based interactive canvas library (common files)
  Clutter is an Open GL based interactive canvas library, designed for creating
  fast, mainly 2D single window applications such as media box UIs,
  presentations, kiosk style applications and so on.
@@ -91,6 +90,7 @@
 Architecture: any
 Depends: libclutter-1.0-0 (= ${binary:Version}),
          ${misc:Depends}
+Multi-Arch: same
 Description: Open GL based interactive canvas library (debug files)
  Clutter is an Open GL based interactive canvas library, designed for creating
  fast, mainly 2D single window applications such as media box UIs,
@@ -113,13 +113,12 @@
  This package contains the documentation.
 
 Package: gir1.2-clutter-1.0
-Section: libs
 Architecture: any
 Depends: ${gir:Depends},
          ${shlibs:Depends},
          ${misc:Depends}
-Conflicts: libclutter-1.0-0 (<< 1.0.8),
-           gir1.0-clutter-1.0
+Breaks: libclutter-1.0-0 (<< 1.0.8),
+Conflicts: gir1.0-clutter-1.0
 Replaces: libclutter-1.0-0 (<< 1.0.8),
           gir1.0-clutter-1.0
 Description: GObject introspection data for the Clutter 1.0 library

Modified: packages/unstable/clutter-1.0/debian/gir1.2-clutter-1.0.install
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/clutter-1.0/debian/gir1.2-clutter-1.0.install?rev=28765&op=diff
==============================================================================
--- packages/unstable/clutter-1.0/debian/gir1.2-clutter-1.0.install [utf-8] (original)
+++ packages/unstable/clutter-1.0/debian/gir1.2-clutter-1.0.install [utf-8] Thu Jul  7 11:41:16 2011
@@ -1,1 +1,1 @@
-debian/tmp/usr/lib/girepository-1.0/
+debian/tmp/usr/lib/*/girepository-1.0/ usr/lib/

Modified: packages/unstable/clutter-1.0/debian/libclutter-1.0-0.install
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/clutter-1.0/debian/libclutter-1.0-0.install?rev=28765&op=diff
==============================================================================
--- packages/unstable/clutter-1.0/debian/libclutter-1.0-0.install [utf-8] (original)
+++ packages/unstable/clutter-1.0/debian/libclutter-1.0-0.install [utf-8] Thu Jul  7 11:41:16 2011
@@ -1,1 +1,1 @@
-debian/tmp/usr/lib/*.so.*
+debian/tmp/usr/lib/*/*.so.*

Modified: packages/unstable/clutter-1.0/debian/libclutter-1.0-dev.install
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/clutter-1.0/debian/libclutter-1.0-dev.install?rev=28765&op=diff
==============================================================================
--- packages/unstable/clutter-1.0/debian/libclutter-1.0-dev.install [utf-8] (original)
+++ packages/unstable/clutter-1.0/debian/libclutter-1.0-dev.install [utf-8] Thu Jul  7 11:41:16 2011
@@ -1,4 +1,4 @@
-debian/tmp/usr/lib/*.so
-debian/tmp/usr/lib/pkgconfig/
+debian/tmp/usr/lib/*/*.so
+debian/tmp/usr/lib/*/pkgconfig/
 debian/tmp/usr/include/
 debian/tmp/usr/share/gir-1.0/

Modified: packages/unstable/clutter-1.0/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/clutter-1.0/debian/rules?rev=28765&op=diff
==============================================================================
--- packages/unstable/clutter-1.0/debian/rules [utf-8] (original)
+++ packages/unstable/clutter-1.0/debian/rules [utf-8] Thu Jul  7 11:41:16 2011
@@ -8,16 +8,14 @@
 include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
 
 GNOME_MODULE = clutter
-GNOME_DOWNLOAD_URL = http://www.clutter-project.org/sources/clutter/$(DEB_UPSTREAM_VERSION_MAJOR_MINOR)/$(GNOME_TARBALL)
+GNOME_DOWNLOAD_URL = http://source.clutter-project.org/sources/clutter/$(DEB_UPSTREAM_VERSION_MAJOR_MINOR)/$(GNOME_TARBALL)
 
 LDFLAGS += -Wl,-O1 -Wl,--as-needed
 DEB_COMPRESS_EXCLUDE += .c
 DEB_DH_MAKESHLIBS_ARGS_libclutter-1.0-0 += -V -- -c4
 DEB_CONFIGURE_EXTRA_FLAGS += \
+        --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \
 	--enable-gtk-doc \
 	--enable-introspection=yes
 
-$(patsubst %,binary-predeb/%,$(DEB_ALL_PACKAGES)) ::
-	dh_girepository -p$(cdbs_curpkg)
-
 common-binary-predeb-arch:: list-missing

Modified: packages/unstable/clutter-1.0/debian/watch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/clutter-1.0/debian/watch?rev=28765&op=diff
==============================================================================
--- packages/unstable/clutter-1.0/debian/watch [utf-8] (original)
+++ packages/unstable/clutter-1.0/debian/watch [utf-8] Thu Jul  7 11:41:16 2011
@@ -1,2 +1,2 @@
-version=2
-http://sources.clutter-project.org/sources/clutter/([\d.]+[02468])/clutter-(.*)\.tar\.gz
+version=3
+http://source.clutter-project.org/sources/clutter/([\d.]+[02468])/clutter-(.*)\.tar\.bz2




More information about the pkg-gnome-commits mailing list