diff options
| author | Igor Pashev <pashev.igor@gmail.com> | 2014-06-05 07:53:13 +0400 |
|---|---|---|
| committer | Igor Pashev <pashev.igor@gmail.com> | 2014-06-05 07:53:13 +0400 |
| commit | 1f9a9ca84829dabee36cdbb71c35f5ceadd6928a (patch) | |
| tree | be32397db09c52beb901df79066ef9376e4c1ce9 /debian | |
| parent | 80ef8a04e98a296f1040de080e69860b82e1aab7 (diff) | |
| parent | c62f2e29abd05a0afd640f6e55f5e2585406c78f (diff) | |
| download | kbuild-1f9a9ca84829dabee36cdbb71c35f5ceadd6928a.tar.gz | |
Merge branch 'master' of git://anonscm.debian.org/pkg-virtualbox/kbuild
Conflicts:
debian/changelog
debian/control
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 15 | ||||
| -rw-r--r-- | debian/control | 3 | ||||
| -rw-r--r-- | debian/orig-tar.sh | 2 |
3 files changed, 18 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index 4c4c4d8..7fcdc5a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,18 @@ +kbuild (1:0.1.9998svn2695+dfsg-1) unstable; urgency=low + + [ Ritesh Raj Sarraf ] + * [8c3dfc1] Exclude src/kmk/doc/make.texi from dfsg archive + * [00cc15e] Imported Upstream version 0.1.9998svn2695+dfsg + * [34ffb72] Add myself to Uploaders + + -- Ritesh Raj Sarraf <rrs@debian.org> Tue, 03 Dec 2013 12:06:57 +0530 + +kbuild (1:0.1.9998svn2577+dfsg-3) unstable; urgency=low + + * Add missing build-dependency on texinfo. (Closes: #712335) + + -- Felix Geyer <fgeyer@debian.org> Wed, 03 Jul 2013 11:59:45 +0200 + kbuild (1:0.1.9998svn2577+dfsg-2+dyson1) unstable; urgency=low * Package for Dyson diff --git a/debian/control b/debian/control index f356a82..c3aed76 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: devel Priority: extra Maintainer: Debian Virtualbox Team <pkg-virtualbox-devel@lists.alioth.debian.org> Uploaders: Michael Meskes <meskes@debian.org>, - Felix Geyer <fgeyer@debian.org> + Felix Geyer <fgeyer@debian.org>, Ritesh Raj Sarraf <rrs@debian.org> Build-Depends: debhelper (>= 9), autoconf, automake, @@ -12,6 +12,7 @@ Build-Depends: debhelper (>= 9), flex, libacl1-dev [!illumos-any], libkstat-dev [illumos-any], + texinfo Standards-Version: 3.9.4 Homepage: http://svn.netlabs.org/kbuild Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-virtualbox/kbuild.git diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh index 4e05e24..65df6a0 100644 --- a/debian/orig-tar.sh +++ b/debian/orig-tar.sh @@ -10,7 +10,7 @@ DIR=kbuild-$REVISION TAR=../kbuild_$VERSION.orig.tar.gz svn co -r $REVISION $SVNROOT $DIR -tar -c -z --exclude '*/kBuild/bin*' --exclude '*/out/*' --exclude '*/.svn*' -f $TAR $DIR +tar -c -z --exclude '*/kBuild/bin*' --exclude '*/out/*' --exclude '*/.svn*' --exclude '*/src/kmk/doc/make.texi' -f $TAR $DIR rm -rf $DIR # move to directory 'tarballs' |