r23333 - /desktop/unstable/gtk+2.0/debian/

pochu at users.alioth.debian.org pochu at users.alioth.debian.org
Thu Mar 18 14:59:22 UTC 2010


Author: pochu
Date: Thu Mar 18 14:59:21 2010
New Revision: 23333

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=23333
Log:
* debian/rules,
  debian/libgtk2.0-0-udeb.install.in,
  debian/libgtk-x11-udeb.install.in:
* debian/rules,
  debian/control.in,
  debian/libgtk-directfb-2.0-0.*,
  debian/libgtk-directfb-2.0-dev.*,
  - Drop the DirectFB enabled GTK+ packages. It was needed for the
    graphical installer but it's now switching to X11 so we don't need
    it anymore.

Removed:
    desktop/unstable/gtk+2.0/debian/libgtk-directfb-2.0-0-udeb.install.in
    desktop/unstable/gtk+2.0/debian/libgtk-directfb-2.0-0.install.in
    desktop/unstable/gtk+2.0/debian/libgtk-directfb-2.0-0.links.in
    desktop/unstable/gtk+2.0/debian/libgtk-directfb-2.0-0.preinst
    desktop/unstable/gtk+2.0/debian/libgtk-directfb-2.0-0.prerm
    desktop/unstable/gtk+2.0/debian/libgtk-directfb-2.0-0.symbols
    desktop/unstable/gtk+2.0/debian/libgtk-directfb-2.0-dev.install.in
    desktop/unstable/gtk+2.0/debian/libgtk-directfb-2.0-dev.links.in
    desktop/unstable/gtk+2.0/debian/libgtk-directfb-2.0-dev.preinst
    desktop/unstable/gtk+2.0/debian/libgtk-directfb-2.0-dev.prerm
Modified:
    desktop/unstable/gtk+2.0/debian/changelog
    desktop/unstable/gtk+2.0/debian/control
    desktop/unstable/gtk+2.0/debian/control.in
    desktop/unstable/gtk+2.0/debian/rules

Modified: desktop/unstable/gtk+2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/changelog?rev=23333&op=diff
==============================================================================
--- desktop/unstable/gtk+2.0/debian/changelog [utf-8] (original)
+++ desktop/unstable/gtk+2.0/debian/changelog [utf-8] Thu Mar 18 14:59:21 2010
@@ -40,8 +40,17 @@
       - Updated for the new version.
   * debian/control.in:
     - Build depend on xsltproc, needed to generate the mime cache.
-  * debian/rules:
+  * debian/rules,
+    debian/libgtk2.0-0-udeb.install.in,
+    debian/libgtk-x11-udeb.install.in:
     - Rename the udeb to libgtk2.0-0-udeb.
+  * debian/rules,
+    debian/control.in,
+    debian/libgtk-directfb-2.0-0.*,
+    debian/libgtk-directfb-2.0-dev.*,
+    - Drop the DirectFB enabled GTK+ packages. It was needed for the
+      graphical installer but it's now switching to X11 so we don't need
+      it anymore.
 
  -- Emilio Pozuelo Monfort <pochu at debian.org>  Wed, 17 Mar 2010 23:56:38 +0100
 

Modified: desktop/unstable/gtk+2.0/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/control?rev=23333&op=diff
==============================================================================
--- desktop/unstable/gtk+2.0/debian/control [utf-8] (original)
+++ desktop/unstable/gtk+2.0/debian/control [utf-8] Thu Mar 18 14:59:21 2010
@@ -32,7 +32,6 @@
                chrpath,
                dpkg-dev (>= 1.13.19),
                x11proto-xext-dev,
-               libdirectfb-dev (>= 1.0.0),
                libcups2-dev (>= 1.2),
                quilt,
                gawk,
@@ -64,22 +63,6 @@
  suites.
  .
  This package contains the shared libraries.
-
-Package: libgtk-directfb-2.0-0
-Architecture: any
-Depends: libgtk2.0-0 (= ${binary:Version}),
-         libgtk2.0-common,
-         ${misc:Depends},
-         ${shlibs:Depends}
-Description: The GTK+ graphical user interface library - DirectFB runtime
- The GTK+ is a multi-platform toolkit for creating graphical user
- interfaces. Offering a complete set of widgets, the GTK+ is suitable
- for projects ranging from small one-off tools to complete application
- suites.
- .
- This version uses DirectFB, a thin library providing an integrated
- windowing system and hardware acceleration on top of the Linux
- framebuffer.
 
 Package: libgtk2.0-0-udeb
 XC-Package-Type: udeb
@@ -162,25 +145,6 @@
  This package contains the header files and static libraries which is
  needed for developing the GTK+ applications.
 
-Package: libgtk-directfb-2.0-dev
-Section: libdevel
-Architecture: any
-Depends: libgtk-directfb-2.0-0 (= ${binary:Version}),
-         ${misc:Depends},
-         libgtk2.0-dev (= ${binary:Version}),
-         libgtk2.0-common,
-         libcairo2-dev (>= 1.6.4-6.1)
-Conflicts: libgtk+2.0-directfb-dev
-Description: Development files for the GTK+ library - DirectFB version
- The GTK+ is a multi-platform toolkit for creating graphical user
- interfaces. Offering a complete set of widgets, the GTK+ is suitable
- for projects ranging from small one-off tools to complete application
- suites.
- .
- This package contains the header files and static libraries which is
- needed for developing the GTK+ applications on top of the DirectFB
- library.
-
 Package: libgtk2.0-0-dbg
 Section: debug
 Priority: extra

Modified: desktop/unstable/gtk+2.0/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/control.in?rev=23333&op=diff
==============================================================================
--- desktop/unstable/gtk+2.0/debian/control.in [utf-8] (original)
+++ desktop/unstable/gtk+2.0/debian/control.in [utf-8] Thu Mar 18 14:59:21 2010
@@ -32,7 +32,6 @@
                chrpath,
                dpkg-dev (>= 1.13.19),
                x11proto-xext-dev,
-               libdirectfb-dev (>= 1.0.0),
                libcups2-dev (>= 1.2),
                quilt,
                gawk,
@@ -64,22 +63,6 @@
  suites.
  .
  This package contains the shared libraries.
-
-Package: @DIRECTFB_PKG@
-Architecture: any
-Depends: @SHARED_PKG@ (= ${binary:Version}),
-         @COMMON_PKG@,
-         ${misc:Depends},
-         ${shlibs:Depends}
-Description: The GTK+ graphical user interface library - DirectFB runtime
- The GTK+ is a multi-platform toolkit for creating graphical user
- interfaces. Offering a complete set of widgets, the GTK+ is suitable
- for projects ranging from small one-off tools to complete application
- suites.
- .
- This version uses DirectFB, a thin library providing an integrated
- windowing system and hardware acceleration on top of the Linux
- framebuffer.
 
 Package: @UDEB_PKG@
 XC-Package-Type: udeb
@@ -162,25 +145,6 @@
  This package contains the header files and static libraries which is
  needed for developing the GTK+ applications.
 
-Package: @DIRECTFB_DEV_PKG@
-Section: libdevel
-Architecture: any
-Depends: @DIRECTFB_PKG@ (= ${binary:Version}),
-         ${misc:Depends},
-         @DEV_PKG@ (= ${binary:Version}),
-         @COMMON_PKG@,
-         libcairo2-dev (>= 1.6.4-6.1)
-Conflicts: libgtk+2.0-directfb-dev
-Description: Development files for the GTK+ library - DirectFB version
- The GTK+ is a multi-platform toolkit for creating graphical user
- interfaces. Offering a complete set of widgets, the GTK+ is suitable
- for projects ranging from small one-off tools to complete application
- suites.
- .
- This package contains the header files and static libraries which is
- needed for developing the GTK+ applications on top of the DirectFB
- library.
-
 Package: @DEBUG_PKG@
 Section: debug
 Priority: extra

Modified: desktop/unstable/gtk+2.0/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/rules?rev=23333&op=diff
==============================================================================
--- desktop/unstable/gtk+2.0/debian/rules [utf-8] (original)
+++ desktop/unstable/gtk+2.0/debian/rules [utf-8] Thu Mar 18 14:59:21 2010
@@ -45,8 +45,7 @@
 CFLAGS += -Wall -g -O$(if $(findstring noopt,$(DEB_BUILD_OPTIONS)),0,2)
 
 # default LDFLAGS; these can be expanded with $(call flavor_get, )
-# used to fail in directfb code -- but this might be fixed -- currently fails
-# in the cups gtkprint backend
+# currently fails in the cups gtkprint backend
 #LDFLAGS += -Wl,-z,defs
 
 DEBVERSION := $(shell dpkg-parsechangelog | sed -n -e 's/^Version: //p')
@@ -74,8 +73,6 @@
 SHARED_PKG := libgtk$(APIVER)-$(SONAME)
 COMMON_PKG := libgtk$(APIVER)-common
 DEV_PKG := libgtk$(APIVER)-dev
-DIRECTFB_PKG := libgtk-directfb-$(APIVER)-$(SONAME)
-DIRECTFB_DEV_PKG := libgtk-directfb-$(APIVER)-dev
 UDEB_PKG := $(SHARED_PKG)-udeb
 DOC_PKG := libgtk$(APIVER)-doc
 BIN_PKG := libgtk$(APIVER)-bin
@@ -85,13 +82,13 @@
 
 # package groups, used in rule dependencies and in cleanup
 BINARY_INDEP_PKGS := $(COMMON_PKG) $(BIN_PKG) $(DOC_PKG) libgail-doc
-BINARY_ARCH_PKGS := $(SHARED_PKG) $(DIRECTFB_PKG) $(UDEB_PKG) $(DEV_PKG) $(DIRECTFB_DEV_PKG) $(DEBUG_PKG) $(EXAMPLES_PKG) $(PIXBUF_PKG) libgail18 libgail-dbg libgail-dev libgail-common
+BINARY_ARCH_PKGS := $(SHARED_PKG) $(UDEB_PKG) $(DEV_PKG) $(DEBUG_PKG) $(EXAMPLES_PKG) $(PIXBUF_PKG) libgail18 libgail-dbg libgail-dev libgail-common
 ALL_PKGS := $(BINARY_INDEP_PKGS) $(BINARY_ARCH_PKGS)
 
 # list of flavors we build; each gets a builddir, a configure pass (configure
 # args are defined below), a build pass, and an install pass (in two steps)
 # Note: the shared flavor is required
-FLAVORS := directfb shared shared_udeb static
+FLAVORS := shared shared_udeb static
 
 # current flavor we're building; this is only expanded in flavor specific
 # targets
@@ -148,13 +145,6 @@
 			--disable-modules \
 			--disable-shared \
 			--enable-static
-directfb_configure_flags := $(configure_flags) \
-			--with-xinput=no \
-			--with-libjasper \
-			--enable-shared \
-			--disable-static \
-			--enable-explicit-deps=yes \
-			--with-gdktarget=directfb
 
 # optional optimized flavor for some arches
 OPTLIBDIR :=
@@ -167,11 +157,7 @@
 #endif
 
 # list of flavors to run the test suite on
-CHECK_FLAVORS := $(filter directfb opt shared static, $(FLAVORS))
-# don't run the directfb testsuite on kfreebsd as it hangs; see #431477
-ifeq ($(DEB_HOST_ARCH_OS), kfreebsd)
-CHECK_FLAVORS := $(filter-out directfb, $(CHECK_FLAVORS))
-endif
+CHECK_FLAVORS := $(filter opt shared static, $(FLAVORS))
 
 DH_INSTALLDOCS_FILES := NEWS README ChangeLog
 
@@ -260,8 +246,6 @@
 		-e "s#@SHARED_PKG@#$(SHARED_PKG)#g" \
 		-e "s#@COMMON_PKG@#$(COMMON_PKG)#g" \
 		-e "s#@DEV_PKG@#$(DEV_PKG)#g" \
-		-e "s#@DIRECTFB_PKG@#$(DIRECTFB_PKG)#g" \
-		-e "s#@DIRECTFB_DEV_PKG@#$(DIRECTFB_DEV_PKG)#g" \
 		-e "s#@UDEB_PKG@#$(UDEB_PKG)#g" \
 		-e "s#@DOC_PKG@#$(DOC_PKG)#g" \
 		-e "s#@BIN_PKG@#$(BIN_PKG)#g" \
@@ -379,11 +363,6 @@
 		-V"$(SHARED_PKG) (>= $(SHVER))" \
 		--add-udeb=$(UDEB_PKG) \
 		-- -c4
-	dh_makeshlibs -p$(DIRECTFB_PKG) \
-		-X$(MODULES_BASE_PATH) \
-		-V"$(DIRECTFB_PKG) (>= $(SHVER))" \
-		--add-udeb=$(UDEB_PKG) \
-		-- -c4
 	dh_makeshlibs -plibgail18 \
 		-X$(MODULES_BASE_PATH) \
 		-V"libgail18 (>= $(SHVER)), libgail-common (>= $(SHVER))" \




More information about the pkg-gnome-commits mailing list