r23332 - in /desktop/unstable/gtk2-engines/debian: changelog rules

[pochu at users.alioth.debian.org]

Author: pochu
Date: Thu Mar 18 13:42:40 2010
New Revision: 23332

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=23332
Log:
* 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.

Modified:
    desktop/unstable/gtk2-engines/debian/changelog
    desktop/unstable/gtk2-engines/debian/rules

Modified: desktop/unstable/gtk2-engines/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk2-engines/debian/changelog?rev=23332&op=diff
==============================================================================
--- desktop/unstable/gtk2-engines/debian/changelog [utf-8] (original)
+++ desktop/unstable/gtk2-engines/debian/changelog [utf-8] Thu Mar 18 13:42:40 2010
@@ -1,5 +1,6 @@
 gtk2-engines (1:2.18.5-2) UNRELEASED; 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.
@@ -7,7 +8,15 @@
        a dependency on libgtk-x11-udeb.
      - Tweak comments and paths in debian/rules.
 
- -- Cyril Brulebois <kibi at debian.org>  Sun, 07 Feb 2010 15:52:50 +0000
+  [ 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 at debian.org>  Thu, 18 Mar 2010 14:31:20 +0100
 
 gtk2-engines (1:2.18.5-1) unstable; urgency=low
 

Modified: desktop/unstable/gtk2-engines/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk2-engines/debian/rules?rev=23332&op=diff
==============================================================================
--- desktop/unstable/gtk2-engines/debian/rules [utf-8] (original)
+++ desktop/unstable/gtk2-engines/debian/rules [utf-8] Thu Mar 18 13:42:40 2010
@@ -19,7 +19,7 @@
 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
 
@@ -28,21 +28,7 @@
 
 configure/gtk2-engines-udeb:: $(DEB_BUILDDIR_gtk2-engines-udeb)/config.status
 $(DEB_BUILDDIR_gtk2-engines-udeb)/config.status:
-	# The following comment applied to the DirectFB-based udeb. That dirty
-	# hack probably could go away with the new X11-based udeb, provided
-	# libgtk-x11-udeb is still built from the 'shared' flavour, and not
-	# from a new stripped-down flavour. Keep this hack for now, and for
-	# reference.
-
-	# 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+-x11-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) \
 				$(DEB_CONFIGURE_NORMAL_ARGS) \