Ubuntu

Merge lp:~scarneiro/ubuntu/oneiric/pppstatus/fix-for-770756 into lp:ubuntu/oneiric/pppstatus

Proposed by Sebastian Carneiro on 2011-06-18
Status: Merged
Merged at revision: 4
Proposed branch: lp:~scarneiro/ubuntu/oneiric/pppstatus/fix-for-770756
Merge into: lp:ubuntu/oneiric/pppstatus
Diff against target: 39 lines (+9/-2) 3 files modified
To merge this branch: bzr merge lp:~scarneiro/ubuntu/oneiric/pppstatus/fix-for-770756
Reviewer Review Type Date Requested Status
Stefano Rivera Approve on 2011-07-06
Ubuntu branches 2011-06-18 Pending
Review via email: mp+65094@code.launchpad.net

Description of the Change

Changed linker parameters to work with GCC-4.6. Make other changes mainly from lintian recommendations.

To post a comment you must log in.
Sebastien Bacher (seb128) wrote :

Thank you for the work you did there, the package is coming from Debian (https://wiki.ubuntu.com/Debian) though so ideally we would be sent to their bug system (http://www.debian.org/Bugs/Reporting) so they can benefit from your fixes and it Ubuntu has less changes to carry and maintain which are duplicated efforts over what Debian is doing

We also try to limit the changes we do over Debian to required ones, while you standards version update and watch files are nice cleanups they are not really required in an Ubuntu specific way also

Sebastian Carneiro (scarneiro) wrote :

Sebastien, thanks for your review.

I need clarification about what the right course of action would be in a case like this:

 - Do I have to revert changes leaving only the required ones, or
 - Do I have to forward to Debian only the required changes, leaving the rest out of the patch ?

Again,

Thanks for your time.

Best regards.

Sebastien Bacher (seb128) wrote :

What I would recommend to do is to forward your diff it is to Debian and update the merge request to drop unrequired changes, fixes are fine to keep (i.e the maintainer script tokens or watch fixes) but changing the source format in an Ubuntu specific way doesn't seem a good idea

You also don't need to list the maintainer update in the changelog that's something we do for each source we modify in Ubuntu

5. By Sebastian Carneiro on 2011-06-21

Removed unrequired changes, following advice from Sebastien Bacher.

6. By Sebastian Carneiro on 2011-06-21

Removed unrequired changes, following advice from Sebastien Bacher.

Sebastian Carneiro (scarneiro) wrote :

Sebastien, did the following update to this branch:

- Removed debian/source/format;
- Restored previous values in debian/control for Standards-Version and Build-Depends.
- Removed references to previous change from changelog.

Please let me know if it's ok now, or further changes are needed.

Thanks for the patience!

Best regasrds.-

Michael Terry (mterry) wrote :

Sebastian, would you mind just making this branch hold the Makefile fix? The other changes are great and would ideally be sent on to Debian. But if Ubuntu accepts the extra changes, it would make it harder for us to go back to being in sync (we'd generally wait until Debian took them too).

Sebastian Carneiro (scarneiro) wrote :

Sure, no problem.

I will to that and let you know.

Thanks for your help !

Sebastian.

7. By Sebastian Carneiro on 2011-07-06

Reverted previous changes and holding only the ones on Makefile.

Sebastian Carneiro (scarneiro) wrote :

Changes reverted. Only the change on Makefile remains.

Best regards.

8. By Sebastian Carneiro on 2011-07-06

Removed extra line in changelog entry.

Stefano Rivera (stefanor) wrote :

Looks good, thanks.

Only issue was overly-long changelog lines. (lintian complains about it) Fixed on upload.

review: Approve

Preview Diff

1=== modified file 'Makefile'
2--- Makefile 2003-02-01 13:00:00 +0000
3+++ Makefile 2011-07-06 00:19:27 +0000
4@@ -17,7 +17,7 @@
5 all : pppstatus printdone
6
7 pppstatus : pppstatus.o
8- gcc $(CFLAGS) $(LDFLAGS) -o ${BIN} ${SRC}
9+ gcc $(CFLAGS) -o ${BIN} ${SRC} $(LDFLAGS)
10
11 pppstatus.o : pppstatus.h
12
13
14=== modified file 'debian/changelog'
15--- debian/changelog 2007-12-14 21:25:03 +0000
16+++ debian/changelog 2011-07-06 00:19:27 +0000
17@@ -1,3 +1,9 @@
18+pppstatus (0.4.2-10ubuntu1) oneiric; urgency=low
19+
20+ * Makefile: Changed order of linker parameters to work with GCC-4.6 (LP: #770756)
21+
22+ -- Sebastian Carneiro <scarneiro@fibertel.com.ar> Tue, 05 Jul 2011 21:13:54 -0300
23+
24 pppstatus (0.4.2-10) unstable; urgency=low
25
26 * Added code to postinst to remove obsolete pppstatus-clean.
27
28=== modified file 'debian/control'
29--- debian/control 2007-05-04 17:06:43 +0000
30+++ debian/control 2011-07-06 00:19:27 +0000
31@@ -1,7 +1,8 @@
32 Source: pppstatus
33 Section: net
34 Priority: optional
35-Maintainer: John Hasler <jhasler@debian.org>
36+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
37+XSBC-Original-Maintainer: John Hasler <jhasler@debian.org>
38 Build-Depends: debhelper (>> 2.0.0), libncurses5-dev
39 Standards-Version: 3.7.2.2
40

Subscribers

People subscribed via source and target branches