[Pkg-virtualbox-commits] [SCM] UNNAMED PROJECT branch, master, updated. debian/0.1.98svn2318-2-48-g8608718

Felix Geyer fgeyer at debian.org
Fri Jan 18 18:35:41 UTC 2013


The following commit has been merged in the master branch:
commit 8438f3573f8367ee6489084468064ed4429f654a
Merge: 8f0c6da5ed3445e1abc9e6945f96e009e222f857 361f05c7a4ee30ae04d1168db696e7003bd43dfc
Author: David Prévot <taffit at debian.org>
Date:   Sun Dec 30 16:27:03 2012 -0400

    Imported Debian patch 1:0.1.9998svn2543+dfsg-0.1

diff --combined debian/changelog
index 9f83330,0000000..bbeb5ed
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,324 -1,0 +1,332 @@@
++kbuild (1:0.1.9998svn2543+dfsg-0.1) unstable; urgency=low
++
++  * Non-maintainer upload.
++  * Remove unused and non DFSG-compliant src/kmk/doc/make.texi from source.
++    (Closes: #695779)
++
++ -- David Prévot <taffit at debian.org>  Sun, 30 Dec 2012 16:27:03 -0400
++
 +kbuild (1:0.1.9998svn2543-2) unstable; urgency=low
 +
 +  * Fix FTBFS on kfreebsd: link against pthread. (Closes: #645698)
 +    - Update 06_binutils-gold.diff
 +
 + -- Felix Geyer <debfx-pkg at fobos.de>  Wed, 30 Nov 2011 16:32:21 +0100
 +
 +kbuild (1:0.1.9998svn2543-1) unstable; urgency=low
 +
 +  * New upstream snapshot.
 +  * Refresh patches.
 +  * Switch to source format 3.0 (quilt).
 +    - Add unapply-patches and abort-on-upstream-changes to local-options.
 +  * Convert package from cdbs to dh(1).
 +  * Bump Standards-Version to 3.9.2, no changes needed.
 +  * Add gbp.conf and enable pristine-tar.
 +  * Enable DM-Upload-Allowed.
 +
 + -- Felix Geyer <debfx-pkg at fobos.de>  Sat, 20 Aug 2011 16:04:33 +0200
 +
 +kbuild (1:0.1.98svn2318-8) unstable; urgency=low
 +
 +  * Disable threads on 64bit kfreebsd systems.
 +
 + -- Michael Meskes <meskes at debian.org>  Wed, 26 May 2010 16:53:48 +0200
 +
 +kbuild (1:0.1.98svn2318-7) unstable; urgency=low
 +
 +  [ Michael Meskes ]
 +  * Remove hppa workaround that is no longer needed.
 +
 +  [ Felix Geyer ]
 +  * Split parts of kbuild-binutils-gold.diff into
 +    kbuild-hppa-disable-threads.diff.
 +  * Rename the patches so the filename starts with the patch number.
 +  * Add 07_special-chars-build-path.diff to fix FTBFS when the build path
 +    contains special characters.
 +
 + -- Michael Meskes <meskes at debian.org>  Tue, 18 May 2010 17:41:46 +0200
 +
 +kbuild (1:0.1.98svn2318-6) unstable; urgency=low
 +
 +  [ Felix Geyer ]
 +  * Replaced bintuils-gold patch by new one not breaking compilation on
 +    hppa. (Closes: #577604)
 +
 +  [ Michael Meskes ]
 +  * Added source/format file.
 +
 + -- Michael Meskes <meskes at debian.org>  Tue, 04 May 2010 16:16:46 +0200
 +
 +kbuild (1:0.1.98svn2318-5) unstable; urgency=low
 +
 +  * Add patch to fix build on armv7l. (LP: #535093) - thanks to
 +    Jamie Bennett <jb at canonical.com>
 +  * Added myself as uploader.
 +  * Bump Standards-Version to 3.8.4 (no changes).
 +  * Build-Depend on autopoint instead of cvs. (Closes: #572473)
 +  * Fix FTBFS with binutils-gold. (Closes: #554937)
 +
 + -- Felix Geyer <debfx-pkg at fobos.de>  Tue, 09 Mar 2010 19:50:28 +0100
 +
 +kbuild (1:0.1.98svn2318-4) unstable; urgency=low
 +
 +  [ Felix Geyer ]
 +  * Added patch from Fedora to fix build on POSIX.1-2008
 +    systems (Closes: #552843)
 +
 +  [ Michael Meskes ]
 +  * Remove all files created by build process.
 +
 + -- Michael Meskes <meskes at debian.org>  Sat, 31 Oct 2009 20:11:54 +0100
 +
 +kbuild (1:0.1.98svn2318-3) unstable; urgency=low
 +
 +  * Added patch to fix build on GNU/kFreeBSD. (Closes: #540665) - thanks
 +    to Julian Andres Klode <jak at debian.org>
 +  * Added patch to fix build on sh4. (Closes: #544974) - thanks to
 +    Nobuhiro Iwamatsu <iwamatsu at nigauri.org>
 +
 + -- Michael Meskes <meskes at debian.org>  Tue, 15 Sep 2009 15:37:35 +0200
 +
 +kbuild (1:0.1.98svn2318-2) unstable; urgency=low
 +
 +  * New maintainer (Closes: #534921).
 +  * Removing useless whitespaces at EOL and EOF.
 +  * Using correct rfc-2822 date formats in changelog.
 +  * Prefixing debhelper files with package name.
 +  * Rewriting manpage from scratch and in plain roff.
 +  * Updating vcs fields in control.
 +  * Updating package to debhelper 7.
 +  * Rewriting copyright file in machine-interpretable format.
 +  * Using tabs rather than space as separator in debhelper links file.
 +  * Updating uploaders field.
 +  * Updating package to standards version 3.8.3.
 +  * Sorting and wrapping depends.
 +
 + -- Daniel Baumann <daniel at debian.org>  Wed, 26 Aug 2009 17:15:33 +0200
 +
 +kbuild (1:0.1.98svn2318-1) unstable; urgency=low
 +
 +  * new upstream version (Closes: #523311)
 +  * Bump up Standards-Version: 3.8.1 (no changes).
 +  * Add manpage symlink for kDepObj.
 +
 + -- Torsten Werner <twerner at debian.org>  Fri, 10 Apr 2009 01:51:12 +0200
 +
 +kbuild (1:0.1.5svn2262-2) unstable; urgency=low
 +
 +  * Set KMK_THREADS_DISABLED := 1 to fix build problems on hppa.
 +
 + -- Torsten Werner <twerner at debian.org>  Wed, 11 Feb 2009 21:19:02 +0100
 +
 +kbuild (1:0.1.5svn2262-1) unstable; urgency=low
 +
 +  * new upstream version (Closes: #512631)
 +
 + -- Torsten Werner <twerner at debian.org>  Thu, 22 Jan 2009 15:40:58 +0100
 +
 +kbuild (1:0.1.5svn2062-1) unstable; urgency=low
 +
 +  * new upstream version
 +  * Remove patch lazy.diff that has been applied upstream.
 +
 + -- Torsten Werner <twerner at debian.org>  Wed, 12 Nov 2008 21:54:38 +0100
 +
 +kbuild (1:0.1.5svn2059-2) unstable; urgency=low
 +
 +  * Create SvnInfo.kmk during build process because the upstream svn does not
 +    ship it anymore.
 +
 + -- Torsten Werner <twerner at debian.org>  Sat, 08 Nov 2008 09:17:10 +0100
 +
 +kbuild (1:0.1.5svn2059-1) unstable; urgency=low
 +
 +  * new upstream version
 +  * Add patch lazy.diff to fix build process.
 +  * Add more manpage symlinks.
 +
 + -- Torsten Werner <twerner at debian.org>  Fri, 07 Nov 2008 23:25:40 +0100
 +
 +kbuild (1:0.1.4svn1804-1) unstable; urgency=low
 +
 +  * new upstream version
 +  * Bump up Standards-Version: 3.8.0 (no changes).
 +
 + -- Torsten Werner <twerner at debian.org>  Tue, 07 Oct 2008 20:50:48 +0200
 +
 +kbuild (1:0.1.3svn1610-1) unstable; urgency=low
 +
 +  * new upstream version (Closes: #479046, #480012)
 +  * Remove patch cpu.diff that has been applied upstream.
 +
 + -- Torsten Werner <twerner at debian.org>  Thu, 08 May 2008 20:20:07 +0200
 +
 +kbuild (1:0.1.3svn1587-1) unstable; urgency=low
 +
 +  * new upstream version
 +  * Add support for armv5tejl.
 +
 + -- Torsten Werner <twerner at debian.org>  Thu, 17 Apr 2008 22:08:34 +0200
 +
 +kbuild (1:0.1.2svn1393-2) unstable; urgency=high
 +
 +  * Add patch to fix build on parisc.
 +  * Set urgency to high because we are fixing a FTBFS bug on 1 arch.
 +
 + -- Torsten Werner <twerner at debian.org>  Thu, 10 Apr 2008 22:42:26 +0200
 +
 +kbuild (1:0.1.2svn1393-1) unstable; urgency=low
 +
 +  * new upstream release
 +  * Remove our patch because it has been applied upstream.
 +
 + -- Torsten Werner <twerner at debian.org>  Sun, 09 Mar 2008 22:29:26 +0100
 +
 +kbuild (1:0.1.2svn1377-5) unstable; urgency=low
 +
 +  * Add support for s390x.
 +
 + -- Torsten Werner <twerner at debian.org>  Sun, 30 Dec 2007 23:54:18 +0100
 +
 +kbuild (1:0.1.2svn1377-4) unstable; urgency=low
 +
 +  * Add support for mips.
 +
 + -- Torsten Werner <twerner at debian.org>  Sun, 30 Dec 2007 22:53:09 +0100
 +
 +kbuild (1:0.1.2svn1377-3) unstable; urgency=low
 +
 +  * Add support for armv5tel.
 +
 + -- Torsten Werner <twerner at debian.org>  Fri, 28 Dec 2007 23:39:11 +0100
 +
 +kbuild (1:0.1.2svn1377-2) unstable; urgency=low
 +
 +  * Add support for PA-RISC.
 +
 + -- Torsten Werner <twerner at debian.org>  Fri, 28 Dec 2007 13:20:11 +0100
 +
 +kbuild (1:0.1.2svn1377-1) unstable; urgency=low
 +
 +  * Use version number (KBUILD_VERSION) from file Config.kmk for our package.
 +  * Always bootstrap kBuild because it is required.
 +  * Add Build-Depends: autoconf, automake, cvs.
 +  * Remove Build-Depends: doxygen, kbuild.
 +
 + -- Torsten Werner <twerner at debian.org>  Sat, 22 Dec 2007 11:53:03 +0100
 +
 +kbuild (1377-2) unstable; urgency=low
 +
 +  * Add patch cpu.diff to support Debian's architectures.
 +  * Set LDFLAGS to -Wl,--as-needed to avoid linking of unneeded libraries.
 +  * Use the freshly built kmk for the installation step instead of the old one
 +    used for the build step. Rationale: that is a very basic test that the new
 +    kmk is really working.
 +
 + -- Torsten Werner <twerner at debian.org>  Fri, 21 Dec 2007 18:06:38 +0100
 +
 +kbuild (1377-1) unstable; urgency=low
 +
 +  * new upstream version
 +  * Add some debugging output (gcc macros).
 +  * Update Homepage and Vcs headers in debian/control.
 +  * Change Standards-Version: 3.7.3.
 +  * Add manpage symlinks for kmk_redirect and kmk_test.
 +
 + -- Torsten Werner <twerner at debian.org>  Fri, 21 Dec 2007 12:30:37 +0100
 +
 +kbuild (1366-1) unstable; urgency=low
 +
 +  * new upstream version
 +    - Does not ship kBuild.Doxyfile any more.
 +  * Remove all references to the obsoleted documentation files.
 +    (Closes: #454038)
 +  * Remove Depends: autoconf, automake1.9.
 +
 + -- Torsten Werner <twerner at debian.org>  Mon, 03 Dec 2007 18:59:04 +0100
 +
 +kbuild (1258-1) unstable; urgency=low
 +
 +  * new upstream release
 +  * Remove the last patch because it has been applied upstream.
 +
 + -- Torsten Werner <twerner at debian.org>  Sun, 28 Oct 2007 23:05:09 +0100
 +
 +kbuild (1173-1) unstable; urgency=low
 +
 +  * new upstream release
 +  * Fix the get-orig-source target in debian/rules.
 +  * Removed all patches that have been applied upstream.
 +  * Add more man page symlinks (kmk_cmp and kmk_md5sum).
 +
 + -- Torsten Werner <twerner at debian.org>  Tue, 02 Oct 2007 21:59:51 +0200
 +
 +kbuild (1096-1) unstable; urgency=low
 +
 +  * new upstream version
 +  * Add kbuild to Build-Depends.
 +  * Fix clean target. (Closes: #442611)
 +  * Comment the patches.
 +
 + -- Torsten Werner <twerner at debian.org>  Sun, 16 Sep 2007 19:06:22 +0200
 +
 +kbuild (1080-2) unstable; urgency=low
 +
 +  * Add patch arm.diff to support armv4l too.
 +
 + -- Torsten Werner <twerner at debian.org>  Sat, 21 Jul 2007 12:26:46 +0200
 +
 +kbuild (1080-1) unstable; urgency=low
 +
 +  * New upstream version
 +  * Add a patch debug.diff that fixes debugging output.
 +
 + -- Torsten Werner <twerner at debian.org>  Sat, 21 Jul 2007 08:27:12 +0200
 +
 +kbuild (1060-1) unstable; urgency=low
 +
 +  * New upstream version
 +  * Bootstrap every architecture again because some binaries are buggy.
 +
 + -- Torsten Werner <twerner at debian.org>  Sat, 09 Jun 2007 07:42:44 +0200
 +
 +kbuild (894-5) unstable; urgency=low
 +
 +  * Remove directory 'out' in clean target. (Closes: #424426)
 +
 + -- Torsten Werner <twerner at debian.org>  Sat, 19 May 2007 23:25:17 +0200
 +
 +kbuild (894-4) unstable; urgency=low
 +
 +  * Add hppa, ia64, mips, mipsel, powerpc, s390 to already bootstrapped
 +    architectures.
 +  * Add patch unused.diff to fix a build problem on alpha.
 +
 + -- Torsten Werner <twerner at debian.org>  Mon, 14 May 2007 05:30:43 +0200
 +
 +kbuild (894-3) unstable; urgency=low
 +
 +  * Add yet another fix for the missing architectures.
 +
 + -- Torsten Werner <twerner at debian.org>  Sat, 12 May 2007 18:32:30 +0200
 +
 +kbuild (894-2) unstable; urgency=low
 +
 +  * Complete the last (incomplete) patch.
 +
 + -- Torsten Werner <twerner at debian.org>  Sat, 12 May 2007 15:20:34 +0200
 +
 +kbuild (894-1) unstable; urgency=low
 +
 +  * New upstream revision.
 +  * Use the revision number from debian/changelog for debian/orig-tar.sh.
 +  * Add Build-Depends: kbuild [amd64 i386].
 +  * Add a patch to support all Debian architectures.
 +
 + -- Torsten Werner <twerner at debian.org>  Sat, 12 May 2007 14:38:49 +0200
 +
 +kbuild (893-1) unstable; urgency=low
 +
 +  * Initial release (Closes: #422367)
 +
 + -- Torsten Werner <twerner at debian.org>  Fri, 04 May 2007 20:35:40 +0200
diff --combined debian/rules
index e4cc389,0000000..152917d
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,43 -1,0 +1,43 @@@
 +#!/usr/bin/make -f
 +
 +UPSTREAM_VERSION := $(shell dpkg-parsechangelog | sed -n 's/^Version: *\([^-]\+\)-.\+/\1/p')
 +
 +YACC      := YACC=/usr/bin/byacc
 +BOOTSTRAP := ASH=/bin/bash ECHO=/bin/echo MKDIR=/bin/mkdir CP=/bin/cp \
 +  RM=/bin/rm INSTALL=/usr/bin/install $(YACC)
 +SVNROOT   := http://svn.netlabs.org/repos/kbuild/trunk
- REVISION  := $(shell echo $(UPSTREAM_VERSION) | sed -e's,.*svn,,')
++REVISION  := $(shell echo $(UPSTREAM_VERSION) | sed -e's,.*svn,,' | sed -e's,+dfsg.*,,')
 +
 +export LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS) -Wl,--as-needed
 +
 +%:
 +	dh $@
 +
 +override_dh_auto_configure:
 +	echo "KBUILD_SVN_URL := $(SVNROOT)"  >  SvnInfo.kmk
 +	echo "KBUILD_SVN_REV := $(REVISION)" >> SvnInfo.kmk
 +
 +override_dh_auto_build:
 +	$(info DEBUG: macros defined by gcc:)
 +	-gcc -dM -E - < /dev/null
 +	kBuild/env.sh --full make -f bootstrap.gmk SRCDIR=`pwd` $(BOOTSTRAP)
 +	kBuild/env.sh kmk rebuild PATH_INS=`pwd` KBUILD_VERBOSE=2 $(YACC)
 +
 +override_dh_auto_install:
 +	kBuild/env.sh kmk install NIX_INSTALL_DIR=/usr KBUILD_VERBOSE=2 LDFLAGS=-Wl,--as-needed
 +
 +override_dh_auto_clean:
 +	-kBuild/env.sh kmk uninstall
 +	rm -rf debian/stamp-* out kBuild/bin/*/* SvnInfo.kmk
 +	( cd src/kmk; rm -f aclocal.m4 config.h.in configure Makefile.in )
 +	( cd src/kmk/config; rm -f compile config.guess config.sub depcomp install-sh Makefile.in missing )
 +	rm -f src/kmk/glob/Makefile.in src/kmk/w32/Makefile.in
 +	( cd src/sed/config; rm -f intdiv0.m4 intmax.m4 inttypes_h.m4 inttypes.m4 inttypes-pri.m4 isc-posix.m4 longdouble.m4 longlong.m4 mkinstalldirs nls.m4 po.m4 printf-posix.m4 signed.m4 size_max.m4 stdint_h.m4 uintmax_t.m4 ulonglong.m4 wchar_t.m4 wint_t.m4 xsize.m4 )
 +	( cd src/sed/intl; rm -f libgnuintl.h.in localcharset.h log.c printf-args.c printf-args.h printf.c printf-parse.c printf-parse.h relocatable.c relocatable.h vasnprintf.c vasnprintf.h vasnwprintf.h wprintf-parse.h xsize.h )
 +	( cd src/sed/po; rm -f Makevars.template remove-potcdate.sin )
 +
 +get-orig-info:
 +	svn info $(SVNROOT)
 +
 +get-orig-source:
 +	sh debian/orig-tar.sh $(SVNROOT) $(UPSTREAM_VERSION) $(REVISION)

-- 
UNNAMED PROJECT



More information about the Pkg-virtualbox-commits mailing list