gtk+2.0 (2.6.0-1) experimental; urgency=low

* New upstream release (Closes: #275239).
  * debian/control.in:
    - create a gtk2-engines-pixbuf package.
    - recommends hicolor-icon-theme (Closes: #287334).
    - rename libgtk2.0-dbg to libgtk2.0-0-dbg.
    - updated the Build-Depends.
  * debian/gtk2-engines-pixbuf.files:
    - added.
  * debian/libgtk2.0-bin.files:
    - install gtk-update-icon-cache here.
  * debian/libgtk2.0-bin.postinst:
    - call gtk-update-icon-cache.
  * debian/patches/001_gtk+-debian-aclocal-pass_all.patch:
    - removed, should not be needed with the new version.
  * debian/patches/003_treeview-typeahead.patch,
    debian/patches/003_filechooser-search.patch,
    debian/patches/004_treeview-activate.patch,
    debian/patches/005_modifiers.patch:
    - removed, these changes are in the new version.
  * debian/rules:
    - updated the shlibs.
    - use dh_strip to make the debug package.
  * update-gtk-immodules.in:
  * update-gdkpixbuf-loaders.in:
    - module version is 2.4.0.
  * debian/watch:
    - updated.

 -- Sebastien Bacher <seb128@debian.org>  Wed, 29 Dec 2004 18:55:11 +0100
This commit is contained in:
Sebastien Bacher 2005-01-08 17:04:58 +00:00
parent b70917bf39
commit 826f027f0a
15 changed files with 113 additions and 54 deletions

53
debian/changelog vendored
View File

@ -1,3 +1,56 @@
gtk+2.0 (2.6.0-1) experimental; urgency=low
* New upstream release (Closes: #275239).
* debian/control.in:
- create a gtk2-engines-pixbuf package.
- recommends hicolor-icon-theme (Closes: #287334).
- rename libgtk2.0-dbg to libgtk2.0-0-dbg.
- updated the Build-Depends.
* debian/gtk2-engines-pixbuf.files:
- added.
* debian/libgtk2.0-bin.files:
- install gtk-update-icon-cache here.
* debian/libgtk2.0-bin.postinst:
- call gtk-update-icon-cache.
* debian/patches/001_gtk+-debian-aclocal-pass_all.patch:
- removed, should not be needed with the new version.
* debian/patches/003_treeview-typeahead.patch,
debian/patches/003_filechooser-search.patch,
debian/patches/004_treeview-activate.patch,
debian/patches/005_modifiers.patch:
- removed, these changes are in the new version.
* debian/rules:
- updated the shlibs.
- use dh_strip to make the debug package.
* update-gtk-immodules.in:
* update-gdkpixbuf-loaders.in:
- module version is 2.4.0.
* debian/watch:
- updated.
-- Sebastien Bacher <seb128@debian.org> Wed, 29 Dec 2004 18:55:11 +0100
gtk+2.0 (2.4.14-2) unstable; urgency=low
* debian/patches/003_filechooser-search.patch:
- open the path entry if "/" is enter in the file-selector.
* debian/patches/004_treeview-activate.patch:
- typeahead active the row.
* debian/patches/005_modifiers.patch:
- accept shift-/ for bringing up the location popup.
-- Sebastien Bacher <seb128@debian.org> Tue, 21 Dec 2004 16:21:15 +0100
gtk+2.0 (2.4.14-1) unstable; urgency=low
* New upstream release (Closes: #286021).
* debian/control.in:
- set myself as maintainer.
* debian/patches/003_treeview-typeahead.patch:
- backport of the typeahead feature for the treeviews.
-- Sebastien Bacher <seb128@debian.org> Sun, 19 Dec 2004 14:55:07 +0100
gtk+2.0 (2.4.13-1) unstable; urgency=low
* New upstream release:

24
debian/control vendored
View File

@ -1,9 +1,9 @@
Source: gtk+2.0
Section: libs
Priority: optional
Maintainer: Akira TAGOH <tagoh@debian.org>
Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Andreas Rottmann <rotty@debian.org>, Andrew Lau <netsnipe@users.sourceforge.net>, Carlos Perelló Marín <carlos@pemas.net>, Edd Dumbill <ejad@debian.org>, Emil Soleyman-Zomalan <emil@nishra.com>, Gustavo Noronha Silva <kov@debian.org>, J.H.M. Dassen (Ray) <jdassen@debian.org>, Joe Drew <drew@debian.org>, Johannes Rohr <j.rohr@comlink.org>, Jordi Mallach <jordi@debian.org>, Jose Carlos Garcia Sogo <jsogo@debian.org>, Josselin Mouette <joss@debian.org>, Marc HE Brockschmidt <he@debian.org>, Ondřej Surý <ondrej@debian.org>, Rob Bradford <rob@debianplanet.org>, Robert McQueen <robot101@debian.org>, Ross Burton <ross@debian.org>, Sebastien Bacher <seb128@debian.org>, Takuo KITAME <kitame@debian.org>
Build-Depends: debhelper (>> 4.0.0), gettext, pkg-config, libglib2.0-dev (>= 2.4.1-2), libpango1.0-dev (>= 1.4.0-3), libatk1.0-dev (>= 1.6.1-2), xlibs-static-pic | xlibs-pic (>= 4.2.1-6), libx11-dev | xlibs-dev, libxext-dev | xlibs-dev, libxi-dev | xlibs-dev, libxrandr-dev | xlibs-dev, libxt-dev | xlibs-dev, libxrender-dev, libxft-dev, libxcursor-dev, libtiff4-dev, libjpeg62-dev, libpng12-dev, docbook-utils, linuxdoc-tools-text, gnome-pkg-tools
Maintainer: Sebastien Bacher <seb128@debian.org>
Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Akira TAGOH <tagoh@debian.org>, Andreas Rottmann <rotty@debian.org>, Andrew Lau <netsnipe@users.sourceforge.net>, Carlos Perelló Marín <carlos@pemas.net>, Edd Dumbill <ejad@debian.org>, Emil Soleyman-Zomalan <emil@nishra.com>, Gustavo Noronha Silva <kov@debian.org>, J.H.M. Dassen (Ray) <jdassen@debian.org>, Joe Drew <drew@debian.org>, Johannes Rohr <j.rohr@comlink.org>, Jordi Mallach <jordi@debian.org>, Jose Carlos Garcia Sogo <jsogo@debian.org>, Josselin Mouette <joss@debian.org>, Marc HE Brockschmidt <he@debian.org>, Ondřej Surý <ondrej@debian.org>, Rob Bradford <rob@debianplanet.org>, Robert McQueen <robot101@debian.org>, Ross Burton <ross@debian.org>, Takuo KITAME <kitame@debian.org>
Build-Depends: debhelper (>> 4.0.0), gettext, pkg-config, libglib2.0-dev (>= 2.6.0), libpango1.0-dev (>= 1.7.0), libatk1.0-dev (>= 1.6.1-2), xlibs-static-pic | xlibs-pic (>= 4.2.1-6), libx11-dev | xlibs-dev, libxext-dev | xlibs-dev, libxi-dev | xlibs-dev, libxrandr-dev | xlibs-dev, libxt-dev | xlibs-dev, libxrender-dev, libxft-dev, libxcursor-dev, libtiff4-dev, libjpeg62-dev, libpng12-dev, docbook-utils, linuxdoc-tools-text, gnome-pkg-tools
Build-Depends-Indep: gtk-doc-tools, docbook-xml
Standards-Version: 3.6.1.0
@ -13,6 +13,7 @@ Architecture: any
Depends: libgtk2.0-common (>= ${Source-Version}), libgtk2.0-bin (>= ${Source-Version}), ${shlibs:Depends}
Conflicts: libgtk2.0-0png3, eog2 (<< 1.0.1-4), gnome-panel2 (<< 2.0.4-1), celestia (<< 1.2.4-4), gimp1.3 (<< 1.3.7-1.1), metatheme (<< 0.9.7-3), libgnomeui-0 (<< 2.0.6-2), gtk2.0-examples (<< 2.2.0), libgdkxft0, gtk2-engines-wonderland (<= 1.0-2), gtk2-engines-cleanice (<= 1.2.8-1), gtk2-engines-thinice (<< 2.6), gtk2-engines-crux (<< 2.6), gtk2-engines-mist (<< 2.6), gtk2-engines-highcontrast (<< 2.6), gtk2-engines-lighthouseblue (<< 2.6), gnome-themes (<< 2.6), gtk2-engines-industrial (<< 0.2.32-5), gtk2-engines-pixbuf (<< 2.2.0-2.1), gtk2-engines-redmond95 (<< 2.2.0-2.1), gtk2-engines-metal (<< 2.2.0-2.1), gtk2-engines-magicchicken (<= 1.1.1-4), gtk2-engines-qtpixmap (<= 0.28-1), gtk2-engines-smooth (<< 0.5.6-3), gtk2-engines-xfce (<= 2.1.8-1), tamil-gtk2im (<= 2.2-4), imhangul (<< 0.9.9-3), librsvg2-common (<< 2.6.3-1)
Replaces: libgtk2.0-0png3
Recommends: hicolor-icon-theme
Description: The GTK+ graphical user interface library
The GTK+ is a multi-platform toolkit for creating graphical user
interfaces. Offering a complete set of widgets, the GTK+ is suitable
@ -66,11 +67,13 @@ Description: Development files for the GTK+ library
This package contains the header files and static libraries which is
needed for developing the GTK+ applications.
Package: libgtk2.0-dbg
Package: libgtk2.0-0-dbg
Section: libdevel
Priority: extra
Architecture: any
Depends: libgtk2.0-0 (= ${Source-Version})
Conflicts: libgtk2.0-dbg
Replaces: libgtk2.0-dbg
Description: The GTK+ libraries and debugging symbols
The GTK+ is a multi-platform toolkit for creating graphical user
interfaces. Offering a complete set of widgets, the GTK+ is suitable
@ -115,3 +118,16 @@ Description: Examples files for the GTK+ 2.0
This package contains the examples files and a demonstration program
for the GTK+-2.0.
Package: gtk2-engines-pixbuf
Architecture: any
Depends: ${shlibs:Depends}
Suggests: gtk-engines-pixmap
Conflicts: gtk2.0-engines-pixbuf
Replaces: gtk2.0-engines-pixbuf
Description: Pixbuf-based theme for GTK+ 2.x
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 pixbuf theme engine.

22
debian/control.in vendored
View File

@ -1,9 +1,9 @@
Source: gtk+2.0
Section: libs
Priority: optional
Maintainer: Akira TAGOH <tagoh@debian.org>
Maintainer: Sebastien Bacher <seb128@debian.org>
Uploaders: @GNOME_TEAM@
Build-Depends: debhelper (>> 4.0.0), gettext, pkg-config, libglib2.0-dev (>= 2.4.1-2), libpango1.0-dev (>= 1.4.0-3), libatk1.0-dev (>= 1.6.1-2), xlibs-static-pic | xlibs-pic (>= 4.2.1-6), libx11-dev | xlibs-dev, libxext-dev | xlibs-dev, libxi-dev | xlibs-dev, libxrandr-dev | xlibs-dev, libxt-dev | xlibs-dev, libxrender-dev, libxft-dev, libxcursor-dev, libtiff4-dev, libjpeg62-dev, libpng12-dev, docbook-utils, linuxdoc-tools-text, gnome-pkg-tools
Build-Depends: debhelper (>> 4.0.0), gettext, pkg-config, libglib2.0-dev (>= 2.6.0), libpango1.0-dev (>= 1.7.0), libatk1.0-dev (>= 1.6.1-2), xlibs-static-pic | xlibs-pic (>= 4.2.1-6), libx11-dev | xlibs-dev, libxext-dev | xlibs-dev, libxi-dev | xlibs-dev, libxrandr-dev | xlibs-dev, libxt-dev | xlibs-dev, libxrender-dev, libxft-dev, libxcursor-dev, libtiff4-dev, libjpeg62-dev, libpng12-dev, docbook-utils, linuxdoc-tools-text, gnome-pkg-tools
Build-Depends-Indep: gtk-doc-tools, docbook-xml
Standards-Version: 3.6.1.0
@ -13,6 +13,7 @@ Architecture: any
Depends: libgtk2.0-common (>= ${Source-Version}), libgtk2.0-bin (>= ${Source-Version}), ${shlibs:Depends}
Conflicts: libgtk2.0-0png3, eog2 (<< 1.0.1-4), gnome-panel2 (<< 2.0.4-1), celestia (<< 1.2.4-4), gimp1.3 (<< 1.3.7-1.1), metatheme (<< 0.9.7-3), libgnomeui-0 (<< 2.0.6-2), gtk2.0-examples (<< 2.2.0), libgdkxft0, gtk2-engines-wonderland (<= 1.0-2), gtk2-engines-cleanice (<= 1.2.8-1), gtk2-engines-thinice (<< 2.6), gtk2-engines-crux (<< 2.6), gtk2-engines-mist (<< 2.6), gtk2-engines-highcontrast (<< 2.6), gtk2-engines-lighthouseblue (<< 2.6), gnome-themes (<< 2.6), gtk2-engines-industrial (<< 0.2.32-5), gtk2-engines-pixbuf (<< 2.2.0-2.1), gtk2-engines-redmond95 (<< 2.2.0-2.1), gtk2-engines-metal (<< 2.2.0-2.1), gtk2-engines-magicchicken (<= 1.1.1-4), gtk2-engines-qtpixmap (<= 0.28-1), gtk2-engines-smooth (<< 0.5.6-3), gtk2-engines-xfce (<= 2.1.8-1), tamil-gtk2im (<= 2.2-4), imhangul (<< 0.9.9-3), librsvg2-common (<< 2.6.3-1)
Replaces: libgtk2.0-0png3
Recommends: hicolor-icon-theme
Description: The GTK+ graphical user interface library
The GTK+ is a multi-platform toolkit for creating graphical user
interfaces. Offering a complete set of widgets, the GTK+ is suitable
@ -66,11 +67,13 @@ Description: Development files for the GTK+ library
This package contains the header files and static libraries which is
needed for developing the GTK+ applications.
Package: libgtk2.0-dbg
Package: libgtk2.0-@SONAME@-dbg
Section: libdevel
Priority: extra
Architecture: any
Depends: libgtk2.0-@SONAME@ (= ${Source-Version})
Conflicts: libgtk2.0-dbg
Replaces: libgtk2.0-dbg
Description: The GTK+ libraries and debugging symbols
The GTK+ is a multi-platform toolkit for creating graphical user
interfaces. Offering a complete set of widgets, the GTK+ is suitable
@ -115,3 +118,16 @@ Description: Examples files for the GTK+ 2.0
This package contains the examples files and a demonstration program
for the GTK+-2.0.
Package: gtk2-engines-pixbuf
Architecture: any
Depends: ${shlibs:Depends}
Suggests: gtk-engines-pixmap
Conflicts: gtk2.0-engines-pixbuf
Replaces: gtk2.0-engines-pixbuf
Description: Pixbuf-based theme for GTK+ 2.x
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 pixbuf theme engine.

View File

@ -3,3 +3,5 @@ usr/share/man/man1/gtk-query-immodules-2.0.1*
usr/bin/gdk-pixbuf-query-loaders
usr/share/man/man1/gdk-pixbuf-query-loaders.1*
etc/gtk-2.0/*
usr/bin/gtk-update-icon-cache
usr/share/man/man1/gtk-update-icon-cache.1*

View File

@ -27,6 +27,7 @@ case "$1" in
configure)
/usr/sbin/update-gtk-immodules
/usr/sbin/update-gdkpixbuf-loaders
/usr/bin/gtk-update-icon-cache /usr/share/icons
;;
abort-upgrade|abort-remove|abort-deconfigure)

View File

@ -2,7 +2,8 @@ usr/bin/gdk-pixbuf-csource
usr/include/*
usr/lib/lib*.{so,la,a}
usr/lib/pkgconfig/*.pc
usr/lib/*/*/*/*{la,a}
usr/lib/*/*/loaders/*{la,a}
usr/lib/*/*/immodules/*{la,a}
usr/lib/*/include/*.h
usr/share/aclocal/*
usr/share/man/man1/gdk-pixbuf-csource.1*

View File

@ -1,24 +0,0 @@
diff -ruN gtk+-2.2.4.orig/aclocal.m4 gtk+-2.2.4/aclocal.m4
--- gtk+-2.2.4.orig/aclocal.m4 2003-09-05 02:17:07.000000000 +0900
+++ gtk+-2.2.4/aclocal.m4 2003-09-08 00:47:50.000000000 +0900
@@ -3123,7 +3123,7 @@
# This must be Linux ELF.
linux*)
case $host_cpu in
- alpha*|hppa*|i*86|ia64*|m68*|mips*|powerpc*|sparc*|s390*|sh*|x86_64*)
+ alpha*|arm*|hppa*|i*86|ia64*|m68*|mips*|mipsel|powerpc*|sparc*|s390*|sh*|x86_64*)
lt_cv_deplibs_check_method=pass_all ;;
*)
# glibc up to 2.1.1 does not perform some relocations on ARM
diff -ruN gtk+-2.2.4.orig/configure gtk+-2.2.4/configure
--- gtk+-2.2.4.orig/configure 2003-09-08 00:46:04.000000000 +0900
+++ gtk+-2.2.4/configure 2003-09-08 00:49:01.000000000 +0900
@@ -3625,7 +3625,7 @@
# This must be Linux ELF.
linux*)
case $host_cpu in
- alpha*|hppa*|i*86|ia64*|m68*|mips*|powerpc*|sparc*|s390*|sh*|x86_64*)
+ alpha*|arm*|hppa*|i*86|ia64*|m68*|mips*|mipsel|powerpc*|sparc*|s390*|sh*|x86_64*)
lt_cv_deplibs_check_method=pass_all ;;
*)
# glibc up to 2.1.1 does not perform some relocations on ARM

14
debian/rules vendored
View File

@ -39,7 +39,7 @@ modver=$(major).$(minor).0
glibver=2.0
atkver=1.0
pangover=1.0
shver=2.4.4
shver=2.6.0
libpath=$(CURDIR)/$(BUILD_SHARED_DIR)/gdk-pixbuf/.libs:$(CURDIR)/$(BUILD_SHARED_DIR)/gdk/.libs:$(CURDIR)/$(BUILD_SHARED_DIR)/gtk/.libs
@ -103,8 +103,8 @@ $(STAMP_DIR)/configure-static-stamp:
--infodir=\$${prefix}/share/info \
--sysconfdir=/etc \
--with-xinput=yes \
--disable-modules \
--with-included-loaders=yes \
--disable-modules \
--disable-shared \
--enable-static
@ -193,14 +193,6 @@ install: install-static install-shared
cp -ar $(BUILD_SHARED_DIR)/docs/tutorial/images debian/libgtk$(apiver)-doc/usr/share/doc/libgtk$(apiver)-doc/gtk-tutorial/
cp $(BUILD_SHARED_DIR)/docs/*.txt debian/libgtk$(apiver)-doc/usr/share/doc/libgtk$(apiver)-doc
# for -dbg
-rm -rf $(CURDIR)/debian/libgtk$(apiver)-$(soname)$(suffix)/usr/lib/debug
mkdir -p $(CURDIR)/debian/libgtk$(apiver)-$(soname)$(suffix)/usr/lib/debug
for l in `find $(CURDIR)/debian/libgtk$(apiver)-$(soname)$(suffix)/usr/lib -name 'lib*.so*'`; do \
cp -vdf $$l \
$(CURDIR)/debian/libgtk$(apiver)-$(soname)$(suffix)/usr/lib/debug; \
done
# debian files
install -m 755 $(CURDIR)/debian/update-gtk-immodules \
$(CURDIR)/debian/libgtk$(apiver)-bin/usr/sbin/
@ -292,7 +284,7 @@ binary-arch: build install
dh_installman -a
dh_installinfo -a
dh_installchangelogs -a $(BUILD_DIR)/ChangeLog
dh_strip -a -Nlibgtk$(apiver)-dbg
dh_strip -a --dbg-package=libgtk$(apiver)-$(soname)
dh_compress -a
dh_fixperms -a
dh_makeshlibs -a -Nlibgtk$(apiver)-dbg

2
debian/scripts/vars vendored
View File

@ -8,7 +8,7 @@
SOURCE_DIR=build-tree
# For a single pkg, this is the directory that is embedded in the tarball.
# For multiple pkgs, this is null.
TAR_DIR=gtk+-2.4.13
TAR_DIR=gtk+-2.6.0
# Where to place all the stamp files. This directory can be removed, and
# all the targets will then be rerun.
STAMP_DIR=debian/stampdir

2
debian/sources vendored
View File

@ -1 +1 @@
upstream tar ../gtk+-2.4.13.tar.gz
upstream tar ../gtk+-2.6.0.tar.gz

View File

@ -2,14 +2,15 @@
set -e
TMPFILE=`mktemp /tmp/gtk+-2.4.3.XXXXXXXXXX`
defaultver=2.4.0
TMPFILE=`mktemp /tmp/gtk+-2.5.6.XXXXXXXXXX`
defaultver=2.5.0
if [ "x$1" != "x" ]; then
VERSION=`echo $1 | sed -e 's/-[A-Za-z0-9\.]*$//' -e 's/+[A-Za-z0-9\.]*$//'`
else
VERSION=$defaultver
fi
VERSION=2.4.0
apiver=2.0
shortver=`echo $VERSION | sed -e 's/\.[0-9]*$//'`

View File

@ -10,6 +10,7 @@ if [ "x$1" != "x" ]; then
else
VERSION=$defaultver
fi
VERSION=2.4.0
apiver=2.0
shortver=`echo $VERSION | sed -e 's/\.[0-9]*$//'`

View File

@ -2,16 +2,16 @@
set -e
TMPFILE=`mktemp /tmp/gtk+-2.4.3.XXXXXXXXXX`
TMPFILE=`mktemp /tmp/gtk+-2.5.6.XXXXXXXXXX`
apiver=2.0
defaultver=2.4.0
defaultver=2.5.0
if [ "x$1" != "x" ]; then
VERSION=`echo $1 | sed -e 's/-[A-Za-z0-9\.]*$//' -e 's/+[A-Za-z0-9\.]*$//'`
else
VERSION=$defaultver
fi
VERSION=2.4.0
if ! test -d /usr/lib/gtk-$apiver/$VERSION/immodules; then
echo "You don't have immodules directory for version $VERSION."
echo "Use default version instead."
@ -19,7 +19,7 @@ if ! test -d /usr/lib/gtk-$apiver/$VERSION/immodules; then
fi
echo -n "Updating the IM modules list for GTK+-$VERSION..."
/usr/bin/gtk-query-immodules-$apiver `find /usr/lib/gtk-$apiver/$VERSION/immodules -name '*.so'` > $TMPFILE
/usr/bin/gtk-query-immodules-$apiver `find /usr/lib/gtk-$apiver/2.4.0/immodules -name '*.so'` > $TMPFILE
if [ "x`cat $TMPFILE | grep -v '^#'`" = "x" ]; then
echo "the GTK+ IM modules was not found."
else

View File

@ -11,7 +11,7 @@ if [ "x$1" != "x" ]; then
else
VERSION=$defaultver
fi
VERSION=2.4.0
if ! test -d /usr/lib/gtk-$apiver/$VERSION/immodules; then
echo "You don't have immodules directory for version $VERSION."
echo "Use default version instead."
@ -19,7 +19,7 @@ if ! test -d /usr/lib/gtk-$apiver/$VERSION/immodules; then
fi
echo -n "Updating the IM modules list for GTK+-$VERSION..."
/usr/bin/gtk-query-immodules-$apiver `find /usr/lib/gtk-$apiver/$VERSION/immodules -name '*.so'` > $TMPFILE
/usr/bin/gtk-query-immodules-$apiver `find /usr/lib/gtk-$apiver/2.4.0/immodules -name '*.so'` > $TMPFILE
if [ "x`cat $TMPFILE | grep -v '^#'`" = "x" ]; then
echo "the GTK+ IM modules was not found."
else

2
debian/watch vendored
View File

@ -1,4 +1,4 @@
version=2
ftp://ftp.gnome.org/pub/GNOME/sources/gtk+/2.4/ \
ftp://ftp.gnome.org/pub/GNOME/sources/gtk+/2.6/ \
gtk\+-(.*)\.tar\.gz \
debian uupdate