Ubuntu
iproute2 package

Merge lp:~ubuntu-branches/ubuntu/saucy/iproute2/saucy-proposed-201307092231 into lp:ubuntu/saucy-proposed/iproute2

  1. Saucy (13.10)
  2. saucy-proposed-201307092231
  3. Merge into saucy-proposed
Proposed by Ubuntu Package Importer
Status: Needs review
Proposed branch: lp:~ubuntu-branches/ubuntu/saucy/iproute2/saucy-proposed-201307092231
Merge into: lp:ubuntu/saucy-proposed/iproute2
Diff against target: 114 lines (+100/-0) (has conflicts)
2 files modified
.pc/0006-fix-warn_unused_result.patch/Makefile (+83/-0)
debian/patches/0006-fix-warn_unused_result.patch (+17/-0)
Conflict adding file .pc/0006-fix-warn_unused_result.patch.  Moved existing file to .pc/0006-fix-warn_unused_result.patch.moved.
Conflict adding file debian/patches/0006-fix-warn_unused_result.patch.  Moved existing file to debian/patches/0006-fix-warn_unused_result.patch.moved.
To merge this branch: bzr merge lp:~ubuntu-branches/ubuntu/saucy/iproute2/saucy-proposed-201307092231
Reviewer Review Type Date Requested Status
Ubuntu Development Team Pending
Review via email: mp+173835@code.launchpad.net

Description of the change

The package importer has detected a possible inconsistency between the package history in the archive and the history in bzr. As the archive is authoritative the importer has made lp:ubuntu/saucy-proposed/iproute2 reflect what is in the archive and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/saucy/iproute2/saucy-proposed-201307092231. This merge proposal was created so that an Ubuntu developer can review the situations and perform a merge/upload if necessary. There are three typical cases where this can happen.
  1. Where someone pushes a change to bzr and someone else uploads the package without that change. This is the reason that this check is done by the importer. If this appears to be the case then a merge/upload should be done if the changes that were in bzr are still desirable.
  2. The importer incorrectly detected the above situation when someone made a change in bzr and then uploaded it.
  3. The importer incorrectly detected the above situation when someone just uploaded a package and didn't touch bzr.

If this case doesn't appear to be the first situation then set the status of the merge proposal to "Rejected" and help avoid the problem in future by filing a bug at https://bugs.launchpad.net/udd linking to this merge proposal.

(this is an automatically generated message)

To post a comment you must log in.

Unmerged revisions

8. By Stéphane Graber

releasing version 3.9.0-5ubuntu1

7. By Stéphane Graber

Add changelog

6. By Stéphane Graber

Disable Werror for now.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added directory '.pc/0006-fix-warn_unused_result.patch'
2=== renamed directory '.pc/0006-fix-warn_unused_result.patch' => '.pc/0006-fix-warn_unused_result.patch.moved'
3=== added file '.pc/0006-fix-warn_unused_result.patch/.timestamp'
4=== added file '.pc/0006-fix-warn_unused_result.patch/Makefile'
5--- .pc/0006-fix-warn_unused_result.patch/Makefile 1970-01-01 00:00:00 +0000
6+++ .pc/0006-fix-warn_unused_result.patch/Makefile 2013-07-09 22:38:25 +0000
7@@ -0,0 +1,83 @@
8+ROOTDIR=$(DESTDIR)
9+PREFIX=/usr
10+LIBDIR=$(PREFIX)/lib
11+SBINDIR=/sbin
12+CONFDIR=/etc/iproute2
13+DATADIR=$(PREFIX)/share
14+DOCDIR=$(DATADIR)/doc/iproute2
15+MANDIR=$(DATADIR)/man
16+ARPDDIR=/var/lib/arpd
17+
18+# Path to db_185.h include
19+DBM_INCLUDE:=$(ROOTDIR)/usr/include
20+
21+SHARED_LIBS = y
22+
23+DEFINES= -DRESOLVE_HOSTNAMES -DLIBDIR=\"$(LIBDIR)\"
24+ifneq ($(SHARED_LIBS),y)
25+DEFINES+= -DNO_SHARED_LIBS
26+endif
27+
28+DEFINES+=-DCONFDIR=\"$(CONFDIR)\"
29+
30+#options for decnet
31+ADDLIB+=dnet_ntop.o dnet_pton.o
32+
33+#options for ipx
34+ADDLIB+=ipx_ntop.o ipx_pton.o
35+
36+CC = gcc
37+HOSTCC = gcc
38+DEFINES += -D_GNU_SOURCE
39+CCOPTS = -O2
40+WFLAGS := -Wall -Wstrict-prototypes -Werror -Wmissing-prototypes
41+WFLAGS += -Wmissing-declarations -Wold-style-definition
42+
43+CFLAGS = $(WFLAGS) $(CCOPTS) -I../include $(DEFINES)
44+YACCFLAGS = -d -t -v
45+
46+SUBDIRS=lib ip tc bridge misc netem genl man
47+
48+LIBNETLINK=../lib/libnetlink.a ../lib/libutil.a
49+LDLIBS += $(LIBNETLINK)
50+
51+all: Config
52+ @set -e; \
53+ for i in $(SUBDIRS); \
54+ do $(MAKE) $(MFLAGS) -C $$i; done
55+
56+Config:
57+ sh configure $(KERNEL_INCLUDE)
58+
59+install: all
60+ install -m 0755 -d $(DESTDIR)$(SBINDIR)
61+ install -m 0755 -d $(DESTDIR)$(CONFDIR)
62+ install -m 0755 -d $(DESTDIR)$(ARPDDIR)
63+ install -m 0755 -d $(DESTDIR)$(DOCDIR)/examples
64+ install -m 0755 -d $(DESTDIR)$(DOCDIR)/examples/diffserv
65+ install -m 0644 README.iproute2+tc $(shell find examples -maxdepth 1 -type f) \
66+ $(DESTDIR)$(DOCDIR)/examples
67+ install -m 0644 $(shell find examples/diffserv -maxdepth 1 -type f) \
68+ $(DESTDIR)$(DOCDIR)/examples/diffserv
69+ @for i in $(SUBDIRS) doc; do $(MAKE) -C $$i install; done
70+ install -m 0644 $(shell find etc/iproute2 -maxdepth 1 -type f) $(DESTDIR)$(CONFDIR)
71+
72+snapshot:
73+ echo "static const char SNAPSHOT[] = \""`date +%y%m%d`"\";" \
74+ > include/SNAPSHOT.h
75+
76+clean:
77+ @for i in $(SUBDIRS) doc; \
78+ do $(MAKE) $(MFLAGS) -C $$i clean; done
79+
80+clobber:
81+ touch Config
82+ $(MAKE) $(MFLAGS) clean
83+ rm -f Config cscope.*
84+
85+distclean: clobber
86+
87+cscope:
88+ cscope -b -q -R -Iinclude -sip -slib -smisc -snetem -stc
89+
90+.EXPORT_ALL_VARIABLES:
91
92=== added file 'debian/patches/0006-fix-warn_unused_result.patch'
93--- debian/patches/0006-fix-warn_unused_result.patch 1970-01-01 00:00:00 +0000
94+++ debian/patches/0006-fix-warn_unused_result.patch 2013-07-09 22:38:25 +0000
95@@ -0,0 +1,17 @@
96+Change taken from Fedora, Werror currently causes a build failure
97+because of several cases of unchecked return value for fscanf fgets in
98+ss.c
99+
100+Index: iproute2/Makefile
101+===================================================================
102+--- iproute2.orig/Makefile 2013-07-09 18:08:14.811170000 -0400
103++++ iproute2/Makefile 2013-07-09 18:08:49.333718363 -0400
104+@@ -30,7 +30,7 @@
105+ HOSTCC = gcc
106+ DEFINES += -D_GNU_SOURCE
107+ CCOPTS = -O2
108+-WFLAGS := -Wall -Wstrict-prototypes -Werror -Wmissing-prototypes
109++WFLAGS := -Wall -Wstrict-prototypes -Wmissing-prototypes
110+ WFLAGS += -Wmissing-declarations -Wold-style-definition
111+
112+ CFLAGS = $(WFLAGS) $(CCOPTS) -I../include $(DEFINES)
113
114=== renamed file 'debian/patches/0006-fix-warn_unused_result.patch' => 'debian/patches/0006-fix-warn_unused_result.patch.moved'

Subscribers

People subscribed via source and target branches

to all changes: