Commited changes from the 0.21 series

This commit is contained in:
Russell Sim 2015-05-06 21:46:53 +10:00
parent bc62400d7e
commit c7d01cbce9
5 changed files with 71 additions and 21 deletions

38
debian/changelog vendored
View File

@ -1,3 +1,41 @@
libgit2 (0.21.3-1.1) unstable; urgency=medium
* Non-maintainer upload.
* Use CURDIR instead of PWD to fix the previous upload (Closes: #761539).
-- Ivo De Decker <ivodd@debian.org> Thu, 08 Jan 2015 23:04:40 +0100
libgit2 (0.21.3-1) unstable; urgency=medium
* New upstream release 0.21.3 (CVE-2014-9390) (Closes: #774048).
* debian/rules: Run tests in a local tmpdir to fix FTBFS (Closes: #761539).
-- Russell Sim <russell.sim@gmail.com> Sun, 28 Dec 2014 18:52:18 +1100
libgit2 (0.21.2-2) unstable; urgency=medium
* debian/control: Added missing dependencies. (Closes: #768482)
-- Russell Sim <russell.sim@gmail.com> Sun, 16 Nov 2014 10:33:23 +0100
libgit2 (0.21.2-1) unstable; urgency=medium
* New upstream release 0.21.2.
* debian/control: Added libssh2-1-dev requirement. (Closes: #761042)
* debian/control: Added libhttp-parser-dev requirement.
* debian/copyright: Fixed MIT NGINX license format.
* debian/copyright: Reordered file sections.
* debian/copyright: Fixed incorrect clar licensing.
* Bumped standards version to 3.9.6 (no change necessary).
-- Russell Sim <russell.sim@gmail.com> Tue, 28 Oct 2014 20:34:58 +1100
libgit2 (0.21.1-1) unstable; urgency=medium
* New upstream release 0.21.1.
-- Russell Sim <russell.sim@gmail.com> Wed, 03 Sep 2014 12:41:44 +1000
libgit2 (0.21.0-1) UNRELEASED; urgency=medium
* New upstream release 0.21.0.

8
debian/control vendored
View File

@ -3,8 +3,9 @@ Section: libs
Priority: extra
Maintainer: Russell Sim <russell.sim@gmail.com>
Build-Depends: debhelper (>= 9.20120417), python-minimal (>= 2.4.0),
cmake, libz-dev, libssl-dev, ca-certificates
Standards-Version: 3.9.5
cmake, libz-dev, libssl-dev, libssh2-1-dev, libhttp-parser-dev,
ca-certificates
Standards-Version: 3.9.6
Homepage: http://libgit2.github.com/
Vcs-Git: git://anonscm.debian.org/users/arrsim-guest/libgit2.git
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=users/arrsim-guest/libgit2.git;a=summary
@ -14,7 +15,8 @@ Package: libgit2-dev
Architecture: any
Section: libdevel
Multi-Arch: same
Depends: libgit2-21 (= ${binary:Version}), libz-dev, libssl-dev,
Depends: libgit2-21 (= ${binary:Version}), libz-dev,
libssl-dev, libssh2-1-dev, libhttp-parser-dev,
${shlibs:Depends}, ${misc:Depends}
Description: low-level Git library (development files)
libgit2 is a portable, pure C implementation of the Git

34
debian/copyright vendored
View File

@ -2,6 +2,14 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: libgit2
Source: http://libgit2.github.com/
Files: *
Copyright: 2009-2012, the libgit2 contributors
License: GPL-2 with linking exception, origin admission
Files: debian/*
Copyright: 2011-2014, Russell Sim <russell.sim@gmail.com>
License: GPL-2+
Files: deps/regex/*
Copyright: 1985,1989-93,1995-98,2000,2001,2002,2003,2005,2006,2008 Free Software Foundation, Inc.
License: LGPL-2.1+
@ -11,6 +19,14 @@ Copyright: 1995-2010, Jean-loup Gailly
1995-2010, Mark Adler
License: Zlib
Files: deps/http-parser/*
Copyright: Igor Sysoev, Joyent, Inc. and other Node contributors
License: MIT+NGINX
Files: examples/*
Copyright: Public Domain
License: CC0
Files: src/khash.h
Copyright: 2008, 2009, 2011, Attractive Chaos <attractor@live.co.uk>
License: MIT
@ -20,10 +36,6 @@ Copyright: 2010, Christopher Swenson
2011, Vicent Marti
License: MIT
Files: deps/http-parser/*
Copyright: Igor Sysoev, Joyent, Inc. and other Node contributors
License: MIT with NGNIX extension
Files: src/path.c src/fnmatch.h
Copyright: 2008, The Android Open Source Project
License: BSD-2-clause
@ -58,7 +70,7 @@ Files: src/fnmatch.c
Copyright: 1989, 1993, 1994, The Regents of the University of California.
License: BSD-3-clause
Files: tests-clar/clar
Files: tests/clar/*
Copyright: 2011, Vicent Marti
License: MIT
@ -66,14 +78,6 @@ Files: tests/clar.h tests/clar.c tests/generate.py
Copyright: Vicent Marti
License: ISC
Files: examples/*
Copyright: Public Domain
License: CC0
Files: debian/*
Copyright: 2011-2014, Russell Sim <russell.sim@gmail.com>
License: GPL-2+
Files: src/date.c
Copyright: 2005, Linus Torvalds
License: GPL-2 with linking exception
@ -96,8 +100,6 @@ License: GPL-2 with linking exception
On Debian systems, the complete text of the GNU General
Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
Files: *
Copyright: 2009-2012, the libgit2 contributors
License: GPL-2 with linking exception, origin admission
libgit2 is Copyright (C) 2009-2011 the libgit2 contributors,
unless otherwise stated. See the AUTHORS file for details.
@ -307,7 +309,7 @@ License: MIT
THE SOFTWARE.
License: MIT with NGNIX extension
License: MIT+NGINX
http_parser.c is based on src/http/ngx_http_parse.c from NGINX copyright
Igor Sysoev and licensed under the MIT license.
.

View File

@ -1 +1,2 @@
libgit2-21: no-upstream-changelog
libgit2-21: spelling-error-in-binary

11
debian/rules vendored
View File

@ -9,6 +9,7 @@
#export DH_VERBOSE=1
DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
TEST_TMPDIR := $(CURDIR)/tmp-test
override_dh_auto_configure:
dh_auto_configure --builddirectory=build-debian-release -- \
@ -28,14 +29,20 @@ override_dh_auto_configure:
override_dh_makeshlibs:
dh_makeshlibs -V
override_dh_auto_build :
override_dh_auto_build:
dh_auto_build --builddirectory=build-debian-release
dh_auto_build --builddirectory=build-debian-devel
override_dh_auto_install :
override_dh_auto_install:
dh_auto_install --builddirectory=build-debian-release
dh_auto_install --builddirectory=build-debian-devel
override_dh_auto_test:
mkdir -p build-debian-release/tmp
TMPDIR=$(CURDIR)/build-debian-release/tmp dh_auto_test --builddirectory=build-debian-release
mkdir -p build-debian-devel/tmp
TMPDIR=$(CURDIR)/build-debian-devel/tmp dh_auto_test --builddirectory=build-debian-devel
override_dh_strip:
dh_strip --dbg-package=libgit2-dbg