Changeset 6479

Timestamp:

03/27/10 19:03:24 (3 years ago)

Author:

alanbach-guest

Message:

• Sync'd with Debian 1:2.18.5-2

Location:

pkg/frankie/main/gtk2-engines/trunk/debian

Files:

• changelog (modified) (1 diff)
• control (modified) (2 diffs)
• control.in (modified) (2 diffs)
• rules (modified) (3 diffs)

pkg/frankie/main/gtk2-engines/trunk/debian/changelog

@@ -1 @@
-gtk2-engines (1:2.18.5-parsix1) unstable; urgency=low
-
-  * New upstream bugfix release
-
- -- Alan Baghumian <alan@technotux.org>  Sat, 02 Jan 2010 18:43:25 -0800
-
-gtk2-engines (1:2.18.4-parsix1) unstable; urgency=low
-
-  * Synd'd with Debian 1:2.18.4-1 
-
- -- Alan Baghumian <alan@technotux.org>  Thu, 26 Nov 2009 16:18:59 -0800
+gtk2-engines (1:2.18.5-parsix2) unstable; urgency=low
+
+  * Sync'd with Debian 1:2.18.5-2
+
+ -- Alan Baghumian <alan@technotux.org>  Sat, 27 Mar 2010 11:02:45 -0700
+
+gtk2-engines (1:2.18.5-2) unstable; urgency=low
+
+  [ Cyril Brulebois ]
+  * Switch udeb from DirectFB to Xlib to prepare the move to an X11-based
+    graphical installer. Closes: #573884.
+     - Get rid of libgtk-directfb-2.0-dev in Build-Depends.
+     - Bump the Build-Depends on libgtk2.0-dev to ensure the new udeb gets
+       a dependency on libgtk-x11-udeb.
+     - Tweak comments and paths in debian/rules.
+
+  [ Emilio Pozuelo Monfort ]
+  * debian/rules:
+    - Remove hack that was needed to build the udeb against the DirectFB
+      GTK+ library, since the default one was the X11. We build against
+      the X11 one now.
+    - Pass --no-act to dh_makeshlibs, and not -n, to avoid getting unwanted
+      shlibs files.
+
+ -- Emilio Pozuelo Monfort <pochu@debian.org>  Thu, 18 Mar 2010 18:01:14 +0100
+
+gtk2-engines (1:2.18.5-1) unstable; urgency=low
+
+  * New upstream bugfix release.
+
+ -- Sebastian Dröge <slomo@debian.org>  Mon, 04 Jan 2010 11:00:56 +0100
 
 gtk2-engines (1:2.18.4-1) unstable; urgency=low

pkg/frankie/main/gtk2-engines/trunk/debian/control

@@ +1 @@
+# 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: gtk2-engines
 Section: gnome
 Priority: optional
 Maintainer: Ed Boraas <ed@debian.org>
-Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Josselin Mouette <joss@debian.org>, Sebastian Dröge <slomo@debian.org>
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Emilio Pozuelo Monfort <pochu@debian.org>, Josselin Mouette <joss@debian.org>, Sebastian Dröge <slomo@debian.org>
 Standards-Version: 3.8.3
 Build-Depends: debhelper (>= 5),
-               libgtk2.0-dev (>= 2.12.0),
-               libgtk-directfb-2.0-dev (>= 2.12.11-4),
+               libgtk2.0-dev (>= 2.18.9-1),
                gnome-pkg-tools (>= 0.10),
                cdbs (>= 0.4.41),
@@ -76 +80 @@
  .
  This package only holds the minimal set of files for Debian installer
- to use GTK+ 2.x theme engines under DirectFB.
+ to use GTK+ 2.x theme engines under X11.

pkg/frankie/main/gtk2-engines/trunk/debian/control.in

@@ -6 +6 @@
 Standards-Version: 3.8.3
 Build-Depends: debhelper (>= 5),
-               libgtk2.0-dev (>= 2.12.0),
-               libgtk-directfb-2.0-dev (>= 2.12.11-4),
+               libgtk2.0-dev (>= 2.18.9-1),
                gnome-pkg-tools (>= 0.10),
                cdbs (>= 0.4.41),
@@ -76 +75 @@
  .
  This package only holds the minimal set of files for Debian installer
- to use GTK+ 2.x theme engines under DirectFB.
+ to use GTK+ 2.x theme engines under X11.

pkg/frankie/main/gtk2-engines/trunk/debian/rules

@@ -3 +3 @@
 buildbasedir := $(CURDIR)/debian/build
 DEB_BUILDDIR := $(buildbasedir)/x11
-DEB_BUILDDIR_gtk2-engines-udeb := $(buildbasedir)/directfb
+DEB_BUILDDIR_gtk2-engines-udeb := $(buildbasedir)/x11-udeb
 
 include /usr/share/cdbs/1/rules/debhelper.mk
@@ -15 +15 @@
 
 DEB_DESTDIR := $(CURDIR)/debian/tmp/x11
-DEB_DESTDIR_gtk2-engines-udeb := $(CURDIR)/debian/tmp/directfb
+DEB_DESTDIR_gtk2-engines-udeb := $(CURDIR)/debian/tmp/x11-udeb
 
 DEB_DH_INSTALL_ARGS = --sourcedir=$(if $(findstring gtk2-engines-udeb,$(cdbs_curpkg)),$(DEB_DESTDIR_gtk2-engines-udeb),$(DEB_DESTDIR))
 
 # don't run dh_makeshlibs (we don't need shlibs for Gtk modules)
-DEB_DH_MAKESHLIBS_ARGS_ALL += -n
+DEB_DH_MAKESHLIBS_ARGS_ALL += --no-act
 
 LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,-Bsymbolic -Wl,--as-needed
@@ -29 +29 @@
 configure/gtk2-engines-udeb:: $(DEB_BUILDDIR_gtk2-engines-udeb)/config.status
 $(DEB_BUILDDIR_gtk2-engines-udeb)/config.status:
-        # paint me ugly: Gtk 2.8 mixes the pkg-config files from both builds
-        # (x11/shared and directfb), so the gtk+2.0.pc from the directfb can't
-        # be used; we cheat and create a fake one higher in the PKG_CONFIG_PATH
-        # which is a symlink to the gtk+-directfb-2.0.pc
-        mkdir -p $(DEB_BUILDDIR_gtk2-engines-udeb)/pkg-config
-        cd $(DEB_BUILDDIR_gtk2-engines-udeb)/pkg-config && \
-                ln -s /usr/lib/pkgconfig/gtk+-directfb-2.0.pc gtk+-2.0.pc
         cd $(DEB_BUILDDIR_gtk2-engines-udeb) && \
-                PKG_CONFIG_PATH=pkg-config \
                 $(DEB_CONFIGURE_SCRIPT_ENV) \
                         $(DEB_CONFIGURE_SCRIPT) \