r27010 - in /desktop/experimental/gucharmap/debian: changelog control control.in libgucharmap-2-90-7.install libgucharmap-2-90-dev.install libgucharmap2-dev.install libgucharmap7.install rules

joss at users.alioth.debian.org joss at users.alioth.debian.org
Mon Mar 21 19:16:15 UTC 2011 

Author: joss
Date: Mon Mar 21 19:16:06 2011
New Revision: 27010

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=27010
Log:
* New upstream development release.
* Build gucharmap twice, for gtk2 and gtk3.
* Add build-dependencies accordingly.
* Put the GTK3 versions in new libgucharmap-2-90-* packages.

Added:
    desktop/experimental/gucharmap/debian/libgucharmap-2-90-7.install
      - copied unchanged from r27008, desktop/experimental/gucharmap/debian/libgucharmap7.install
    desktop/experimental/gucharmap/debian/libgucharmap-2-90-dev.install
      - copied, changed from r27008, desktop/experimental/gucharmap/debian/libgucharmap2-dev.install
Modified:
    desktop/experimental/gucharmap/debian/changelog
    desktop/experimental/gucharmap/debian/control
    desktop/experimental/gucharmap/debian/control.in
    desktop/experimental/gucharmap/debian/libgucharmap2-dev.install
    desktop/experimental/gucharmap/debian/libgucharmap7.install
    desktop/experimental/gucharmap/debian/rules

Modified: desktop/experimental/gucharmap/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gucharmap/debian/changelog?rev=27010&op=diff
==============================================================================
--- desktop/experimental/gucharmap/debian/changelog [utf-8] (original)
+++ desktop/experimental/gucharmap/debian/changelog [utf-8] Mon Mar 21 19:16:06 2011
@@ -1,3 +1,12 @@
+gucharmap (1:2.33.2-1) experimental; urgency=low
+
+  * New upstream development release.
+  * Build gucharmap twice, for gtk2 and gtk3.
+  * Add build-dependencies accordingly.
+  * Put the GTK3 versions in new libgucharmap-2-90-* packages.
+
+ -- Josselin Mouette <joss at debian.org>  Mon, 21 Mar 2011 20:15:48 +0100
+
 gucharmap (1:2.30.3-1) unstable; urgency=low
 
   * New upstream bugfix release.

Modified: desktop/experimental/gucharmap/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gucharmap/debian/control?rev=27010&op=diff
==============================================================================
--- desktop/experimental/gucharmap/debian/control [utf-8] (original)
+++ desktop/experimental/gucharmap/debian/control [utf-8] Mon Mar 21 19:16:06 2011
@@ -7,10 +7,11 @@
 Section: x11
 Priority: optional
 Maintainer: Sebastien Bacher <seb128 at debian.org>
-Uploaders: David Weinehall <tao at debian.org>, Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Josselin Mouette <joss at debian.org>, Luca Falavigna <dktrkranz at debian.org>, Sebastian Dröge <slomo at debian.org>
+Uploaders: David Weinehall <tao at debian.org>, Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Josselin Mouette <joss at debian.org>, Luca Falavigna <dktrkranz at debian.org>
 Build-Depends: cdbs (>= 0.2.6),
                debhelper (>= 5),
-               libgtk2.0-dev (>= 2.13.6),
+               libgtk2.0-dev (>= 2.14.0),
+               libgtk-3-dev (>= 2.91.0),
                libglib2.0-dev (>= 2.16.3),
                libgconf2-dev,
                libpopt-dev,
@@ -31,8 +32,7 @@
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
-         libgucharmap7 (= ${binary:Version}),
-         libgtk2.0-bin
+         libgucharmap-2-90-7 (= ${binary:Version})
 Recommends: yelp
 Replaces: gnome-utils
 Description: Unicode character picker and font browser
@@ -46,7 +46,8 @@
 Architecture: any
 Depends: libgucharmap7 (= ${binary:Version}),
          ${misc:Depends},
-         libgtk2.0-dev (>= 2.12.0),
+         libgtk2.0-dev,
+         libglib2.0-dev,
          libgconf2-dev
 Replaces: libgucharmap-dev
 Conflicts: libgucharmap-dev
@@ -55,7 +56,7 @@
  most prominently used by the "gucharmap" program.  See the package of
  the same name for more information.
  .
- This package contains the development headers.
+ This package contains the development headers for the GTK+ 2 version.
 
 Package: libgucharmap7
 Section: libs
@@ -67,4 +68,33 @@
  most prominently used by the "gucharmap" program.  See the package of
  the same name for more information.
  .
- This package contains the shared library.
+ This package contains the shared library for the GTK+ 2 version.
+
+Package: libgucharmap-2-90-dev
+Section: libdevel
+Architecture: any
+Depends: libgucharmap-2-90-7 (= ${binary:Version}),
+         ${misc:Depends},
+         libgtk-3-dev,
+         libglib2.0-dev,
+         libgconf2-dev
+Replaces: libgucharmap-dev
+Conflicts: libgucharmap-dev
+Description: Unicode browser widget library (development headers)
+ The libgucharmap library contains a Unicode browser widget; it is
+ most prominently used by the "gucharmap" program.  See the package of
+ the same name for more information.
+ .
+ This package contains the development headers for the GTK+ 3 version.
+
+Package: libgucharmap-2-90-7
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends},
+         ${misc:Depends}
+Description: Unicode browser widget library (shared library)
+ The libgucharmap library contains a Unicode browser widget; it is
+ most prominently used by the "gucharmap" program.  See the package of
+ the same name for more information.
+ .
+ This package contains the shared library for the GTK+ 3 version.

Modified: desktop/experimental/gucharmap/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gucharmap/debian/control.in?rev=27010&op=diff
==============================================================================
--- desktop/experimental/gucharmap/debian/control.in [utf-8] (original)
+++ desktop/experimental/gucharmap/debian/control.in [utf-8] Mon Mar 21 19:16:06 2011
@@ -5,7 +5,8 @@
 Uploaders: @GNOME_TEAM@
 Build-Depends: cdbs (>= 0.2.6),
                debhelper (>= 5),
-               libgtk2.0-dev (>= 2.13.6),
+               libgtk2.0-dev (>= 2.14.0),
+               libgtk-3-dev (>= 2.91.0),
                libglib2.0-dev (>= 2.16.3),
                libgconf2-dev,
                libpopt-dev,
@@ -26,8 +27,7 @@
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
-         libgucharmap7 (= ${binary:Version}),
-         libgtk2.0-bin
+         libgucharmap-2-90-7 (= ${binary:Version})
 Recommends: yelp
 Replaces: gnome-utils
 Description: Unicode character picker and font browser
@@ -41,7 +41,8 @@
 Architecture: any
 Depends: libgucharmap7 (= ${binary:Version}),
          ${misc:Depends},
-         libgtk2.0-dev (>= 2.12.0),
+         libgtk2.0-dev,
+         libglib2.0-dev,
          libgconf2-dev
 Replaces: libgucharmap-dev
 Conflicts: libgucharmap-dev
@@ -50,7 +51,7 @@
  most prominently used by the "gucharmap" program.  See the package of
  the same name for more information.
  .
- This package contains the development headers.
+ This package contains the development headers for the GTK+ 2 version.
 
 Package: libgucharmap7
 Section: libs
@@ -62,4 +63,33 @@
  most prominently used by the "gucharmap" program.  See the package of
  the same name for more information.
  .
- This package contains the shared library.
+ This package contains the shared library for the GTK+ 2 version.
+
+Package: libgucharmap-2-90-dev
+Section: libdevel
+Architecture: any
+Depends: libgucharmap-2-90-7 (= ${binary:Version}),
+         ${misc:Depends},
+         libgtk-3-dev,
+         libglib2.0-dev,
+         libgconf2-dev
+Replaces: libgucharmap-dev
+Conflicts: libgucharmap-dev
+Description: Unicode browser widget library (development headers)
+ The libgucharmap library contains a Unicode browser widget; it is
+ most prominently used by the "gucharmap" program.  See the package of
+ the same name for more information.
+ .
+ This package contains the development headers for the GTK+ 3 version.
+
+Package: libgucharmap-2-90-7
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends},
+         ${misc:Depends}
+Description: Unicode browser widget library (shared library)
+ The libgucharmap library contains a Unicode browser widget; it is
+ most prominently used by the "gucharmap" program.  See the package of
+ the same name for more information.
+ .
+ This package contains the shared library for the GTK+ 3 version.

Copied: desktop/experimental/gucharmap/debian/libgucharmap-2-90-dev.install (from r27008, desktop/experimental/gucharmap/debian/libgucharmap2-dev.install)
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gucharmap/debian/libgucharmap-2-90-dev.install?rev=27010&op=diff
==============================================================================
--- desktop/experimental/gucharmap/debian/libgucharmap2-dev.install [utf-8] (original)
+++ desktop/experimental/gucharmap/debian/libgucharmap-2-90-dev.install [utf-8] Mon Mar 21 19:16:06 2011
@@ -1,4 +1,4 @@
-debian/tmp/usr/include/gucharmap-2/
-debian/tmp/usr/lib/libgucharmap*.so
-debian/tmp/usr/lib/pkgconfig/
-debian/tmp/usr/share/gtk-doc
+debian/tmp/usr/include			/usr
+debian/tmp/usr/lib/libgucharmap*.so	/usr/lib
+debian/tmp/usr/lib/pkgconfig/		/usr/lib
+debian/tmp/usr/share/gtk-doc		/usr/share

Modified: desktop/experimental/gucharmap/debian/libgucharmap2-dev.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gucharmap/debian/libgucharmap2-dev.install?rev=27010&op=diff
==============================================================================
--- desktop/experimental/gucharmap/debian/libgucharmap2-dev.install [utf-8] (original)
+++ desktop/experimental/gucharmap/debian/libgucharmap2-dev.install [utf-8] Mon Mar 21 19:16:06 2011
@@ -1,4 +1,4 @@
-debian/tmp/usr/include/gucharmap-2/
-debian/tmp/usr/lib/libgucharmap*.so
-debian/tmp/usr/lib/pkgconfig/
-debian/tmp/usr/share/gtk-doc
+debian/tmp-gtk2/usr/include			/usr
+debian/tmp-gtk2/usr/lib/libgucharmap*.so	/usr/lib
+debian/tmp-gtk2/usr/lib/pkgconfig/		/usr/lib
+debian/tmp-gtk2/usr/share/gtk-doc		/usr/share

Modified: desktop/experimental/gucharmap/debian/libgucharmap7.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gucharmap/debian/libgucharmap7.install?rev=27010&op=diff
==============================================================================
--- desktop/experimental/gucharmap/debian/libgucharmap7.install [utf-8] (original)
+++ desktop/experimental/gucharmap/debian/libgucharmap7.install [utf-8] Mon Mar 21 19:16:06 2011
@@ -1,1 +1,1 @@
-debian/tmp/usr/lib/libgucharmap*.so.*
+debian/tmp-gtk2/usr/lib/libgucharmap*.so.* /usr/lib

Modified: desktop/experimental/gucharmap/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gucharmap/debian/rules?rev=27010&op=diff
==============================================================================
--- desktop/experimental/gucharmap/debian/rules [utf-8] (original)
+++ desktop/experimental/gucharmap/debian/rules [utf-8] Mon Mar 21 19:16:06 2011
@@ -8,17 +8,35 @@
 include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
 -include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
 
-libgucharmap := $(shell sed -nr 's/^Package:[[:space:]]*(libgucharmap[0-9]+)[[:space:]]*$$/\1/p' debian/control)
+DEB_BUILDDIR := $(CURDIR)/debian/build/gtk2
+DEB_BUILDDIR_gucharmap := $(CURDIR)/debian/build/gtk3
+DEB_DESTDIR := $(CURDIR)/debian/tmp-gtk2
+DEB_DESTDIR_gucharmap := $(CURDIR)/debian/tmp
 
-# ensure gucharmap is built after libgucharmap
-binary/gucharmap:: binary/$(libgucharmap)
+DEB_CONFIGURE_EXTRA_FLAGS += --disable-scrollkeeper --enable-gtk-doc
+
+configure/gucharmap:: $(DEB_BUILDDIR_gucharmap)/config.status
+$(DEB_BUILDDIR_gucharmap)/config.status:
+	cd $(DEB_BUILDDIR_gucharmap) && \
+		$(DEB_CONFIGURE_SCRIPT_ENV) $(DEB_CONFIGURE_SCRIPT) \
+			$(DEB_CONFIGURE_NORMAL_ARGS) \
+			$(cdbs_configure_flags) \
+			$(DEB_CONFIGURE_EXTRA_FLAGS) \
+			--with-gtk=3.0 \
+			$(DEB_CONFIGURE_USER_FLAGS)
+
+build/gucharmap::
+	make -C $(DEB_BUILDDIR_gucharmap)
+
+install/gucharmap::
+	make -C $(DEB_BUILDDIR_gucharmap) install DESTDIR=$(DEB_DESTDIR_gucharmap)
 
 clean::
 	rm -f intltool-extract intltool-merge intltool-update
 	rm -f po/.intltool-merge-cache
-
-DEB_CONFIGURE_EXTRA_FLAGS += --disable-scrollkeeper --enable-gtk-doc
+	rm -rf $(DEB_BUILDDIR) $(DEB_BUILDDIR_gucharmap)
+	rm -rf $(DEB_DESTDIR) $(DEB_DESTDIR_gucharmap)
 
 LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
 
-DEB_DH_MAKESHLIBS_ARGS_$(libgucharmap) += -V '$(libgucharmap) (>= 1:2.24.0)'
+DEB_DH_MAKESHLIBS_ARGS_libgucharmap7 += -V'libgucharmap7 (>= 1:2.24.0)'

More information about the pkg-gnome-commits mailing list