r9782 - in /desktop/unstable/libgail-gnome/debian: ./ patches/
scripts/
lool at users.alioth.debian.org
lool at users.alioth.debian.org
Wed Apr 11 17:16:51 UTC 2007
Author: lool
Date: Wed Apr 11 17:16:50 2007
New Revision: 9782
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=9782
Log:
* New upstream release.
- Rewrite the build system completely; switch from tar-in-tar and
sys-build to regular source and quilt patching; build-depend on quilt.
- Include the new uploaders.mk from gnome-pkg-tools instead of duplicating
its logic; build-dep on gnome-pkg-tools >= 0.11.
- Run "make check" test suite except if DEB_BUILD_OPTIONS contains the
"nocheck" keyword; ignore failures.
- Generate debian/%.in in a global rule.
Added:
desktop/unstable/libgail-gnome/debian/libgail-gnome-dbg.links
desktop/unstable/libgail-gnome/debian/libgail-gnome-dev.links
desktop/unstable/libgail-gnome/debian/libgail-gnome-module.docs.in
- copied, changed from r9778, desktop/unstable/libgail-gnome/debian/docs.in
desktop/unstable/libgail-gnome/debian/patches/series
Removed:
desktop/unstable/libgail-gnome/debian/docs.in
desktop/unstable/libgail-gnome/debian/patches/000_libgail-gnome-debian-libtool.patch
desktop/unstable/libgail-gnome/debian/scripts/
desktop/unstable/libgail-gnome/debian/sources
desktop/unstable/libgail-gnome/debian/sys-build.mk
Modified:
desktop/unstable/libgail-gnome/debian/changelog
desktop/unstable/libgail-gnome/debian/control
desktop/unstable/libgail-gnome/debian/control.in
desktop/unstable/libgail-gnome/debian/rules
Modified: desktop/unstable/libgail-gnome/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libgail-gnome/debian/changelog?rev=9782&op=diff
==============================================================================
--- desktop/unstable/libgail-gnome/debian/changelog (original)
+++ desktop/unstable/libgail-gnome/debian/changelog Wed Apr 11 17:16:50 2007
@@ -1,4 +1,4 @@
-libgail-gnome (1.1.3-4) UNRELEASED; urgency=low
+libgail-gnome (1.18.0-1) UNRELEASED; urgency=low
* Set Maintainer to the Debian GNOME Maintainers.
* Add a get-orig-source target to retrieve the upstream tarball.
@@ -6,6 +6,14 @@
* Drop generated debian/docs from SVN.
* Use full URL and HTTP in copyright.
* Cleanups in rules.
+ * New upstream release.
+ - Rewrite the build system completely; switch from tar-in-tar and
+ sys-build to regular source and quilt patching; build-depend on quilt.
+ - Include the new uploaders.mk from gnome-pkg-tools instead of duplicating
+ its logic; build-dep on gnome-pkg-tools >= 0.11.
+ - Run "make check" test suite except if DEB_BUILD_OPTIONS contains the
+ "nocheck" keyword; ignore failures.
+ - Generate debian/%.in in a global rule.
-- Loic Minier <lool at dooz.org> Wed, 04 Apr 2007 17:43:54 +0200
Modified: desktop/unstable/libgail-gnome/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libgail-gnome/debian/control?rev=9782&op=diff
==============================================================================
--- desktop/unstable/libgail-gnome/debian/control (original)
+++ desktop/unstable/libgail-gnome/debian/control Wed Apr 11 17:16:50 2007
@@ -2,8 +2,8 @@
Section: libs
Priority: optional
Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
-Uploaders: Andrew Lau <netsnipe at users.sourceforge.net>, Clément Stenac <zorglub at debian.org>, Dafydd Harries <daf at debian.org>, Guilherme de S. Pastore <gpastore at debian.org>, Gustavo Franco <stratus at debian.org>, Gustavo Noronha Silva <kov at debian.org>, J.H.M. Dassen (Ray) <jdassen at debian.org>, Jordi Mallach <jordi at debian.org>, Jose Carlos Garcia Sogo <jsogo at debian.org>, Josselin Mouette <joss at debian.org>, Loic Minier <lool at dooz.org>, Marc HE Brockschmidt <he at debian.org>, Marco Cabizza <marco87 at gmail.com>, Oystein Gisnas <oystein at gisnas.net>, Ondřej Surý <ondrej at debian.org>, Ross Burton <ross at debian.org>, Sebastien Bacher <seb128 at debian.org>, Sjoerd Simons <sjoerd at debian.org>
-Build-Depends: debhelper (>= 5), libatk1.0-dev (>= 1.2.0), libgtk2.0-dev (>= 2.0.6-3), libbonobo2-dev (>= 2.0.0), libbonoboui2-dev (>= 2.0.1), libgnomeui-dev (>= 2.0.3), libgail-dev (>= 1.2.0), libatspi-dev (>= 1.1.8), pkg-config, zlib1g-dev, autotools-dev, libpanel-applet2-dev, gnome-pkg-tools
+Uploaders: Loic Minier <lool at dooz.org>, Sebastien Bacher <seb128 at debian.org>
+Build-Depends: debhelper (>= 5), libatk1.0-dev (>= 1.2.0), libgtk2.0-dev (>= 2.0.6-3), libbonobo2-dev (>= 2.0.0), libbonoboui2-dev (>= 2.0.1), libgnomeui-dev (>= 2.0.3), libgail-dev (>= 1.2.0), libatspi-dev (>= 1.1.8), pkg-config, zlib1g-dev, autotools-dev, libpanel-applet2-dev, gnome-pkg-tools (>= 0.11), quilt
Standards-Version: 3.7.2
Package: libgail-gnome-module
Modified: desktop/unstable/libgail-gnome/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libgail-gnome/debian/control.in?rev=9782&op=diff
==============================================================================
--- desktop/unstable/libgail-gnome/debian/control.in (original)
+++ desktop/unstable/libgail-gnome/debian/control.in Wed Apr 11 17:16:50 2007
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
Uploaders: @GNOME_TEAM@
-Build-Depends: debhelper (>= 5), libatk1.0-dev (>= 1.2.0), libgtk2.0-dev (>= 2.0.6-3), libbonobo2-dev (>= 2.0.0), libbonoboui2-dev (>= 2.0.1), libgnomeui-dev (>= 2.0.3), libgail-dev (>= 1.2.0), libatspi-dev (>= 1.1.8), pkg-config, zlib1g-dev, autotools-dev, libpanel-applet2-dev, gnome-pkg-tools
+Build-Depends: debhelper (>= 5), libatk1.0-dev (>= 1.2.0), libgtk2.0-dev (>= 2.0.6-3), libbonobo2-dev (>= 2.0.0), libbonoboui2-dev (>= 2.0.1), libgnomeui-dev (>= 2.0.3), libgail-dev (>= 1.2.0), libatspi-dev (>= 1.1.8), pkg-config, zlib1g-dev, autotools-dev, libpanel-applet2-dev, gnome-pkg-tools (>= 0.11), quilt
Standards-Version: 3.7.2
Package: libgail-gnome-module
Added: desktop/unstable/libgail-gnome/debian/libgail-gnome-dbg.links
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libgail-gnome/debian/libgail-gnome-dbg.links?rev=9782&op=file
==============================================================================
--- desktop/unstable/libgail-gnome/debian/libgail-gnome-dbg.links (added)
+++ desktop/unstable/libgail-gnome/debian/libgail-gnome-dbg.links Wed Apr 11 17:16:50 2007
@@ -1,0 +1,1 @@
+usr/share/doc/libgail-gnome-module usr/share/doc/libgail-gnome-dbg
Added: desktop/unstable/libgail-gnome/debian/libgail-gnome-dev.links
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libgail-gnome/debian/libgail-gnome-dev.links?rev=9782&op=file
==============================================================================
--- desktop/unstable/libgail-gnome/debian/libgail-gnome-dev.links (added)
+++ desktop/unstable/libgail-gnome/debian/libgail-gnome-dev.links Wed Apr 11 17:16:50 2007
@@ -1,0 +1,1 @@
+usr/share/doc/libgail-gnome-module usr/share/doc/libgail-gnome-dev
Copied: desktop/unstable/libgail-gnome/debian/libgail-gnome-module.docs.in (from r9778, desktop/unstable/libgail-gnome/debian/docs.in)
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libgail-gnome/debian/libgail-gnome-module.docs.in?rev=9782&op=diff
==============================================================================
--- desktop/unstable/libgail-gnome/debian/docs.in (original)
+++ desktop/unstable/libgail-gnome/debian/libgail-gnome-module.docs.in Wed Apr 11 17:16:50 2007
@@ -1,2 +1,2 @@
-build-tree/libgail-gnome- at VERSION@/NEWS
-build-tree/libgail-gnome- at VERSION@/README
+NEWS
+README
Added: desktop/unstable/libgail-gnome/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libgail-gnome/debian/patches/series?rev=9782&op=file
==============================================================================
(empty)
Modified: desktop/unstable/libgail-gnome/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libgail-gnome/debian/rules?rev=9782&op=diff
==============================================================================
--- desktop/unstable/libgail-gnome/debian/rules (original)
+++ desktop/unstable/libgail-gnome/debian/rules Wed Apr 11 17:16:50 2007
@@ -1,19 +1,17 @@
#!/usr/bin/make -f
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
-include debian/scripts/vars
+DISABLE_UPDATE_UPLOADERS := 1
include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
-DEB_USE_DBS_TARBALL_LAYOUT := 1
+STAMP_DIR := debian/stampdir
-BUILD_DIR=$(SOURCE_DIR)/$(TAR_DIR)
+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)
-DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
CFLAGS += -O0
@@ -21,79 +19,121 @@
CFLAGS += -O2
endif
-# upstream version computation
-version=$(shell dpkg-parsechangelog | sed -ne 's/^Version: \(.*\)-[^-]*$$/\1/p')
-soname=0
+DEBVERSION := $(shell dpkg-parsechangelog | sed -n -e 's/^Version: //p')
+VERSION := $(shell echo $(DEBVERSION) | sed -e 's/-[^-]*$$//')
+SONAME := 0
-debian/control:
+configure_flags := \
+ --prefix=/usr \
+ --mandir=\$${prefix}/share/man \
+ --infodir=\$${prefix}/share/info \
+ --sysconfdir=/etc
+
+ifeq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
+ configure_flags += --build=$(DEB_BUILD_GNU_TYPE)
+else
+ configure_flags += --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE)
+endif
+
+patch: $(STAMP_DIR)/patch-stamp
+
+$(STAMP_DIR)/patch-stamp:
dh_testdir
- sed -e "s/@SONAME@/${soname}/g" -e "s/@VERSION@/${version}/g" -e 's/@GNOME_TEAM@/${uploaders}/' $@.in > $@
+ 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 config.sub
+ -test -r /usr/share/misc/config.guess && \
+ cp -f /usr/share/misc/config.guess config.guess
+ touch $@
+
+$(STAMP_DIR)/configure-stamp: $(STAMP_DIR)/patch-stamp
+ dh_testdir
+ ./configure $(configure_flags)
+ touch $@
configure: $(STAMP_DIR)/configure-stamp
-$(STAMP_DIR)/configure-stamp:
+
+$(STAMP_DIR)/build-stamp: $(STAMP_DIR)/configure-stamp
dh_testdir
- $(MAKE) -f debian/sys-build.mk source.make
- -test -r /usr/share/misc/config.sub && \
- cp -f /usr/share/misc/config.sub $(BUILD_DIR)/config.sub
- -test -r /usr/share/misc/config.guess && \
- cp -f /usr/share/misc/config.guess $(BUILD_DIR)/config.guess
- # Add here commands to configure the package.
- cd $(BUILD_DIR) && \
- ./configure --host=$(DEB_HOST_GNU_TYPE) \
- --build=$(DEB_BUILD_GNU_TYPE) \
- --prefix=/usr \
- --mandir=\$${prefix}/share/man \
- --infodir=\$${prefix}/share/info
+ $(MAKE)
touch $@
-build: debian/control configure $(STAMP_DIR)/build-stamp
-$(STAMP_DIR)/build-stamp:
+build: $(STAMP_DIR)/build-stamp
+
+$(STAMP_DIR)/check-stamp: $(STAMP_DIR)/build-stamp
dh_testdir
- $(MAKE) -C $(BUILD_DIR)
+ # testsuite failures are ignored
+ -$(MAKE) check
touch $@
+
+check: $(STAMP_DIR)/check-stamp
+
+$(STAMP_DIR)/install-stamp: $(STAMP_DIR)/build-stamp
+ $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
+ touch $@
+
+install: $(STAMP_DIR)/install-stamp
+
+# gross kludge to force control generation with the %.in target
+clean::
+ touch debian/control.in
+
+debian/%: debian/%.in
+ dh_testdir
+ sed \
+ -e "s#@SONAME@#$(SONAME)#g" \
+ -e "s#@VERSION@#$(VERSION)#g" \
+ -e "s#@GNOME_TEAM@#$(UPLOADERS)#g" \
+ $@.in > $@
clean:: debian/control
dh_testdir
dh_testroot
- $(MAKE) -f debian/sys-build.mk source.clean
+ -$(MAKE) distclean
+ # 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 debian/libgail-gnome-module.docs
dh_clean
-install: build
+maybe_check = $(if $(findstring nocheck,$(DEB_BUILD_OPTIONS)),,check)
+
+binary-indep:
+
+binary-arch: build $(maybe_check) install debian/libgail-gnome-module.docs
dh_testdir
dh_testroot
- dh_clean -k
- dh_installdirs
- # generating debian files from .in
- for f in `find debian/ -name "[^c]*.in"`; do \
- sed -e "s/@VERSION@/${version}/g" $$f > `echo $$f | sed -e "s/\.in//"`; \
- done
- $(MAKE) -C $(BUILD_DIR) install DESTDIR=$(CURDIR)/debian/tmp
dh_install -a
-
-binary-indep: build install
-
-binary-arch: build install
- dh_testdir
- dh_testroot
- dh_installdocs
- rm -rf $(CURDIR)/debian/libgail-gnome-dev/usr/share/doc/libgail-gnome-dev
- rm -rf $(CURDIR)/debian/libgail-gnome-dbg/usr/share/doc/libgail-gnome-dbg
- dh_link -plibgail-gnome-dev usr/share/doc/libgail-gnome-module usr/share/doc/libgail-gnome-dev
- dh_link -plibgail-gnome-dbg usr/share/doc/libgail-gnome-module usr/share/doc/libgail-gnome-dbg
- dh_installexamples
- dh_installman
- dh_installinfo
- dh_installchangelogs $(BUILD_DIR)/ChangeLog
+ dh_installchangelogs -plibgail-gnome-module ChangeLog
+ dh_installdocs -plibgail-gnome-module
+ dh_link -a
dh_strip -a --dbg-package=libgail-gnome-dbg
- dh_compress
- dh_fixperms
- dh_makeshlibs -plibgail-gnome-module -V "libgail-gnome-module (>= ${version})"
- dh_installdeb
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
+ dh_compress -a
+ dh_fixperms -a
+ dh_makeshlibs -plibgail-gnome-module \
+ -V "libgail-gnome-module (>= $(VERSION))"
+ dh_installdeb -a
+ # override shlibs for libraries from this source before computing
+ # dependencies of packages generated from this source; we already have
+ # inter-dependencies expressed manually in the control file, we do not
+ # need the shlibs to add duplicates
+ cat debian/*/DEBIAN/shlibs | \
+ sed -n -r -e 's/(([^ ]+: )?([^ ]+) ([^ ]+)) .*/\1/p' \
+ >debian/shlibs.local
+ dh_shlibdeps -a
+ -rm -f debian/shlibs.local
+ dh_gencontrol -a
+ dh_md5sums -a
+ dh_builddeb -a
binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure debian/control
+.PHONY: patch configure build check install clean binary-indep binary-arch binary
More information about the pkg-gnome-commits
mailing list