--- gnome-common-2.12.0.orig/debian/patches/90_from_cvs_fix_autogen.patch +++ gnome-common-2.12.0/debian/patches/90_from_cvs_fix_autogen.patch @@ -0,0 +1,25 @@ +=================================================================== +RCS file: /cvs/gnome/gnome-common/macros2/gnome-autogen.sh,v +retrieving revision 1.24 +retrieving revision 1.28 +diff -u -r1.24 -r1.28 +--- gnome-autogen.sh 2005/09/20 06:27:53 1.24 ++++ gnome-common/macros2/gnome-autogen.sh 2006/03/10 02:10:27 1.28 +@@ -15,7 +15,7 @@ + REQUIRED_PKG_CONFIG_VERSION=${REQUIRED_PKG_CONFIG_VERSION:-0.14.0} + REQUIRED_GTK_DOC_VERSION=${REQUIRED_GTK_DOC_VERSION:-1.0} + REQUIRED_DOC_COMMON_VERSION=${REQUIRED_DOC_COMMON_VERSION:-2.3.0} +-REQUIRED_GNOME_DOC_UTILS_VERSION=${REQUIRED_GNOME_DOC_UTILS_VERSION:-0.3.2} ++REQUIRED_GNOME_DOC_UTILS_VERSION=${REQUIRED_GNOME_DOC_UTILS_VERSION:-0.4.2} + + # a list of required m4 macros. Package can set an initial value + REQUIRED_M4MACROS=${REQUIRED_M4MACROS:-} +@@ -240,7 +240,7 @@ + want_gtk_doc=false + want_gnome_doc_utils=false + +-configure_files="`find $srcdir -name '{arch}' -prune -o -name '.?*' -prune -o -name configure.ac -print -o -name configure.in -print`" ++configure_files="`find $srcdir -name '{arch}' -prune -o -name '_darcs' -prune -o -name '.??*' -prune -o -name configure.ac -print -o -name configure.in -print`" + for configure_ac in $configure_files; do + if grep "^A[CM]_PROG_LIBTOOL" $configure_ac >/dev/null || + grep "^LT_INIT" $configure_ac >/dev/null; then --- gnome-common-2.12.0.orig/debian/patches/02_autogen_required_versions.patch +++ gnome-common-2.12.0/debian/patches/02_autogen_required_versions.patch @@ -0,0 +1,17 @@ +diff -Nuar gnome-common-2.8.0.orig/macros2/gnome-autogen.sh gnome-common-2.8.0/macros2/gnome-autogen.sh +--- gnome-common-2.8.0.orig/macros2/gnome-autogen.sh 2004-10-02 17:49:07.000000000 +0200 ++++ gnome-common-2.8.0/macros2/gnome-autogen.sh 2004-10-02 17:52:14.000000000 +0200 +@@ -8,10 +8,10 @@ + # default version requirements ... + REQUIRED_AUTOCONF_VERSION=${REQUIRED_AUTOCONF_VERSION:-2.53} + REQUIRED_AUTOMAKE_VERSION=${REQUIRED_AUTOMAKE_VERSION:-1.4} +-REQUIRED_LIBTOOL_VERSION=${REQUIRED_LIBTOOL_VERSION:-1.4.3} +-REQUIRED_GETTEXT_VERSION=${REQUIRED_GETTEXT_VERSION:-0.10.40} ++REQUIRED_LIBTOOL_VERSION=${REQUIRED_LIBTOOL_VERSION:-1.5} ++REQUIRED_GETTEXT_VERSION=${REQUIRED_GETTEXT_VERSION:-0.12} + REQUIRED_GLIB_GETTEXT_VERSION=${REQUIRED_GLIB_GETTEXT_VERSION:-2.2.0} +-REQUIRED_INTLTOOL_VERSION=${REQUIRED_INTLTOOL_VERSION:-0.25} ++REQUIRED_INTLTOOL_VERSION=${REQUIRED_INTLTOOL_VERSION:-0.30} + REQUIRED_PKG_CONFIG_VERSION=${REQUIRED_PKG_CONFIG_VERSION:-0.14.0} + REQUIRED_GTK_DOC_VERSION=${REQUIRED_GTK_DOC_VERSION:-1.0} + REQUIRED_DOC_COMMON_VERSION=${REQUIRED_DOC_COMMON_VERSION:-2.3.0} --- gnome-common-2.12.0.orig/debian/control +++ gnome-common-2.12.0/debian/control @@ -0,0 +1,15 @@ +Source: gnome-common +Section: gnome +Priority: optional +Maintainer: Jordi Mallach +Uploaders: Debian GNOME Maintainers , Akira TAGOH , Andreas Rottmann , Andrew Lau , Carlos Perelló Marín , Clément Stenac , Ed Boraas , Edd Dumbill , Emil Soleyman-Zomalan , Guilherme de S. Pastore , Gustavo Noronha Silva , J.H.M. Dassen (Ray) , Joe Drew , Johannes Rohr , Jose Carlos Garcia Sogo , Josselin Mouette , Loic Minier , Marc 'HE' Brockschmidt , Ondřej Surý , Rob Bradford , Robert McQueen , Ross Burton , Sebastien Bacher , Sjoerd Simons , Takuo KITAME +Build-Depends-Indep: debhelper (>= 4.1.0), cdbs, pkg-config, autotools-dev, gnome-pkg-tools +Standards-Version: 3.6.1.0 + +Package: gnome-common +Architecture: all +Depends: autoconf, automake1.4 | automake1.7 | automake1.9 | automake1.8 | automake1.6, libtool (>= 1.5), pkg-config, gettext (>= 0.11), intltool (>= 0.27.2) +Description: common scripts and macros to develop with GNOME or GNOME 2.0 + gnome-common is an extension to autoconf, automake and libtool for the GNOME + environment and GNOME using applications. Included are gnome-autogen.sh and + several macros to help in both GNOME and GNOME 2.0 source trees. --- gnome-common-2.12.0.orig/debian/changelog +++ gnome-common-2.12.0/debian/changelog @@ -0,0 +1,136 @@ +gnome-common (2.12.0-1ubuntu1) dapper; urgency=low + + * debian/patches/90_from_cvs_fix_autogen.patch: + - patch from CVS, updated gnome-doc-utils requirement, fix for build + to a non-src directory, fix for darcs format (Ubuntu: #25869) + + -- Sebastien Bacher Sat, 13 May 2006 16:38:20 +0200 + +gnome-common (2.12.0-1) unstable; urgency=low + + * New upstream release. + * debian/watch: watch for 2.12 versions. + * debian/patches/01_autogen_copy_files.patch: removed; fixed upstream. + + -- Jordi Mallach Tue, 18 Oct 2005 19:23:11 +0200 + +gnome-common (2.8.0-3) unstable; urgency=medium + + * debian/patches/01_autogen_copy_files.patch: use --force only + if $REQUIRED_AUTOMAKE_VERSION != 1.4 (closes: #281063). + + -- Jordi Mallach Sun, 14 Nov 2004 01:01:18 +0100 + +gnome-common (2.8.0-2) unstable; urgency=low + + * debian/patches/01_autogen_copy_files.patch: restore and update + this patch so all the bootstrap tools use --copy and --force + consistently (closes: #279841). + + -- Jordi Mallach Sun, 7 Nov 2004 18:48:17 +0100 + +gnome-common (2.8.0-1) unstable; urgency=low + + * New upstream release. + * debian/control.in: Add automake1.8 and automake1.9 to the automake + alternatives, as they are now supported (closes: #269024). + * debian/patches/01_autogen_copy_files.patch: removed. + * debian/patches/02_autogen_required_versions.patch: updated. + * debian/rules: adjust for new filenames, and install usage.txt with the + rest of the documentation. + + -- Jordi Mallach Sat, 2 Oct 2004 17:35:30 +0200 + +gnome-common (2.4.0-3) unstable; urgency=low + + * debian/control.in: change automake depends to + automake1.4 | automake1.7 | automake1.6, as depending on automaken is + wrong because we don't handle automake1.8 or automake1.9 (this will be + fixed in the next upload) (closes: #231915). + + -- Jordi Mallach Sun, 19 Sep 2004 01:11:58 +0200 + +gnome-common (2.4.0-2) unstable; urgency=low + + * debian/control.in: + + woops, add gnome-pkg-tools to build-deps too (closes: #232324). + + change section to "gnome", to match the override file. + * debian/changelog: remove old emacs variables. + + -- Jordi Mallach Thu, 12 Feb 2004 17:23:58 +0100 + +gnome-common (2.4.0-1) unstable; urgency=low + + * New maintainer. + * Acknowledge NMU (closes: #221843). + * debian/control: moved to control.in. + * debian/control.in: + + set myself as primary maintainer, add the GNOME Team to Uploaders. + + bump debhelper build-dep to (>= 4.1.0) and add cdbs. + * debian/rules: convert to cdbs. + * patches/01_autogen_copy_files.patch: new, imported from Debian's diff.gz. + * patches/02_autogen_required_versions.patch: revert change to automake + required version, as some GNOME packages haven't been fixed yet and + fail with Debian's gnome-common (thanks Malcolm; closes: #229571). + + -- Jordi Mallach Mon, 2 Feb 2004 19:14:26 +0100 + +gnome-common (2.4.0-0.1) unstable; urgency=low + + * Non-Maintainer Upload. + * New upstream release, which ends gnome-common's tour through Stone Age. + + works with current GNOME CVS modules (closes: #221843). + + groks configure.ac, at long last. + * debian/control: + + prefer automake1.7 to automaken, bump versions of gettext and libtool, + and add intltool to depends. + + make debhelper build-dep versioned for DH_COMPAT 3. + * debian/rules: remove a few files that are left behind on clean. + * macros2/autogen.sh: + + bump required version of automake to >= 1.5, gettext to >= 0.11, + intltool to >= 0.27.2. + + call libtoolize and intltoolize with --copy. + + -- Jordi Mallach Tue, 16 Dec 2003 15:22:14 +0100 + +gnome-common (1.2.4-4) unstable; urgency=low + + * change depend on automake to automaken (Closes: #168085). + * add --copy at the automake calls in autogen.sh (Closes: #153988). + * fixed compilerflags in gnome2-macros/compiler-flags.m4 (Closes: #167543). + * fixed variables in gnome-macros/gnome-guile-checks.m4 (Closes: #168355). + * added depend to gettext and changed gettextize to autopoint in autogen.sh + (Closes: #166490). + * new explaination for using gettext in autogen.sh script (Closes: #166474). + * add latest cvs ci from cvs.gnome.org to fix autoconf-2.52 brokeness, + thnx for hint, Mark Howard (Closes: #178071). + + -- Jan-Hendrik Palic Tue, 3 Sep 2002 21:54:36 +0200 + +gnome-common (1.2.4-3) unstable; urgency=low + + * reincluded DH_COMPAT=3 in debian/rules (Closes: #135384). + + -- Jan-Hendrik Palic Sat, 23 Feb 2002 21:40:52 +0100 + +gnome-common (1.2.4-2) unstable; urgency=low + + * fix description again, thanks to Filip Van Raemdonck (Closes: #118895). + * change to unversioned builddependency to debhelper and delete + DH_COMPAT=3 in debian/rules, for building gnome-common on potato + (Closes: #133895). + + -- Jan-Hendrik Palic Sat, 16 Feb 2002 18:46:12 +0100 + +gnome-common (1.2.4-1) unstable; urgency=low + + * new upstream (Closes: #129842). + * fixes description (Closes: #118895, #124684). + + -- Jan-Hendrik Palic Fri, 18 Jan 2002 23:59:33 +0100 + +gnome-common (1.2.3-1) unstable; urgency=low + + * Initial Release (Closes: #100802). + + -- Jan-Hendrik Palic Fri, 26 Oct 2001 01:42:53 +0200 --- gnome-common-2.12.0.orig/debian/compat +++ gnome-common-2.12.0/debian/compat @@ -0,0 +1 @@ +4 --- gnome-common-2.12.0.orig/debian/control.in +++ gnome-common-2.12.0/debian/control.in @@ -0,0 +1,15 @@ +Source: gnome-common +Section: gnome +Priority: optional +Maintainer: Jordi Mallach +Uploaders: @GNOME_TEAM@ +Build-Depends-Indep: debhelper (>= 4.1.0), cdbs, pkg-config, autotools-dev, gnome-pkg-tools +Standards-Version: 3.6.1.0 + +Package: gnome-common +Architecture: all +Depends: autoconf, automake1.4 | automake1.7 | automake1.9 | automake1.8 | automake1.6, libtool (>= 1.5), pkg-config, gettext (>= 0.11), intltool (>= 0.27.2) +Description: common scripts and macros to develop with GNOME or GNOME 2.0 + gnome-common is an extension to autoconf, automake and libtool for the GNOME + environment and GNOME using applications. Included are gnome-autogen.sh and + several macros to help in both GNOME and GNOME 2.0 source trees. --- gnome-common-2.12.0.orig/debian/watch +++ gnome-common-2.12.0/debian/watch @@ -0,0 +1,4 @@ +version=2 +ftp://ftp.gnome.org/pub/GNOME/sources/gnome-common/2.12/ \ + gnome-common-(.*)\.tar\.gz \ + debian uupdate --- gnome-common-2.12.0.orig/debian/copyright +++ gnome-common-2.12.0/debian/copyright @@ -0,0 +1,27 @@ +This package was debianized by Jan-Hendrik Palic on +Fri, 26 Oct 2001 01:42:53 +0200. + +It was downloaded from +ftp://ftp.gnome.org/pub/GNOME/testing/sources/gnome-common/gnome-common-1.2.4.tar.gz + +Upstream Author: Martin Baulig + +Copyright: + + This package is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 dated June, 1991. + + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this package; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, + USA. + +On Debian GNU/Linux systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL'. + --- gnome-common-2.12.0.orig/debian/rules +++ gnome-common-2.12.0/debian/rules @@ -0,0 +1,11 @@ +#!/usr/bin/make -f + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/rules/simple-patchsys.mk +include /usr/share/cdbs/1/class/autotools.mk +include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk + +clean:: + -rm -f config.log + +DEB_INSTALL_DOCS_gnome-common = doc/usage.txt --- gnome-common-2.12.0.orig/debian/README.Debian +++ gnome-common-2.12.0/debian/README.Debian @@ -0,0 +1,80 @@ +gnome-common for Debian +----------------------- + + + Using gnome-common with gettext + +gettextize and autogen.sh scripts +--------------------------------- +gettextize should NOT be run from autogen.sh scripts, if you are +doing so, you can fix it in two easy steps: + +- If it is not already there, add 'AM_GNU_GETTEXT_VERSION(x.y.z)' + to your configure.in or configure.ac, where x.y.z is the + version of gettext that your package is ready for. + +- Call 'autopoint' instead of 'gettextize' from your autogen.sh + script. + +If you don't have control over the autogen.sh script, like when +you use gnome-common, you can use the following trick to call +autopoint instead of gettextize: + + -`gnome-config --bindir`/gnome-autogen.sh + +gettextize () { autopoint --force; } + +source `gnome-config --bindir`/gnome-autogen.sh + + + The gnome-common module + +The gnome-common provides an easy way to use the GNOME autoconf macros in +applications which are developed outside of the GNOME CVS tree. Availability + +There are a couple of things installed: +/usr/share/aclocal/gnome-macros +All macros from the macros/ directory are installed here. +/usr/share/aclocal/gnome2-macros +This are the new macros from GNOME 2.0. +/usr/bin/gnome-autogen.sh +A modified version of the autogen.sh from the macros/ directory. + +If you previously had a macros/ directory in your package, you can now +remove it (when you have your package in the GNOME CVS tree, this is done in +the CVSROOT/modules file; to do this, look for a line starting with the name +of your module and remove the ¯os from it). autogen.sh + +In the autogen.sh script of your package, you use the following: +gnome-config --bindir/gnome-autogen.sh + +This calls the gnome-autogen.sh script which was installed by gnome-common. + +If you were previously using the macros/ directory, then you should find a . +macros/autogen.sh line in your autogen.sh. Simply replace it with the new +one. configure.in + +You need to place GNOME_COMMON_INIT somewhere in your configure.in. + +If you were previously using the macros/ directory, then you should find a +AM_ACLOCAL_INCLUDE(macros) line in your configure.in. Simply replace it with +GNOME_COMMON_INIT. Sample Usage + +I made a modified gnome-hello module which uses gnome-common instead of the +macros/ directory which can be found here: +ftp://ftp.home-of-linux.org/pub/gnome-common/GnomeHello-0.1.tar.gz Questions, +Comments, ... + +If you have any questions, comments or suggestions feel free to ask +(martin@home-of-linux.org). + + GNOME 2.0 + +This section is only intended for "hackers". + +You can also use the gnome-common module for GNOME 2.0 applications like +nautilus. + +To do this, you need to put USE_GNOME_2_MACROS=1 . +gnome-config --bindir/gnome-autogen.sh into your autogen.sh and remove +the hack-macros/ directory. + + -- Jan-Hendrik Palic , Fri, 17 Aug 2001 00:15:22 +0000