gtk+2.0 (2.4.0-3) experimental; urgency=low

* Akira TAGOH <tagoh@debian.org>
  + debian/rules:
    - modified the sed script to strip the version properly.
      (closes: Bug#241860)
    - clean up.
  + debian/control:
    - updated the dependencies for the separated xlibs-dev. (from 2.2.4-4)
    - separated arch-independent data to libgtk2.0-data package.
      (from 2.2.4-4)
                                                                                
 -- Akira TAGOH <tagoh@debian.org>  Fri, 23 Apr 2004 22:43:58 +0900
This commit is contained in:
Akira TAGOH 2004-04-23 14:47:23 +00:00
parent 793be6a582
commit 48de7fd6df
8 changed files with 72 additions and 80 deletions

24
debian/changelog vendored
View File

@ -1,11 +1,16 @@
gtk+2.0 (2.4.0-3) UNRELEASED; urgency=low
gtk+2.0 (2.4.0-3) experimental; urgency=low
* Akira TAGOH <tagoh@debian.org>
+ debian/rules:
- modified the sed script to strip the version properly.
(closes: Bug#241860)
- clean up.
+ debian/control:
- updated the dependencies for the separated xlibs-dev. (from 2.2.4-4)
- separated arch-independent data to libgtk2.0-data package.
(from 2.2.4-4)
-- Akira TAGOH <tagoh@debian.org> Mon, 5 Apr 2004 22:16:26 +0900
-- Akira TAGOH <tagoh@debian.org> Fri, 23 Apr 2004 22:43:58 +0900
gtk+2.0 (2.4.0-2) experimental; urgency=low
@ -56,6 +61,21 @@ gtk+2.0 (2.4.0-1) experimental; urgency=low
-- Sebastien Bacher <seb128@debian.org> Mon, 22 Mar 2004 22:00:09 +0100
gtk+2.0 (2.2.4-4) unstable; urgency=low
* Akira TAGOH <tagoh@debian.org>
+ debian/rules:
- bumped the shlib version to 2.2.1-3. (closes: Bug#208671)
+ debian/control:
- separated arch-independent data to libgtk2.0-data package.
(closes: Bug#233396)
- fixed the dependencies for the separated xlibs-dev.
(closes: Bug#241782, Bug#241522)
+ debian/libgtk2.0-data.{dir,files}:
- added.
-- Akira TAGOH <tagoh@debian.org> Thu, 22 Apr 2004 00:42:02 +0900
gtk+2.0 (2.2.4-3) unstable; urgency=low
* debian/patches/:

22
debian/control vendored
View File

@ -2,15 +2,15 @@ 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>, Andrew Lau <netsnipe@users.sourceforge.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>, Johannes Rohr <j.rohr@comlink.org>, Jordi Mallach <jordi@debian.org>, Jose Carlos Garcia Sogo <jsogo@debian.org>, Josselin Mouette <joss@debian.org>, Ondřej Surý <ondrej@debian.org>, Rob Bradford <rob@debianplanet.org>, Robert McQueen <robot101@debian.org>, Ross Burton <ross@burtonini.com>, Sebastien Bacher <seb128@debian.org>, Takuo KITAME <kitame@debian.org>
Build-Depends: debhelper (>> 4.0.0), gettext, pkg-config, libglib2.0-dev (>= 2.4.0-1), libpango1.0-dev (>= 1.4.0-1), libatk1.0-dev (>= 1.6.0-1), xlibs-pic (>= 4.2.1-6), xlibs-dev, libxcursor-dev, libtiff3g-dev, libjpeg62-dev, libpng12-dev, docbook-utils, linuxdoc-tools-text, gnome-pkg-tools
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>, Johannes Rohr <j.rohr@comlink.org>, Jordi Mallach <jordi@debian.org>, Jose Carlos Garcia Sogo <jsogo@debian.org>, Josselin Mouette <joss@debian.org>, Ondřej Surý <ondrej@debian.org>, Rob Bradford <rob@debianplanet.org>, Rob Taylor <robtaylor@fastmail.fm>, 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.0-1), libpango1.0-dev (>= 1.4.0-1), libatk1.0-dev (>= 1.6.0-1), 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, libxrender-dev, libxft-dev, libxcursor-dev, libtiff3g-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
Package: libgtk2.0-0
Section: libs
Architecture: any
Depends: libgtk2.0-common (>= ${Source-Version}), ${shlibs:Depends}
Depends: libgtk2.0-common (>= ${Source-Version}), libgtk2.0-data (>= ${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
Replaces: libgtk2.0-0png3
Description: The GTK+ graphical user interface library
@ -35,10 +35,24 @@ Description: Common files for the GTK+ graphical user interface library
.
This package contains the common files which the libraries need.
Package: libgtk2.0-data
Section: misc
Architecture: all
Depends: ${misc:Depends}
Replaces: libgtk2.0-common (<= 2.4.0-2)
Packagcription: Data files for 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
for projects ranging from small one-off tools to complete application
suites.
.
This package contains the data files which the libraries need.
Package: libgtk2.0-dev
Section: libdevel
Architecture: any
Depends: libgtk2.0-0 (= ${Source-Version}), libglib2.0-dev (>= 2.4.0-1), libpango1.0-dev (>= 1.4.0-1), libatk1.0-dev (>= 1.6.0-1), xlibs-dev, pkg-config
Depends: libgtk2.0-0 (= ${Source-Version}), libglib2.0-dev (>= 2.4.0-1), libpango1.0-dev (>= 1.4.0-1), libatk1.0-dev (>= 1.6.0-1), libx11-dev | xlibs-dev, pkg-config
Suggests: libgtk2.0-doc
Replaces: libgtk1.3-dev
Conflicts: libgtk1.3-dev

19
debian/control.in vendored
View File

@ -3,14 +3,14 @@ Section: libs
Priority: optional
Maintainer: Akira TAGOH <tagoh@debian.org>
Uploaders: @GNOME_TEAM@
Build-Depends: debhelper (>> 4.0.0), gettext, pkg-config, libglib2.0-dev (>= 2.4.0-1), libpango1.0-dev (>= 1.4.0-1), libatk1.0-dev (>= 1.6.0-1), xlibs-pic (>= 4.2.1-6), xlibs-dev, libxcursor-dev, libtiff3g-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.4.0-1), libpango1.0-dev (>= 1.4.0-1), libatk1.0-dev (>= 1.6.0-1), 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, libtiff3g-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
Package: libgtk2.0-@SONAME@
Section: libs
Architecture: any
Depends: libgtk2.0-common (>= ${Source-Version}), ${shlibs:Depends}
Depends: libgtk2.0-common (>= ${Source-Version}), libgtk2.0-data (>= ${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
Replaces: libgtk2.0-0png3
Description: The GTK+ graphical user interface library
@ -35,10 +35,23 @@ Description: Common files for the GTK+ graphical user interface library
.
This package contains the common files which the libraries need.
Package: libgtk2.0-data
Section: misc
Architecture: all
Depends: ${misc:Depends}
Replaces: libgtk2.0-common (<= 2.4.0-2)
Description: Data files for 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
for projects ranging from small one-off tools to complete application
suites.
.
This package contains the data files which the libraries need.
Package: libgtk2.0-dev
Section: libdevel
Architecture: any
Depends: libgtk2.0-@SONAME@ (= ${Source-Version}), libglib2.0-dev (>= 2.4.0-1), libpango1.0-dev (>= 1.4.0-1), libatk1.0-dev (>= 1.6.0-1), xlibs-dev, pkg-config
Depends: libgtk2.0-@SONAME@ (= ${Source-Version}), libglib2.0-dev (>= 2.4.0-1), libpango1.0-dev (>= 1.4.0-1), libatk1.0-dev (>= 1.6.0-1), libx11-dev | xlibs-dev, pkg-config
Suggests: libgtk2.0-doc
Replaces: libgtk1.3-dev
Conflicts: libgtk1.3-dev

View File

@ -1,5 +1,3 @@
usr/bin
usr/sbin
usr/share/locale
usr/share/themes
etc/gtk-2.0

View File

@ -1,5 +1,3 @@
usr/bin/gtk-query-immodules-2.0
usr/bin/gdk-pixbuf-query-loaders
usr/share/locale/*
usr/share/themes/*
etc/gtk-2.0/*

2
debian/libgtk2.0-data.dirs vendored Normal file
View File

@ -0,0 +1,2 @@
usr/share/locale
usr/share/themes

2
debian/libgtk2.0-data.files vendored Normal file
View File

@ -0,0 +1,2 @@
/usr/share/locale/*
/usr/share/themes/*

79
debian/rules vendored
View File

@ -7,7 +7,6 @@ include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
BUILD_DIR=$(SOURCE_DIR)/$(TAR_DIR)
BUILD_SHARED_DIR=$(SOURCE_DIR)/$(TAR_DIR)-shared
BUILD_STATIC_DIR=$(SOURCE_DIR)/$(TAR_DIR)-static
BUILD_INDEP_DIR=$(SOURCE_DIR)/$(TAR_DIR)-indep
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
@ -60,10 +59,6 @@ $(STAMP_DIR)/extract-stamp:
-test -r /usr/share/misc/config.guess && \
cp -f /usr/share/misc/config.guess $(BUILD_DIR)/config.guess
-rm -rf $(BUILD_DIR)/docs/faq/html
-rm -rf $(BUILD_DIR)/docs/reference/gtk/html
-rm -rf $(BUILD_DIR)/docs/tutorial/html
touch $@
configure-shared: extract $(STAMP_DIR)/configure-shared-stamp
@ -121,52 +116,8 @@ $(STAMP_DIR)/configure-static-stamp:
touch $@
configure-indep: extract $(STAMP_DIR)/configure-indep-stamp
$(STAMP_DIR)/configure-indep-stamp:
dh_testdir
cp -ar $(BUILD_DIR) $(BUILD_INDEP_DIR)
# Add here commands to configure the package.
cd $(BUILD_INDEP_DIR) && \
./configure --host=$(DEB_HOST_GNU_TYPE) \
--build=$(DEB_BUILD_GNU_TYPE) \
--prefix=/usr \
--mandir=\$${prefix}/share/man \
--infodir=\$${prefix}/share/info \
--sysconfdir=/etc \
--with-html-dir=\$${prefix}/share/doc/libgtk$(apiver)-doc \
--with-xinput=yes \
--enable-shared \
--disable-static \
--enable-gtk-doc
cd $(BUILD_INDEP_DIR) && \
sed < libtool > libtool-2 \
-e 's/^hardcode_libdir_flag_spec.*$$/hardcode_libdir_flag_spec=" -D__LIBTOOL_IS_A_FOOL__ "/' \
-e '/^archive_cmds="/s/"$$/ \\$$deplibs"/' && \
mv libtool-2 libtool
touch $@
configure: configure-static configure-shared
build-indep: debian/control configure-indep $(STAMP_DIR)/build-indep-stamp
$(STAMP_DIR)/build-indep-stamp:
dh_testdir
-rm -f $(STAMP_DIR)/install-test-stamp
$(MAKE) -C $(BUILD_INDEP_DIR) \
LD_LIBRARY_PATH=$(libpath):$(LD_LIBRARY_PATH)
# regenerating html files
# -- needs to update due to applying the patches.
$(MAKE) -C $(BUILD_INDEP_DIR)/docs/faq html
$(MAKE) -C $(BUILD_INDEP_DIR)/docs/reference
$(MAKE) -C $(BUILD_INDEP_DIR)/docs/tutorial html
touch $@
build-shared: debian/control configure-shared $(STAMP_DIR)/build-shared-stamp
$(STAMP_DIR)/build-shared-stamp:
dh_testdir
@ -226,25 +177,18 @@ install-static: build-static install-test
RUN_QUERY_IMMODULES_TEST=false \
RUN_QUERY_LOADER_TEST=false
install-indep: build-indep install-test
$(MAKE) -C $(BUILD_INDEP_DIR)/docs install \
DESTDIR=$(CURDIR)/debian/libgtk$(apiver)-doc
# we don't want to manpages in -doc
-rm -rf $(CURDIR)/debian/libgtk$(apiver)-doc/usr/share/man/
# for -doc
cp -a $(BUILD_INDEP_DIR)/docs/faq/html debian/libgtk$(apiver)-doc/usr/share/doc/libgtk$(apiver)-doc/gtk-faq/
cp -a $(BUILD_INDEP_DIR)/docs/tutorial/html debian/libgtk$(apiver)-doc/usr/share/doc/libgtk$(apiver)-doc/gtk-tutorial/
cp -ar $(BUILD_INDEP_DIR)/docs/tutorial/images debian/libgtk$(apiver)-doc/usr/share/doc/libgtk$(apiver)-doc/gtk-tutorial/
cp $(BUILD_INDEP_DIR)/docs/*.txt debian/libgtk$(apiver)-doc/usr/share/doc/libgtk$(apiver)-doc
install: install-static install-shared
# generating debian files from .in
for f in `find debian/ -name "[^c]*.in"`; do \
sed -e "s/@VERSION@/${version}/g" -e "s/@MODVER@/${modver}/g" -e "s/@APIVER@/${apiver}/g" $$f > `echo $$f | sed -e "s/\.in//"`; \
done
# for -doc
cp -a $(BUILD_SHARED_DIR)/docs/faq/html debian/libgtk$(apiver)-doc/usr/share/doc/libgtk$(apiver)-doc/gtk-faq/
cp -a $(BUILD_SHARED_DIR)/docs/tutorial/html debian/libgtk$(apiver)-doc/usr/share/doc/libgtk$(apiver)-doc/gtk-tutorial/
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
@ -274,12 +218,14 @@ install: install-static install-shared
install -d $(CURDIR)/debian/libgtk$(apiver)-common/etc/gtk-$(apiver)
# Build architecture-independent files here.
binary-indep: build build-indep install-indep
binary-indep: build install
dh_testdir -i
dh_testroot -i
dh_installdocs -i
rm -rf $(CURDIR)/debian/libgtk$(apiver)-data/usr/share/doc/libgtk$(apiver)-data
dh_link -plibgtk$(apiver)-doc \
usr/share/doc/libglib$(glibver)-doc/glib \
usr/share/doc/libgtk$(apiver)-doc/glib
@ -292,6 +238,9 @@ binary-indep: build build-indep install-indep
dh_link -plibgtk$(apiver)-doc \
usr/share/doc/libpango$(pangover)-doc/pango \
usr/share/doc/libgtk$(apiver)-doc/pango
dh_link -plibgtk$(apiver)-data \
usr/share/doc/libgtk$(apiver)-$(soname)$(suffix) \
usr/share/doc/libgtk$(apiver)-data
# create symlinks in /usr/share/gtk-doc/html
for i in gdk gdk-pixbuf gtk gtk-faq gtk-tutorial; do \
@ -321,7 +270,6 @@ binary-arch: build install
rm -rf $(CURDIR)/debian/libgtk$(apiver)-dbg/usr/share/doc/libgtk$(apiver)-dbg
rm -rf $(CURDIR)/debian/libgtk$(apiver)-dev/usr/share/doc/libgtk$(apiver)-dev
rm -rf $(CURDIR)/debian/libgtk$(apiver)-common/usr/share/doc/libgtk$(apiver)-common
rm -rf $(CURDIR)/debian/libgtk-common/usr/share/doc/libgtk-common
dh_link -plibgtk$(apiver)-dbg \
usr/share/doc/libgtk$(apiver)-$(soname)$(suffix) \
@ -332,9 +280,6 @@ binary-arch: build install
dh_link -plibgtk$(apiver)-common \
usr/share/doc/libgtk$(apiver)-$(soname)$(suffix) \
usr/share/doc/libgtk$(apiver)-common
dh_link -plibgtk-common \
usr/share/doc/libgtk$(apiver)-common \
usr/share/doc/libgtk-common
dh_installexamples -a