r10179 - in /desktop/unstable/gtk+2.0/debian: changelog control
control.in dh_gtkmodules.in rules
lool at users.alioth.debian.org
lool at users.alioth.debian.org
Sat Apr 21 06:30:02 UTC 2007
Author: lool
Date: Sat Apr 21 06:30:02 2007
New Revision: 10179
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=10179
Log:
* Add a -k flag to dh_gtkmodules, matching the change in dh_pangomodules.
* Use this new flag for the udeb and the shared library packages.
* Add ${misc:Depends}.
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/dh_gtkmodules.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=10179&op=diff
==============================================================================
--- desktop/unstable/gtk+2.0/debian/changelog (original)
+++ desktop/unstable/gtk+2.0/debian/changelog Sat Apr 21 06:30:02 2007
@@ -6,8 +6,11 @@
* Post-transition bump of conflicts to gtk2-engines-wonderland << 1.0-4,
imhangul (<< 0.9.13-5), gcin (<< 1.3.4-2), gtk-im-libthai (<< 0.1.4-3.
* Let the udeb provide the Gtk+ module ABI (binver); closes: #419592.
-
- -- Loic Minier <lool at dooz.org> Sat, 21 Apr 2007 07:55:27 +0200
+ * Add a -k flag to dh_gtkmodules, matching the change in dh_pangomodules.
+ * Use this new flag for the udeb and the shared library packages.
+ * Add ${misc:Depends}.
+
+ -- Loic Minier <lool at dooz.org> Sat, 21 Apr 2007 08:28:14 +0200
gtk+2.0 (2.10.11-2) unstable; urgency=low
Modified: desktop/unstable/gtk+2.0/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/control?rev=10179&op=diff
==============================================================================
--- desktop/unstable/gtk+2.0/debian/control (original)
+++ desktop/unstable/gtk+2.0/debian/control Sat Apr 21 06:30:02 2007
@@ -40,6 +40,7 @@
Section: libs
Architecture: any
Depends: libgtk2.0-common (= ${source:Version}),
+ ${misc:Depends},
${shlibs:Depends}
Provides: gtk2.0-binver-2.10.0
Conflicts: libgtk2.0-0png3,
@@ -88,6 +89,7 @@
iiimgcf (<= 11.4.1870-7)
Replaces: libgtk2.0-0png3
Recommends: hicolor-icon-theme,
+ ${misc:Depends},
libgtk2.0-bin
Description: The GTK+ graphical user interface library
The GTK+ is a multi-platform toolkit for creating graphical user
@@ -101,6 +103,7 @@
Section: libs
Architecture: any
Depends: libgtk2.0-0 (= ${binary:Version}),
+ ${misc:Depends},
${shlibs:Depends}
Conflicts: libgtk+2.0-directfb0
Description: The GTK+ graphical user interface library - DirectFB runtime
@@ -118,7 +121,8 @@
Section: debian-installer
Priority: extra
Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends},
+ ${misc:Depends}
Provides: gtk2.0-binver-2.10.0
Description: The GTK+ graphical user interface library - minimal runtime
This is a udeb, or a microdeb, for the debian-installer.
@@ -169,6 +173,7 @@
Section: libdevel
Architecture: any
Depends: libgtk2.0-0 (= ${binary:Version}),
+ ${misc:Depends},
libglib2.0-dev (>= 2.12.0),
libpango1.0-dev (>= 1.10.0-2),
libatk1.0-dev (>= 1.6.1-2),
@@ -198,6 +203,7 @@
Section: libdevel
Architecture: any
Depends: libgtk-directfb-2.0-0 (= ${binary:Version}),
+ ${misc:Depends},
libgtk2.0-dev (= ${binary:Version}),
libcairo-directfb2-dev,
libcairo2-dev (>= 1.2.0)
@@ -216,7 +222,8 @@
Section: libdevel
Priority: extra
Architecture: any
-Depends: libgtk2.0-0 (= ${binary:Version})
+Depends: libgtk2.0-0 (= ${binary:Version}),
+ ${misc:Depends}
Conflicts: libgtk2.0-dbg
Replaces: libgtk2.0-dbg
Description: The GTK+ libraries and debugging symbols
@@ -235,7 +242,8 @@
Package: libgtk2.0-doc
Section: doc
Architecture: all
-Depends: lynx | www-browser
+Depends: lynx | www-browser,
+ ${misc:Depends}
Replaces: libgtk1.3-doc
Conflicts: libgtk1.3-doc
Recommends: libglib2.0-doc,
@@ -255,6 +263,7 @@
Priority: extra
Architecture: any
Depends: ${shlibs:Depends},
+ ${misc:Depends},
libgtk2.0-0 (= ${binary:Version})
Replaces: libgtk1.3-dev
Description: Examples files for the GTK+ 2.0
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=10179&op=diff
==============================================================================
--- desktop/unstable/gtk+2.0/debian/control.in (original)
+++ desktop/unstable/gtk+2.0/debian/control.in Sat Apr 21 06:30:02 2007
@@ -40,6 +40,7 @@
Section: libs
Architecture: any
Depends: @COMMON_PKG@ (= ${source:Version}),
+ ${misc:Depends},
${shlibs:Depends}
Provides: @GTK_BINVER_DEP@
Conflicts: libgtk2.0-0png3,
@@ -88,6 +89,7 @@
iiimgcf (<= 11.4.1870-7)
Replaces: libgtk2.0-0png3
Recommends: hicolor-icon-theme,
+ ${misc:Depends},
@BIN_PKG@
Description: The GTK+ graphical user interface library
The GTK+ is a multi-platform toolkit for creating graphical user
@@ -101,6 +103,7 @@
Section: libs
Architecture: any
Depends: @SHARED_PKG@ (= ${binary:Version}),
+ ${misc:Depends},
${shlibs:Depends}
Conflicts: libgtk+2.0-directfb0
Description: The GTK+ graphical user interface library - DirectFB runtime
@@ -118,7 +121,8 @@
Section: debian-installer
Priority: extra
Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends},
+ ${misc:Depends}
Provides: @GTK_BINVER_DEP@
Description: The GTK+ graphical user interface library - minimal runtime
This is a udeb, or a microdeb, for the debian-installer.
@@ -169,6 +173,7 @@
Section: libdevel
Architecture: any
Depends: @SHARED_PKG@ (= ${binary:Version}),
+ ${misc:Depends},
libglib2.0-dev (>= 2.12.0),
libpango1.0-dev (>= 1.10.0-2),
libatk1.0-dev (>= 1.6.1-2),
@@ -198,6 +203,7 @@
Section: libdevel
Architecture: any
Depends: @DIRECTFB_PKG@ (= ${binary:Version}),
+ ${misc:Depends},
@DEV_PKG@ (= ${binary:Version}),
libcairo-directfb2-dev,
libcairo2-dev (>= 1.2.0)
@@ -216,7 +222,8 @@
Section: libdevel
Priority: extra
Architecture: any
-Depends: @SHARED_PKG@ (= ${binary:Version})
+Depends: @SHARED_PKG@ (= ${binary:Version}),
+ ${misc:Depends}
Conflicts: libgtk2.0-dbg
Replaces: libgtk2.0-dbg
Description: The GTK+ libraries and debugging symbols
@@ -235,7 +242,8 @@
Package: @DOC_PKG@
Section: doc
Architecture: all
-Depends: lynx | www-browser
+Depends: lynx | www-browser,
+ ${misc:Depends}
Replaces: libgtk1.3-doc
Conflicts: libgtk1.3-doc
Recommends: libglib2.0-doc,
@@ -255,6 +263,7 @@
Priority: extra
Architecture: any
Depends: ${shlibs:Depends},
+ ${misc:Depends},
@SHARED_PKG@ (= ${binary:Version})
Replaces: libgtk1.3-dev
Description: Examples files for the GTK+ 2.0
Modified: desktop/unstable/gtk+2.0/debian/dh_gtkmodules.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/dh_gtkmodules.in?rev=10179&op=diff
==============================================================================
--- desktop/unstable/gtk+2.0/debian/dh_gtkmodules.in (original)
+++ desktop/unstable/gtk+2.0/debian/dh_gtkmodules.in Sat Apr 21 06:30:02 2007
@@ -28,6 +28,14 @@
current package, it will generate a dependency on the earliest Gtk
version that Gtk currently has compatibility for in ${misc:Depends}
("binary version").
+
+=head1 OPTIONS
+
+=over 4
+
+=item B<-k>
+
+Do not generate any dependencies in ${misc:Depends}.
=cut
@@ -177,7 +185,9 @@
# since the versionned module directory exists, generate a dependency
# on the Gtk binary version
- addsubstvar($package, "misc:Depends", $gtk_binver_dep);
+ if (! $dh{K_FLAG}) {
+ addsubstvar($package, "misc:Depends", $gtk_binver_dep);
+ }
# search for specific module types
find_modules(\@loaders_modules, $tmp, $loaders_modules_path);
Modified: desktop/unstable/gtk+2.0/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/rules?rev=10179&op=diff
==============================================================================
--- desktop/unstable/gtk+2.0/debian/rules (original)
+++ desktop/unstable/gtk+2.0/debian/rules Sat Apr 21 06:30:02 2007
@@ -273,11 +273,13 @@
GTK_QUERYLOADERS=$(installbasedir)/shared/usr/bin/gdk-pixbuf-query-loaders \
GTK_QUERYIMMODULES=$(installbasedir)/shared/usr/bin/gtk-query-immodules-2.0 \
debian/$(DEV_PKG)/usr/bin/dh_gtkmodules \
+ -k \
-p$(SHARED_PKG)
# generate a GdkPixbuf loader config file for the udeb
LD_LIBRARY_PATH=debian/$(UDEB_PKG)/usr/lib:$(LD_LIBRARY_PATH) \
GTK_QUERYLOADERS=$(installbasedir)/directfb/usr/bin/gdk-pixbuf-query-loaders \
debian/$(DEV_PKG)/usr/bin/dh_gtkmodules \
+ -k \
-p$(UDEB_PKG)
dh_installexamples -a
dh_link -a
More information about the pkg-gnome-commits
mailing list