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