Hi,
I do not have the rights to change anything in collab-maint, therefore I
attached two patches to update the packaging for 4.6.0.
Cheers,
Julian
>From 8962724984919e869e7df54b72a389f0ec1ed63e Mon Sep 17 00:00:00 2001
From: Julian Wollrath <jwollr...@web.de>
Date: Sat, 9 Jul 2016 10:54:28 +0200
Subject: [PATCH 1/2] Change VCS URL to canonical ones
---
debian/control | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/debian/control b/debian/control
index 9c16e9c77467..e8fe751a24e1 100644
--- a/debian/control
+++ b/debian/control
@@ -5,8 +5,8 @@ Maintainer: Debian iproute2 Maintainers <ah-ipro...@debian.org>
Uploaders: Andreas Henriksson <andr...@fatal.se>,
Alexander Wirt <formo...@debian.org>
Homepage: http://www.linux-foundation.org/en/Net:Iproute2
-Vcs-Browser: http://git.debian.org/?p=collab-maint/pkg-iproute.git
-Vcs-Git: git://git.debian.org/git/collab-maint/pkg-iproute.git
+Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/pkg-iproute.git
+Vcs-Git: https://anonscm.debian.org/git/collab-maint/pkg-iproute.git
Standards-Version: 3.9.6
Build-Depends: bison,
cm-super-minimal,
--
2.8.1
>From 42708ed4fa16d1c65d33b08e71b51eec91335bc0 Mon Sep 17 00:00:00 2001
From: Julian Wollrath <jwollr...@web.de>
Date: Sat, 9 Jul 2016 10:47:49 +0200
Subject: [PATCH 2/2] Update packaging for 4.6.0
---
debian/changelog | 10 +++++++++
debian/control | 1 +
debian/patches/f_u32 | 63 ----------------------------------------------------
3 files changed, 11 insertions(+), 63 deletions(-)
delete mode 100644 debian/patches/f_u32
diff --git a/debian/changelog b/debian/changelog
index 601ead8981dd..11bc7370bd6a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+iproute2 (4.6.0-0.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Imported upstream version 4.6.0:
+ - Add build-dep on texlive-latex-extra for fullpage
+ * Remove debian/patches/f_u32
+ * Change VCS URLs to the canonical ones
+
+ -- Julian Wollrath <jwollr...@web.de> Sat, 09 Jul 2016 11:23:59 +0200
+
iproute2 (4.3.0-1) unstable; urgency=medium
* Add debian/gbp.conf
diff --git a/debian/control b/debian/control
index e8fe751a24e1..85580719f1de 100644
--- a/debian/control
+++ b/debian/control
@@ -22,6 +22,7 @@ Build-Depends: bison,
pkg-config,
texlive-fonts-recommended,
texlive-latex-base,
+ texlive-latex-extra,
texlive-latex-recommended
Package: iproute2
diff --git a/debian/patches/f_u32 b/debian/patches/f_u32
deleted file mode 100644
index 4505533652ad..000000000000
--- a/debian/patches/f_u32
+++ /dev/null
@@ -1,63 +0,0 @@
-#! /bin/sh -e
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fixes the u32 calculation for 2.6 kernel - by Russell Stuart <russell-deb...@stuart.id.au>
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
-
-if [ $# -ne 1 ]; then
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1
-fi
-case "$1" in
- -patch) patch $patch_opts -p1 < $0;;
- -unpatch) patch $patch_opts -p1 -R < $0;;
- *)
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1;;
-esac
-
-exit 0
-@DPATCH@
-diff -Nur iproute-20051007.keep/tc/f_u32.c iproute-20051007/tc/f_u32.c
---- iproute-20051007.keep/tc/f_u32.c 2006-01-12 17:34:37.000000000 +1000
-+++ iproute-20051007/tc/f_u32.c 2006-02-07 17:10:29.000000000 +1000
-@@ -17,6 +17,7 @@
- #include <syslog.h>
- #include <fcntl.h>
- #include <sys/socket.h>
-+#include <sys/utsname.h>
- #include <netinet/in.h>
- #include <arpa/inet.h>
- #include <string.h>
-@@ -874,6 +875,7 @@
- htid = (handle&0xFFFFF000);
- } else if (strcmp(*argv, "sample") == 0) {
- __u32 hash;
-+ struct utsname utsname;
- struct {
- struct tc_u32_sel sel;
- struct tc_u32_key keys[4];
-@@ -889,8 +891,19 @@
- return -1;
- }
- hash = sel2.sel.keys[0].val&sel2.sel.keys[0].mask;
-- hash ^= hash>>16;
-- hash ^= hash>>8;
-+ uname(&utsname);
-+ if (strncmp(utsname.release, "2.4.", 4) == 0) {
-+ hash ^= hash>>16;
-+ hash ^= hash>>8;
-+ }
-+ else {
-+ __u32 mask = sel2.sel.keys[0].mask;
-+ while (mask && !(mask & 1)) {
-+ mask >>= 1;
-+ hash >>= 1;
-+ }
-+ hash &= 0xFF;
-+ }
- htid = ((hash<<12)&0xFF000)|(htid&0xFFF00000);
- sample_ok = 1;
- continue;
--
2.8.1
