* New upstream release; no API change.
- Switch from tar-in-tar and sys-build to regular source and quilt
patching; build-depend on quilt; remove occurrences of $(TOP_SRC_DIR)
and @TOP_SRC_DIR@ which isn't needed anymore.
- Refresh patch 021_loader-files-d.
- Relibtoolize: update path 070_mandatory-relibtoolize.
This commit is contained in:
Loïc Minier
11
debian/changelog
vendored
11
debian/changelog
vendored
@ -1,3 +1,14 @@
|
||||
gtk+2.0 (2.10.4-1) experimental; urgency=low
|
||||
|
||||
* New upstream release; no API change.
|
||||
- Switch from tar-in-tar and sys-build to regular source and quilt
|
||||
patching; build-depend on quilt; remove occurrences of $(TOP_SRC_DIR)
|
||||
and @TOP_SRC_DIR@ which isn't needed anymore.
|
||||
- Refresh patch 021_loader-files-d.
|
||||
- Relibtoolize: update path 070_mandatory-relibtoolize.
|
||||
|
||||
-- Loic Minier <lool@dooz.org> Sat, 23 Sep 2006 10:41:17 +0200
|
||||
|
||||
gtk+2.0 (2.10.3-3) experimental; urgency=medium
|
||||
|
||||
* Update patch 021_loader-files-d to not warn about missing module files or
|
||||
|
||||
2
debian/control
vendored
2
debian/control
vendored
@ -3,7 +3,7 @@ Section: libs
|
||||
Priority: optional
|
||||
Maintainer: Sebastien Bacher <seb128@debian.org>
|
||||
Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Andrew Lau <netsnipe@users.sourceforge.net>, Clément Stenac <zorglub@debian.org>, Dafydd Harries <daf@debian.org>, Guilherme de S. Pastore <gpastore@debian.org>, Gustavo Franco <stratus@debian.org>, Gustavo Noronha Silva <kov@debian.org>, J.H.M. Dassen (Ray) <jdassen@debian.org>, Jordi Mallach <jordi@debian.org>, Jose Carlos Garcia Sogo <jsogo@debian.org>, Josselin Mouette <joss@debian.org>, Loic Minier <lool@dooz.org>, Marc 'HE' Brockschmidt <he@debian.org>, Marco Cabizza <marco87@gmail.com>, Oystein Gisnas <oystein@gisnas.net>, Ondřej Surý <ondrej@debian.org>, Ross Burton <ross@debian.org>, Sjoerd Simons <sjoerd@debian.org>
|
||||
Build-Depends: debhelper (>= 5.0.22), gettext, pkg-config, libglib2.0-dev (>= 2.12.0), libpango1.0-dev (>= 1.12.1-2), libatk1.0-dev (>= 1.9.0), libx11-dev (>= 2:1.0.0-6), libxext-dev, libxi-dev, libxrandr-dev, libxt-dev, libxrender-dev, libxft-dev, libxcursor-dev, libxkbfile-dev, libxinerama-dev, libxfixes-dev, libcairo2-dev (>= 1.2.0), libcairo-directfb2-dev (>= 1.2.4-2), libtiff4-dev, libjpeg62-dev, libpng12-dev, docbook-utils, linuxdoc-tools-text, gnome-pkg-tools, chrpath, dpkg-dev (>= 1.13.19), x11proto-xext-dev, libdirectfb-dev (>= 0.9.24), libcupsys2-dev (>= 1.2)
|
||||
Build-Depends: debhelper (>= 5.0.22), gettext, pkg-config, libglib2.0-dev (>= 2.12.0), libpango1.0-dev (>= 1.12.1-2), libatk1.0-dev (>= 1.9.0), libx11-dev (>= 2:1.0.0-6), libxext-dev, libxi-dev, libxrandr-dev, libxt-dev, libxrender-dev, libxft-dev, libxcursor-dev, libxkbfile-dev, libxinerama-dev, libxfixes-dev, libcairo2-dev (>= 1.2.0), libcairo-directfb2-dev (>= 1.2.4-2), libtiff4-dev, libjpeg62-dev, libpng12-dev, docbook-utils, linuxdoc-tools-text, gnome-pkg-tools, chrpath, dpkg-dev (>= 1.13.19), x11proto-xext-dev, libdirectfb-dev (>= 0.9.24), libcupsys2-dev (>= 1.2), quilt
|
||||
Build-Depends-Indep: gtk-doc-tools, docbook-xml
|
||||
Standards-Version: 3.7.2
|
||||
|
||||
|
||||
2
debian/control.in
vendored
2
debian/control.in
vendored
@ -3,7 +3,7 @@ Section: libs
|
||||
Priority: optional
|
||||
Maintainer: Sebastien Bacher <seb128@debian.org>
|
||||
Uploaders: @GNOME_TEAM@
|
||||
Build-Depends: debhelper (>= 5.0.22), gettext, pkg-config, libglib2.0-dev (>= 2.12.0), libpango1.0-dev (>= 1.12.1-2), libatk1.0-dev (>= 1.9.0), libx11-dev (>= 2:1.0.0-6), libxext-dev, libxi-dev, libxrandr-dev, libxt-dev, libxrender-dev, libxft-dev, libxcursor-dev, libxkbfile-dev, libxinerama-dev, libxfixes-dev, libcairo2-dev (>= 1.2.0), libcairo-directfb2-dev (>= 1.2.4-2), libtiff4-dev, libjpeg62-dev, libpng12-dev, docbook-utils, linuxdoc-tools-text, gnome-pkg-tools, chrpath, dpkg-dev (>= 1.13.19), x11proto-xext-dev, libdirectfb-dev (>= 0.9.24), libcupsys2-dev (>= 1.2)
|
||||
Build-Depends: debhelper (>= 5.0.22), gettext, pkg-config, libglib2.0-dev (>= 2.12.0), libpango1.0-dev (>= 1.12.1-2), libatk1.0-dev (>= 1.9.0), libx11-dev (>= 2:1.0.0-6), libxext-dev, libxi-dev, libxrandr-dev, libxt-dev, libxrender-dev, libxft-dev, libxcursor-dev, libxkbfile-dev, libxinerama-dev, libxfixes-dev, libcairo2-dev (>= 1.2.0), libcairo-directfb2-dev (>= 1.2.4-2), libtiff4-dev, libjpeg62-dev, libpng12-dev, docbook-utils, linuxdoc-tools-text, gnome-pkg-tools, chrpath, dpkg-dev (>= 1.13.19), x11proto-xext-dev, libdirectfb-dev (>= 0.9.24), libcupsys2-dev (>= 1.2), quilt
|
||||
Build-Depends-Indep: gtk-doc-tools, docbook-xml
|
||||
Standards-Version: 3.7.2
|
||||
|
||||
|
||||
2
debian/gtk2.0-examples.examples
vendored
Normal file
2
debian/gtk2.0-examples.examples
vendored
Normal file
@ -0,0 +1,2 @@
|
||||
# from the source
|
||||
examples/*
|
||||
2
debian/gtk2.0-examples.examples.in
vendored
2
debian/gtk2.0-examples.examples.in
vendored
@ -1,2 +0,0 @@
|
||||
# from the source
|
||||
@TOP_SRC_DIR@/examples/*
|
||||
6
debian/libgtk2.0-doc.install.in
vendored
6
debian/libgtk2.0-doc.install.in
vendored
@ -8,6 +8,6 @@ debian/tmp/install/shared/usr/share/doc/@DOC_PKG@ usr/share/doc
|
||||
# from the source
|
||||
# XXX FAQ and Tutorial disabled for now, upstream seems to not
|
||||
# have docbook
|
||||
#@TOP_SRC_DIR@/docs/faq/html usr/share/doc/@DOC_PKG@/gtk-faq
|
||||
#@TOP_SRC_DIR@/docs/gtk-tutorial/html usr/share/doc/@DOC_PKG@/gtk-tutorial
|
||||
@TOP_SRC_DIR@/docs/*.txt usr/share/doc/@DOC_PKG@
|
||||
#docs/faq/html usr/share/doc/@DOC_PKG@/gtk-faq
|
||||
#docs/gtk-tutorial/html usr/share/doc/@DOC_PKG@/gtk-tutorial
|
||||
docs/*.txt usr/share/doc/@DOC_PKG@
|
||||
|
||||
11
debian/patches/021_loader-files-d.patch
vendored
11
debian/patches/021_loader-files-d.patch
vendored
@ -1,6 +1,7 @@
|
||||
diff -urN -p gtk+-2.10.3.orig/gdk-pixbuf/gdk-pixbuf-io.c gtk+-2.10.3/gdk-pixbuf/gdk-pixbuf-io.c
|
||||
--- gtk+-2.10.3.orig/gdk-pixbuf/gdk-pixbuf-io.c 2006-09-21 11:16:58.000000000 +0200
|
||||
+++ gtk+-2.10.3/gdk-pixbuf/gdk-pixbuf-io.c 2006-09-21 11:18:35.000000000 +0200
|
||||
Index: gtk+2.0-2.10.4/gdk-pixbuf/gdk-pixbuf-io.c
|
||||
===================================================================
|
||||
--- gtk+2.0-2.10.4.orig/gdk-pixbuf/gdk-pixbuf-io.c 2006-09-10 08:33:10.000000000 +0200
|
||||
+++ gtk+2.0-2.10.4/gdk-pixbuf/gdk-pixbuf-io.c 2006-09-23 10:17:46.000000000 +0200
|
||||
@@ -45,6 +45,9 @@
|
||||
#undef STRICT
|
||||
#endif
|
||||
@ -11,7 +12,7 @@ diff -urN -p gtk+-2.10.3.orig/gdk-pixbuf/gdk-pixbuf-io.c gtk+-2.10.3/gdk-pixbuf/
|
||||
static gint
|
||||
format_check (GdkPixbufModule *module, guchar *buffer, int size)
|
||||
{
|
||||
@@ -282,28 +285,93 @@ gdk_pixbuf_get_module_file (void)
|
||||
@@ -282,28 +285,93 @@
|
||||
return result;
|
||||
}
|
||||
|
||||
@ -116,7 +117,7 @@ diff -urN -p gtk+-2.10.3.orig/gdk-pixbuf/gdk-pixbuf-io.c gtk+-2.10.3/gdk-pixbuf/
|
||||
while (!have_error && g_io_channel_read_line (channel, &line_buf, NULL, &term, NULL) == G_IO_STATUS_NORMAL) {
|
||||
const char *p;
|
||||
|
||||
@@ -436,8 +504,81 @@ gdk_pixbuf_io_init (void)
|
||||
@@ -436,8 +504,81 @@
|
||||
g_free (line_buf);
|
||||
}
|
||||
g_string_free (tmp_buf, TRUE);
|
||||
|
||||
30102
debian/patches/070_mandatory-relibtoolize.patch
vendored
30102
debian/patches/070_mandatory-relibtoolize.patch
vendored
File diff suppressed because it is too large
Load Diff
11
debian/patches/series
vendored
Normal file
11
debian/patches/series
vendored
Normal file
@ -0,0 +1,11 @@
|
||||
000_gtk+-2.0.6-exportsymbols.patch
|
||||
001_static-linking-dont-query-immodules.patch
|
||||
002_static-linking-dont-build-perf.patch
|
||||
003_default_fallback_icon_theme.patch
|
||||
004_gtk+-ximian-gtk2-filesel-navbutton-5.patch
|
||||
005_xpmico.patch
|
||||
007_implicit_pointer_conversion_gdkdrawable_directfb.patch
|
||||
008_implicit_pointer_conversion_gdkgc_directfb.patch
|
||||
020_immodules-files-d.patch
|
||||
021_loader-files-d.patch
|
||||
070_mandatory-relibtoolize.patch
|
||||
46
debian/rules
vendored
46
debian/rules
vendored
@ -1,7 +1,5 @@
|
||||
#!/usr/bin/make -f
|
||||
|
||||
include debian/scripts/vars
|
||||
|
||||
# Members list of Debian GNOME Maintainers
|
||||
TEAM_LIST ?= /usr/share/gnome-pkg-tools/pkg-gnome.team
|
||||
|
||||
@ -9,12 +7,13 @@ TEAM_LIST ?= /usr/share/gnome-pkg-tools/pkg-gnome.team
|
||||
maintainer := $(shell sed -n 's/^Maintainer: //p' debian/control.in)
|
||||
uploaders := $(shell grep -vF '$(maintainer)' $(TEAM_LIST))
|
||||
|
||||
# relative path to the top directory of the unpacked tarball
|
||||
TOP_SRC_DIR := $(SOURCE_DIR)/$(TAR_DIR)
|
||||
|
||||
# Uncomment this to turn on verbose mode.
|
||||
#export DH_VERBOSE=1
|
||||
|
||||
STAMP_DIR := debian/stampdir
|
||||
|
||||
PATCH_DIR=debian/patches
|
||||
|
||||
# These are used for cross-compiling and for saving the configure script
|
||||
# from having to guess our platform (since we know it already)
|
||||
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
|
||||
@ -118,22 +117,27 @@ dh_subst_files = $(patsubst %.in,%,$(wildcard $(addprefix debian/, $(addsuffix *
|
||||
debian/dh_gtkmodules.1: debian/dh_gtkmodules
|
||||
cd debian && pod2man -c "Gtk" -r "$(DEBVERSION)" dh_gtkmodules dh_gtkmodules.1
|
||||
|
||||
extract: $(STAMP_DIR)/extract-stamp
|
||||
patch: $(STAMP_DIR)/patch-stamp
|
||||
|
||||
$(STAMP_DIR)/extract-stamp:
|
||||
$(STAMP_DIR)/patch-stamp:
|
||||
dh_testdir
|
||||
$(MAKE) -f debian/sys-build.mk source.make
|
||||
mkdir $(STAMP_DIR)
|
||||
# apply patches
|
||||
QUILT_PATCHES=$(PATCH_DIR) quilt --quiltrc /dev/null push -a || test $$? = 2
|
||||
# backup the original files to restore them in the clean target
|
||||
-test -r config.sub && cp config.sub config.sub.orig
|
||||
-test -r config.guess && cp config.guess config.guess.orig
|
||||
-test -r /usr/share/misc/config.sub && \
|
||||
cp -f /usr/share/misc/config.sub $(TOP_SRC_DIR)/config.sub
|
||||
cp -f /usr/share/misc/config.sub config.sub
|
||||
-test -r /usr/share/misc/config.guess && \
|
||||
cp -f /usr/share/misc/config.guess $(TOP_SRC_DIR)/config.guess
|
||||
cp -f /usr/share/misc/config.guess config.guess
|
||||
touch $@
|
||||
|
||||
$(STAMP_DIR)/configure-stamp-%: $(STAMP_DIR)/extract-stamp
|
||||
$(STAMP_DIR)/configure-stamp-%: $(STAMP_DIR)/patch-stamp
|
||||
dh_testdir
|
||||
mkdir -p $(builddir)
|
||||
cd $(builddir) && \
|
||||
$(CURDIR)/$(TOP_SRC_DIR)/configure $($*_configure_flags)
|
||||
$(CURDIR)/configure $($*_configure_flags)
|
||||
cd $(builddir) && \
|
||||
sed < libtool > libtool-2 \
|
||||
-e 's/^hardcode_libdir_flag_spec.*$$/hardcode_libdir_flag_spec=" -D__LIBTOOL_IS_A_FOOL__ "/' \
|
||||
@ -165,7 +169,6 @@ debian/%: debian/%.in force
|
||||
-e "s#@SONAME@#$(SONAME)#g" \
|
||||
-e "s#@APIVER@#$(APIVER)#g" \
|
||||
-e "s#@VERSION@#$(VERSION)#g" \
|
||||
-e "s#@TOP_SRC_DIR@#$(TOP_SRC_DIR)#g" \
|
||||
-e "s#@GTK_BINVER_DEP@#$(GTK_BINVER_DEP)#g" \
|
||||
-e "s#@SHARED_PKG@#$(SHARED_PKG)#g" \
|
||||
-e "s#@COMMON_PKG@#$(COMMON_PKG)#g" \
|
||||
@ -186,18 +189,23 @@ debian/%: debian/%.in force
|
||||
clean: debian/control
|
||||
dh_testdir
|
||||
dh_testroot
|
||||
# restore files from backup (before unpatching)
|
||||
-test -r config.sub.orig && mv -f config.sub.orig config.sub
|
||||
-test -r config.guess.orig && mv -f config.guess.orig config.guess
|
||||
# unapply patches, if any
|
||||
QUILT_PATCHES=$(PATCH_DIR) quilt --quiltrc /dev/null pop -a -R || test $$? = 2
|
||||
-rm -rf .pc
|
||||
-rm -rf $(STAMP_DIR)
|
||||
-rm -f $(call dh_subst_files,$(ALL_PKGS))
|
||||
-rm -f debian/update-gdkpixbuf-loaders debian/update-gtk-immodules debian/dh_gtkmodules debian/dh_gtkmodules.1
|
||||
$(MAKE) -f debian/sys-build.mk source.clean
|
||||
dh_clean
|
||||
|
||||
binary-indep: build install $(call dh_subst_files,$(BINARY_INDEP_PKGS))
|
||||
dh_testdir
|
||||
dh_testroot
|
||||
dh_install -i
|
||||
dh_installchangelogs -i -N$(BIN_PKG) $(TOP_SRC_DIR)/ChangeLog $(TOP_SRC_DIR)/ChangeLog.*
|
||||
dh_installdocs -i -N$(BIN_PKG) $(TOP_SRC_DIR)/NEWS $(TOP_SRC_DIR)/NEWS.pre-1-0 $(TOP_SRC_DIR)/README
|
||||
dh_installchangelogs -i -N$(BIN_PKG) ChangeLog ChangeLog.*
|
||||
dh_installdocs -i -N$(BIN_PKG) NEWS NEWS.pre-1-0 README
|
||||
dh_installman -i
|
||||
dh_link -i
|
||||
dh_compress -i
|
||||
@ -219,8 +227,8 @@ binary-arch: build install $(call dh_subst_files,$(BINARY_ARCH_PKGS)) debian/upd
|
||||
for f in update-gdkpixbuf-loaders update-gtk-immodules; do \
|
||||
chmod 755 debian/$(SHARED_PKG)/usr/lib/$(SHARED_PKG)/$$f; \
|
||||
done
|
||||
dh_installchangelogs -p$(EXAMPLES_PKG) -p$(PIXBUF_PKG) $(TOP_SRC_DIR)/ChangeLog $(TOP_SRC_DIR)/ChangeLog.*
|
||||
dh_installdocs -p$(EXAMPLES_PKG) -p$(PIXBUF_PKG) $(TOP_SRC_DIR)/NEWS $(TOP_SRC_DIR)/NEWS.pre-1-0 $(TOP_SRC_DIR)/README
|
||||
dh_installchangelogs -p$(EXAMPLES_PKG) -p$(PIXBUF_PKG) ChangeLog ChangeLog.*
|
||||
dh_installdocs -p$(EXAMPLES_PKG) -p$(PIXBUF_PKG) NEWS NEWS.pre-1-0 README
|
||||
# fix the permissions of the development package because it ships
|
||||
# dh_gtkmodules which we need to invoke in this build
|
||||
dh_fixperms -p$(DEV_PKG)
|
||||
@ -268,4 +276,4 @@ binary-arch: build install $(call dh_subst_files,$(BINARY_ARCH_PKGS)) debian/upd
|
||||
force:
|
||||
|
||||
binary: binary-indep binary-arch
|
||||
.PHONY: extract configure build install clean binary-indep binary-arch force binary
|
||||
.PHONY: patch configure build install clean binary-indep binary-arch force binary
|
||||
|
||||
11
debian/scripts/Makefile
vendored
11
debian/scripts/Makefile
vendored
@ -1,11 +0,0 @@
|
||||
#!/usr/bin/make -f
|
||||
all: sh.vars mk.vars
|
||||
|
||||
clean:
|
||||
rm -f sh.vars mk.vars
|
||||
|
||||
mk.vars: vars.build vars
|
||||
$(SHELL) vars.build vars make > $@
|
||||
sh.vars: vars.build vars
|
||||
$(SHELL) vars.build vars shell > $@
|
||||
|
||||
22
debian/scripts/archmap
vendored
22
debian/scripts/archmap
vendored
@ -1,22 +0,0 @@
|
||||
#!/bin/sh
|
||||
# i486 i386 i486 i586 pentium pentiumpro
|
||||
if [ $(basename $0) = archmap ];then
|
||||
if [ -z $1 ];then
|
||||
arch=$(dpkg --print-gnu-build-architecture)
|
||||
else
|
||||
arch=$1
|
||||
fi
|
||||
else
|
||||
if [ -z $arch ];then
|
||||
arch=$(dpkg --print-gnu-build-architecture)
|
||||
fi
|
||||
fi
|
||||
set -- $(egrep ".* $arch( .*|$)" debian/scripts/archmap)
|
||||
if [ -z $2 ];then
|
||||
arch=$arch
|
||||
else
|
||||
arch=$2
|
||||
fi
|
||||
if [ $(basename $0) = archmap ];then
|
||||
echo $arch
|
||||
fi
|
||||
56
debian/scripts/getglibcversion
vendored
56
debian/scripts/getglibcversion
vendored
@ -1,56 +0,0 @@
|
||||
#!/bin/sh
|
||||
# GNU C library version detection shell script.
|
||||
# Copyright 1999 Branden Robinson.
|
||||
# Licensed under the GNU General Public License, version 2. See the file
|
||||
# /usr/share/common-licenses/GPL or <http://www.gnu.org/copyleft/gpl.txt>.
|
||||
|
||||
# This script probably makes about a billion too many assumptions, but it's
|
||||
# better than hardcoding the glibc version on a per-architecture basis.
|
||||
|
||||
set -e
|
||||
|
||||
usage () {
|
||||
echo "Usage: getglibcversion [option]"
|
||||
echo " Where [option] may be one of:"
|
||||
echo " --major return major version only"
|
||||
echo " --minor return minor version only"
|
||||
echo " --point return ittybitty version only"
|
||||
echo "With no option, returns major.minor.ittybitty .";
|
||||
}
|
||||
|
||||
case $# in
|
||||
0) ;;
|
||||
1) case $1 in
|
||||
--help) usage
|
||||
exit 0 ;;
|
||||
--major) RETURN=1 ;;
|
||||
--minor) RETURN=2 ;;
|
||||
--point) RETURN=3 ;;
|
||||
*) exec 1>&2
|
||||
usage
|
||||
exit 1 ;;
|
||||
esac ;;
|
||||
*) exec 1>&2
|
||||
usage
|
||||
exit 1 ;;
|
||||
esac
|
||||
|
||||
LIBCLIST=$(cd /lib && ls libc-*.so)
|
||||
|
||||
case $(echo $LIBCLIST | wc -l | awk '{print $1}') in
|
||||
0) echo "No GNU C library found! Aborting." >&2
|
||||
exit 1 ;;
|
||||
1) ;;
|
||||
*) echo "Multiple versions of GNU C library found! Aborting." >&2
|
||||
exit 1 ;;
|
||||
esac
|
||||
|
||||
LIBCVERSION=$(echo $LIBCLIST | sed 's/libc-//;s/\.so//')
|
||||
|
||||
if [ -z $RETURN ]; then
|
||||
echo $LIBCVERSION
|
||||
else
|
||||
echo $LIBCVERSION | cut -d. -f$RETURN
|
||||
fi
|
||||
|
||||
exit 0
|
||||
198
debian/scripts/lib
vendored
198
debian/scripts/lib
vendored
@ -1,198 +0,0 @@
|
||||
#!/bin/sh
|
||||
if [ $(basename $0) = lib ];then
|
||||
make -C debian/scripts sh.vars
|
||||
. debian/scripts/sh.vars
|
||||
fi
|
||||
fetchmsg() {
|
||||
local msg
|
||||
msg=$1;shift
|
||||
eval echo $(sed -ne "s/^$(BASENAME):$msg://p" debian/scripts/messages)
|
||||
}
|
||||
START() {
|
||||
echo -n "$(fetchmsg START "$@") "
|
||||
}
|
||||
OK() {
|
||||
fetchmsg OK "$@"
|
||||
}
|
||||
FAILED() {
|
||||
fetchmsg FAILED "$@"
|
||||
}
|
||||
ALREADY_DONE() {
|
||||
fetchmsg ALREADY_DONE "$@"
|
||||
}
|
||||
|
||||
BASENAME() {
|
||||
local base
|
||||
if [ "$cmd" ];then
|
||||
base=$cmd
|
||||
else
|
||||
base=${0##*/}
|
||||
fi
|
||||
if [ x$base = x ];then
|
||||
echo "Danger, Will Robinson, Danger!" 1>&2
|
||||
echo "Bash is very confused." 1>&2
|
||||
exit 1
|
||||
fi
|
||||
if [ x$base = xlib ];then
|
||||
echo "You can't call this directly." 1>&2
|
||||
echo "This is a library that should be sourced." 1>&2
|
||||
exit 1
|
||||
fi
|
||||
echo $base
|
||||
}
|
||||
file2cat() {
|
||||
$(decompress_prog $1) $1
|
||||
}
|
||||
debug() {
|
||||
echo "$@"
|
||||
eval "$@"
|
||||
}
|
||||
decompress_prog() {
|
||||
local which
|
||||
which="cat"
|
||||
[ $1 != ${1%.tgz} -o $1 != ${1%.gz} -o $1 != ${1%.Z} ] && which="gunzip -c"
|
||||
[ $1 != ${1%.bz2} ] && which="bunzip2 -c"
|
||||
[ $1 != ${1%.bz} ] && which="bunzip -c"
|
||||
echo $which
|
||||
}
|
||||
compress_ext() {
|
||||
local which
|
||||
which=""
|
||||
[ $1 != ${1%.gz} ] && which=gz
|
||||
[ $1 != ${1%.Z} ] && which=Z
|
||||
[ $1 != ${1%.bz2} ] && which=bz2
|
||||
[ $1 != ${1%.bz} ] && which=bz
|
||||
echo $which
|
||||
}
|
||||
filetype_detect() {
|
||||
local which f
|
||||
which=""
|
||||
f=$(echo "$1" | sed 's|:::.*||')
|
||||
[ $f != ${f%.jar} ] && which=jarfile
|
||||
[ $f != ${f%.zip} ] && which=zipfile
|
||||
[ $f != ${f%.tgz} ] && which=tarball
|
||||
[ $f != ${f%.tar.$(compress_ext $f)} ] && which=tarball
|
||||
[ $f != ${f%.tar} ] && which=tarball
|
||||
[ $f != ${f%.diff.$(compress_ext $f)} -o $1 != ${1%.patch.$(compress_ext $1)} ] && which=patch
|
||||
[ $f != ${f%.diff} -o $1 != ${1%.patch} ] && which=patch
|
||||
[ $f != ${f%.dsc} ] && which=dsc
|
||||
echo $which
|
||||
}
|
||||
extract_tar() {
|
||||
local which file dir curd
|
||||
dir="$1"
|
||||
shift
|
||||
curd=$(pwd)
|
||||
while [ $# -gt 0 ];do
|
||||
file="$1"
|
||||
[ "$file" = "${1#/}" ] && file="$curd/$file"
|
||||
case "$(filetype_detect $file)" in
|
||||
"jarfile") (cd $dir;fastjar -xf $file);;
|
||||
"zipfile") (cd $dir;miniunzip -x $file);;
|
||||
"tarball") $(decompress_prog $file) $file | (cd $dir;tar xv);;
|
||||
*) echo "unsupported tarball";;
|
||||
esac
|
||||
shift
|
||||
done
|
||||
}
|
||||
|
||||
do.patching() {
|
||||
filetmpl=\$d/\$f
|
||||
reversesort=""
|
||||
reversepatch=""
|
||||
|
||||
case "$cmd" in
|
||||
source.patch)
|
||||
mkdir -p $SOURCE_DIR/$TAR_DIR
|
||||
patch_dirs="$SRC_PATCH_DIR $SRC_ADD_PATCH_DIR"
|
||||
stampfiletmpl=\$STAMP_DIR/\$d/\$f
|
||||
logtmpl=\$STAMP_DIR/log/\$d/\$f
|
||||
dirprep="\$STAMP_DIR/log/\$d \$STAMP_DIR/\$d"
|
||||
patchapplydirtmpl=\$SOURCE_DIR/\$TAR_DIR
|
||||
;;
|
||||
patch.apply)
|
||||
mkdir -p $SOURCE_DIR/$TAR_DIR $STAMP_DIR/patches
|
||||
patch_dirs="$PATCH_DIR $ADD_PATCH_DIR"
|
||||
stampfiletmpl=\$STAMP_DIR/patches/\$f
|
||||
logtmpl=\$STAMP_DIR/log/\$d/\$f
|
||||
dirprep=\$STAMP_DIR/log/\$d
|
||||
patchapplydirtmpl=\$SOURCE_DIR/\$TAR_DIR
|
||||
;;
|
||||
fix.source.patch)
|
||||
if [ "$DBS_UNIFIED" -o ! -e debian/fixpatch ];then
|
||||
exit
|
||||
fi
|
||||
mkdir -p $STAMP_DIR/fixpatch
|
||||
patch_dirs=debian/fixpatch
|
||||
stampfiletmpl="$STAMP_DIR/fixpatch/\$(basename \$f)"
|
||||
logtmpl=\$STAMP_DIR/log/fixpatch/\$f
|
||||
dirprep=\$STAMP_DIR/log/fixpatch
|
||||
patchapplydirtmpl=upstream
|
||||
;;
|
||||
unfix.source.patch)
|
||||
if [ "$DBS_UNIFIED" -o ! -e debian/fixpatch ];then
|
||||
exit
|
||||
fi
|
||||
mkdir -p $STAMP_DIR/fixpatch
|
||||
patch_dirs=debian/fixpatch
|
||||
stampfiletmpl="$STAMP_DIR/fixpatch/\$(basename \$f)"
|
||||
logtmpl=\$STAMP_DIR/log/fixpatch/\$f
|
||||
dirprep=\$STAMP_DIR/log/fixpatch
|
||||
patchapplydirtmpl=upstream
|
||||
reversesort=-r
|
||||
reversepatch=-R
|
||||
;;
|
||||
esac
|
||||
for d in $patch_dirs;do
|
||||
if [ ! -d $d ];then
|
||||
continue
|
||||
fi
|
||||
eval mkdir -p $dirprep
|
||||
for f in `(cd $d;find -type f ! -name 'chk-*' 2>/dev/null )|sort $reversesort`;do
|
||||
eval stampfile=$stampfiletmpl
|
||||
eval log=$logtmpl
|
||||
eval file=$filetmpl
|
||||
eval patchapplydir=$patchapplydirtmpl
|
||||
if [ ! -e $stampfile ];then
|
||||
START $file
|
||||
if file2cat $file | (cd $patchapplydir;patch -p1 $reversepatch) > $log;then
|
||||
OK $file
|
||||
touch $stampfile
|
||||
else
|
||||
FAILED $file
|
||||
exit 1
|
||||
fi
|
||||
else
|
||||
ALREADY_DONE $file
|
||||
fi
|
||||
done
|
||||
done
|
||||
|
||||
}
|
||||
#
|
||||
# External api functions.
|
||||
#
|
||||
|
||||
source.clean() {
|
||||
if [ "$DBS_UNIFIED" ];then
|
||||
exit
|
||||
fi
|
||||
rm -rf $SOURCE_DIR $STAMP_DIR/upstream $STAMP_DIR/patches
|
||||
rm -f $STAMP_DIR/{source.{clean,build,make}}
|
||||
return
|
||||
if [ x$SOURCE_DIR = x ];then
|
||||
files=`find -type f -maxdepth 1 -mindepth 1`
|
||||
dirs=`find -type d -maxdepth 1 -mindepth 1 ! -name 'debian' ! -name 'upstream'`
|
||||
echo files=\"$files\"
|
||||
echo dirs=\"$dirs\"
|
||||
fi
|
||||
|
||||
}
|
||||
source.patch() { cmd=source.patch; do.patching; }
|
||||
fix.source.patch() { cmd=fix.source.patch; do.patching; }
|
||||
unfix.source.patch() { cmd=unfix.source.patch; do.patching; }
|
||||
patch.apply() { cmd=patch.apply; do.patching; }
|
||||
|
||||
if [ $(basename $0) = lib ];then
|
||||
$1
|
||||
fi
|
||||
29
debian/scripts/messages
vendored
29
debian/scripts/messages
vendored
@ -1,29 +0,0 @@
|
||||
fix.source.patch:START:"Fixing upstream patch $1"
|
||||
fix.source.patch:OK:"successful."
|
||||
fix.source.patch:FAILED:"failed!"
|
||||
fix.source.patch:ALREADY_DONE:"upstream patch fixup $1 already applied!"
|
||||
|
||||
unfix.source.patch:START:"Unfixing upstream patch $1
|
||||
unfix.source.patch:OK:"successful."
|
||||
unfix.source.patch:FAILED:"failed!
|
||||
unfix.source.patch:ALREADY_DONE:"upstream patch fixup $1 already reversed!"
|
||||
|
||||
patch.unapply:START:"Reversing patch $1"
|
||||
patch.unapply:OK:"successful."
|
||||
patch.unapply:FAILED:"failed!"
|
||||
patch.unapply:ALREADY_DONE:"Patch $1 not applied!"
|
||||
|
||||
patch.apply:START:"Applying patch $1"
|
||||
patch.apply:OK:"successful."
|
||||
patch.apply:FAILED:"failed!"
|
||||
patch.apply:ALREADY_DONE:"Patch $1 already applied!"
|
||||
|
||||
source.patch:START:"Applying upstream patch $1"
|
||||
source.patch:OK:"successful."
|
||||
source.patch:FAILED:"failed!"
|
||||
source.patch:ALREADY_DONE:"upstream patch $1 already applied!"
|
||||
|
||||
source.unpack:START:"Extracting upstream tarball $1"
|
||||
source.unpack:OK:"successful."
|
||||
source.unpack:FAILED:"failed!"
|
||||
source.unpack:ALREADY_DONE:"upstream tarball $1 already extracted!"
|
||||
32
debian/scripts/source.unpack
vendored
32
debian/scripts/source.unpack
vendored
@ -1,32 +0,0 @@
|
||||
#!/bin/sh
|
||||
make -C debian/scripts sh.vars
|
||||
. debian/scripts/sh.vars
|
||||
. debian/scripts/lib
|
||||
|
||||
mkdir -p $STAMP_DIR/upstream/tarballs/ $SOURCE_DIR
|
||||
if [ ! -z "$SRC_TAR_DIR" -a -d "$SRC_TAR_DIR" ];then
|
||||
files=$(find $SRC_TAR_DIR -type f|sort)
|
||||
else
|
||||
VER=$(dpkg-parsechangelog 2>&1|egrep ^Version|cut -d " " -f 2|cut -d "-" -f 1)
|
||||
SRC=$(dpkg-parsechangelog 2>&1|egrep ^Source|cut -d " " -f 2-)
|
||||
files=../${SRC}_${VER}.orig.tar.gz
|
||||
fi
|
||||
for f in $files;do
|
||||
stampfile=$STAMP_DIR/upstream/tarballs/`basename $f`
|
||||
if [ ! -e $stampfile ];then
|
||||
START $f
|
||||
if extract_tar ${SOURCE_DIR:-.} $f > $stampfile.log;then
|
||||
if [ x$SOURCE_DIR = x ];then
|
||||
mkdir -p $STAMP_DIR/upstream/files/tarballs
|
||||
cp $stampfile.log $STAMP_DIR/upstream/files/tarballs/`basename $f`.list
|
||||
fi
|
||||
OK $f
|
||||
touch $stampfile
|
||||
else
|
||||
FAILED $f
|
||||
exit 1
|
||||
fi
|
||||
else
|
||||
ALREADY_DONE $f
|
||||
fi
|
||||
done
|
||||
31
debian/scripts/vars
vendored
31
debian/scripts/vars
vendored
@ -1,31 +0,0 @@
|
||||
# This file is NOT a shell script.
|
||||
#
|
||||
# This file gets included by both debian/rules (make) AND the scripts in
|
||||
# debian/scripts (bash)
|
||||
#
|
||||
|
||||
# Where to cd to to unpack all the tarballs.
|
||||
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.10.3
|
||||
# Where to place all the stamp files. This directory can be removed, and
|
||||
# all the targets will then be rerun.
|
||||
STAMP_DIR=debian/stampdir
|
||||
# When sys-build.mk is used to build the source, this is the target(s) to
|
||||
# run.
|
||||
BUILD_TARGET=
|
||||
# When cleaning the source, during diff generation, if this is set, this
|
||||
# target will be called in debian/rules. This allows for pkgs that have
|
||||
# complicated cleaning rules.
|
||||
CLEAN_TARGET_EXTERNAL=
|
||||
# Whether to die if the source cleaning fails.
|
||||
CLEAN_IGNORE=yes
|
||||
# The clean target to run. Defaults to clean.
|
||||
CLEAN_TARGET=distclean
|
||||
# Files to exclude from the diff.
|
||||
DIFF_EXCLUDE="Makefile.in configure"
|
||||
# Where the patches are located(duh!).
|
||||
PATCH_DIR=debian/patches
|
||||
SRC_PATCH_DIR=upstream/patches
|
||||
SRC_TAR_DIR=upstream/tarballs
|
||||
17
debian/scripts/vars.build
vendored
17
debian/scripts/vars.build
vendored
@ -1,17 +0,0 @@
|
||||
#!/usr/bin/make -f
|
||||
|
||||
sed_cmd=''
|
||||
cat $1 | while read REPLY; do
|
||||
case "$REPLY" in
|
||||
\#*|"") continue;;
|
||||
*)
|
||||
var=$(echo $REPLY|sed 's/\([^=]*\)=.*/\1/')
|
||||
eval $REPLY
|
||||
if [ $2 = "make" ]; then
|
||||
eval echo "$var=\$$var"
|
||||
else
|
||||
eval echo "$var=\\\"\$$var\\\""
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
done
|
||||
1
debian/sources
vendored
1
debian/sources
vendored
@ -1 +0,0 @@
|
||||
upstream tar ../gtk+-2.10.3.tar.gz
|
||||
167
debian/sys-build.mk
vendored
167
debian/sys-build.mk
vendored
@ -1,167 +0,0 @@
|
||||
#!/usr/bin/make -f
|
||||
# Separate tarball/patch build system by Adam Heath <doogie@debian.org>
|
||||
|
||||
# The magic targets that you need to concern yourself with are:
|
||||
#
|
||||
# source.build: Unpacks upstream tarballs, optionally applies patches
|
||||
# to fix the upstream patches, then applies upstream
|
||||
# patches.
|
||||
# source.make: Applies debian patches.
|
||||
# source.clean: Cleans the build directory, then unfixes the upstream
|
||||
# patches.
|
||||
# source.compile: Will compile the source for you. Please check
|
||||
# debian/scripts/vars.
|
||||
# source.cmd: When calling this target, if you define a variable
|
||||
# SOURCE_CMD, it will run that command in the build
|
||||
# tree.
|
||||
# make-diff: Generates debian.diff in the current directory which
|
||||
# contains all edits that are currently in the build
|
||||
# tree.
|
||||
#
|
||||
# Nothing in this file should require any editting. Please look at
|
||||
# debian/scripts/vars for things to change for the local environment.
|
||||
#
|
||||
# debian/rules target command
|
||||
# ----------------------------------------------------------------
|
||||
# clean: $(MAKE) -f debian/sys-build.mk source.clean
|
||||
# build: $(MAKE) -f debian/sys-build.mk source.compile
|
||||
# for simple systems.
|
||||
# build: $(MAKE) -f debian/sys-build.mk source.make
|
||||
# and, in the rules file, you can
|
||||
# build the targets you want.
|
||||
SHELL=/bin/bash
|
||||
ifndef NOISY
|
||||
.SILENT:
|
||||
endif
|
||||
|
||||
include debian/scripts/vars
|
||||
# remove quotes
|
||||
DIFF_EXCLUDE:=$(patsubst %,-x %,$(shell echo $(DIFF_EXCLUDE)))
|
||||
|
||||
ifdef TAR_DIR
|
||||
BUILD_TREE=$(SOURCE_DIR)/$(TAR_DIR)
|
||||
else
|
||||
BUILD_TREE=$(SOURCE_DIR)
|
||||
endif
|
||||
|
||||
SOURCE_CMD=:
|
||||
|
||||
ifdef CLEAN_IGNORE
|
||||
CLEAN_CMD=-
|
||||
CLEAN_SH=
|
||||
else
|
||||
CLEAN_CMD=
|
||||
CLEAN_SH=
|
||||
endif
|
||||
ifndef CLEAN_TARGET
|
||||
CLEAN_TARGET=clean
|
||||
endif
|
||||
|
||||
foo:
|
||||
echo $(DIFF_EXCLUDE)
|
||||
|
||||
make-diff:
|
||||
mv $(BUILD_TREE) bak
|
||||
$(MAKE) -f debian/sys-build.mk source.clean
|
||||
$(MAKE) -f debian/sys-build.mk source.make
|
||||
mv $(BUILD_TREE) $(BUILD_TREE).orig
|
||||
mv bak $(BUILD_TREE)
|
||||
|
||||
ifdef TAR_DIR
|
||||
ifdef CLEAN_TARGET_EXTERNAL
|
||||
$(CLEAN_CMD)$(MAKE) -f debian/rules $(CLEAN_TARGET_EXTERNAL)
|
||||
else
|
||||
$(CLEAN_CMD)$(MAKE) -C $(BUILD_TREE) $(CLEAN_TARGET)
|
||||
endif
|
||||
-(cd $(SOURCE_DIR);diff -ruN $(TAR_DIR).orig $(TAR_DIR) $(DIFF_EXCLUDE)) > debian.diff
|
||||
else
|
||||
ifdef CLEAN_TARGET_EXTERNAL
|
||||
$(CLEAN_CMD)$(MAKE) -f debian/rules $(CLEAN_TARGET_EXTERNAL)
|
||||
else
|
||||
$(CLEAN_CMD)for a in $(BUILD_TREE)/*;do $(MAKE) -C $$a $(CLEAN_TARGET);done
|
||||
endif
|
||||
-(diff -ruN $(BUILD_TREE).orig $(BUILD_TREE) $(DIFF_EXCLUDE)) > debian.diff
|
||||
if [ ! -s debian.diff ];then\
|
||||
rm debian.diff;\
|
||||
fi
|
||||
endif
|
||||
rm -rf $(BUILD_TREE).orig
|
||||
|
||||
patchapply: $(STAMP_DIR)/patchapply
|
||||
$(STAMP_DIR)/patchapply: $(STAMP_DIR)/source.build $(STAMP_DIR)
|
||||
$(SHELL) debian/scripts/lib patch.apply
|
||||
touch $@
|
||||
rm -f $(STAMP_DIR)/patchunapply
|
||||
|
||||
patchunapply: $(STAMP_DIR)/patchunapply
|
||||
$(STAMP_DIR)/patchunapply: $(STAMP_DIR)/source.build $(STAMP_DIR)
|
||||
$(SHELL) debian/scripts/lib patch.unapply
|
||||
touch $@
|
||||
rm -f $(STAMP_DIR)/patchapply
|
||||
|
||||
.export: SOURCE_TREE
|
||||
|
||||
#
|
||||
# The rules that really do the work all start with $(STAMPDIR)
|
||||
# This little trick allows us to use stamp files to keep us from
|
||||
# having to rerun long targets over and over. It also puts
|
||||
# all stamp files in one place, for easy cleaning.
|
||||
#
|
||||
# If a stampdir rule depends on something else, be sure it is
|
||||
# another stampdir rule. Depending on base rule won't work.
|
||||
#
|
||||
|
||||
source.build: $(STAMP_DIR)/source.build
|
||||
STAMP_DIR_TARGETS+= $(STAMP_DIR)/source.build
|
||||
$(STAMP_DIR)/source.build: $(STAMP_DIR)/source.unpack $(STAMP_DIR)/source.patch $(STAMP_DIR)
|
||||
touch $@
|
||||
|
||||
source.make: $(STAMP_DIR)/source.make
|
||||
STAMP_DIR_TARGETS+= $(STAMP_DIR)/source.make
|
||||
$(STAMP_DIR)/source.make: $(STAMP_DIR)/source.build $(STAMP_DIR)/patchapply $(STAMP_DIR)
|
||||
touch $@
|
||||
|
||||
source.unpack: $(STAMP_DIR)/source.unpack
|
||||
STAMP_DIR_TARGETS+= $(STAMP_DIR)/source.unpack
|
||||
$(STAMP_DIR)/source.unpack: $(STAMP_DIR)
|
||||
$(SHELL) debian/scripts/source.unpack
|
||||
touch $@
|
||||
|
||||
source.patch: $(STAMP_DIR)/source.patch
|
||||
STAMP_DIR_TARGETS+= $(STAMP_DIR)/source.patch
|
||||
$(STAMP_DIR)/source.patch: $(STAMP_DIR)/source.unpack $(STAMP_DIR)/fix.source.patch $(STAMP_DIR)
|
||||
$(SHELL) debian/scripts/lib source.patch
|
||||
touch $@
|
||||
|
||||
fix.source.patch: $(STAMP_DIR)/fix.source.patch
|
||||
STAMP_DIR_TARGETS+= $(STAMP_DIR)/fix.source.patch
|
||||
$(STAMP_DIR)/fix.source.patch: $(STAMP_DIR)
|
||||
$(SHELL) debian/scripts/lib fix.source.patch
|
||||
touch $@
|
||||
|
||||
unfix.source.patch: $(STAMP_DIR)/unfix.source.patch
|
||||
STAMP_DIR_TARGETS+= $(STAMP_DIR)/unfix.source.patch
|
||||
$(STAMP_DIR)/unfix.source.patch: $(STAMP_DIR)
|
||||
$(SHELL) debian/scripts/lib unfix.source.patch
|
||||
touch $@
|
||||
|
||||
source.compile: $(STAMP_DIR)/source.compile
|
||||
STAMP_DIR_TARGETS+= $(STAMP_DIR)/source.compile
|
||||
$(STAMP_DIR)/source.compile: $(STAMP_DIR)/source.make $(STAMP_DIR)
|
||||
$(MAKE) -C $(BUILD_TREE) $(BUILD_TARGET)
|
||||
touch $@
|
||||
|
||||
source.command:
|
||||
(cd $(BUILD_TREE); $(SOURCE_CMD))
|
||||
|
||||
DIR_TARGETS+=$(STAMP_DIR)
|
||||
$(STAMP_DIR_TARGETS): $(STAMP_DIR)
|
||||
|
||||
$(DIR_TARGETS)/:
|
||||
mkdir -p $@
|
||||
|
||||
source.clean: unfix.source.patch
|
||||
$(SHELL) debian/scripts/lib source.clean
|
||||
rm -f $(STAMP_DIR_TARGETS)
|
||||
rm -rf $(STAMP_DIR)
|
||||
$(MAKE) -C debian/scripts clean
|
||||
Reference in New Issue
Block a user