summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorDavid Prévot <taffit@debian.org>2012-12-30 16:27:03 -0400
committerFelix Geyer <fgeyer@debian.org>2013-01-17 22:34:53 +0100
commit8438f3573f8367ee6489084468064ed4429f654a (patch)
treea6bddd5eed2759f681c985b21832ac2f0b367f70 /debian
parent8f0c6da5ed3445e1abc9e6945f96e009e222f857 (diff)
parent361f05c7a4ee30ae04d1168db696e7003bd43dfc (diff)
downloadkbuild-8438f3573f8367ee6489084468064ed4429f654a.tar.gz
Imported Debian patch 1:0.1.9998svn2543+dfsg-0.1debian/1%0.1.9998svn2543+dfsg-0.1
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog8
-rwxr-xr-xdebian/rules2
-rw-r--r--debian/source/local-options2
3 files changed, 9 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog
index 9f83330..bbeb5ed 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+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@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)
diff --git a/debian/rules b/debian/rules
index e4cc389..152917d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,7 +6,7 @@ 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
diff --git a/debian/source/local-options b/debian/source/local-options
deleted file mode 100644
index 9cdfca9..0000000
--- a/debian/source/local-options
+++ /dev/null
@@ -1,2 +0,0 @@
-unapply-patches
-abort-on-upstream-changes