Ubuntu

Merge lp:~scarneiro/ubuntu/oneiric/googlizer/fix-for-770806 into lp:ubuntu/oneiric/googlizer

Proposed by Sebastian Carneiro on 2011-06-18
Status: Merged
Merged at revision: 4
Proposed branch: lp:~scarneiro/ubuntu/oneiric/googlizer/fix-for-770806
Merge into: lp:ubuntu/oneiric/googlizer
Diff against target: 48 lines (+12/-2) 4 files modified
To merge this branch: bzr merge lp:~scarneiro/ubuntu/oneiric/googlizer/fix-for-770806
Reviewer Review Type Date Requested Status
Michael Terry Approve on 2011-07-05
Ubuntu branches 2011-06-18 Pending
Review via email: mp+65088@code.launchpad.net

Description of the Change

Changed linker parameters in Makefile to work with GCC-4.6. Make some changes based on lintian analysis.

Thanks and Best Regards.

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 :

Similar to the other merge request you should send your diff to Debian but limit the Ubuntu merge request to fixes, changing the source format or standards version for example is not really a delta we need over Debian

5. By Sebastian Carneiro on 2011-06-22

Removed changes not required to fix the associated bug, as adviced.

Sebastian Carneiro (scarneiro) wrote :

Branch updated with the following:

- Removed file debian/compat.
- Restored Standards-Version and Build-Depends to previous values.
- Removed changes from debian/rules.
- Removed entries in changelog corresponding to these reverted changes.

Please, if you see anything else that needs changing, let me know. I'm grateful for your advice, so I can learn to do correct packaging.

Thanks for the patience!

Best Regards.

Michael Terry (mterry) wrote :

Thanks, Sebastian. I uploaded with only one change: I ran 'update-maintainer' because it is Ubuntu policy to do so whenever we introduce a delta with Debian.

I also forwarded the misc:Depends and debian/watch changes on to Debian.

review: Approve
Sebastian Carneiro (scarneiro) wrote :

Thanks to you, Michael.

I will take your comments into account, so I don't miss those changes from next merge proposals.

Best regards,

Sebastian.

Preview Diff

1=== modified file 'Makefile'
2--- Makefile 2003-04-02 00:51:16 +0000
3+++ Makefile 2011-06-22 00:31:25 +0000
4@@ -4,7 +4,7 @@
5 mandir=$(datadir)/man
6
7 googlizer: googlizer.o
8- gcc `pkg-config --libs libgnomeui-2.0 libgnome-2.0 gtk+-2.0 glib-2.0` $< -o $@
9+ gcc $< -o $@ `pkg-config --libs libgnomeui-2.0 libgnome-2.0 gtk+-2.0 glib-2.0`
10
11 googlizer.o: googlizer.c
12 gcc `pkg-config --cflags libgnomeui-2.0 libgnome-2.0 gtk+-2.0 glib-2.0` -c $<
13
14=== modified file 'debian/changelog'
15--- debian/changelog 2005-04-24 17:48:11 +0000
16+++ debian/changelog 2011-06-22 00:31:25 +0000
17@@ -1,3 +1,11 @@
18+googlizer (0.3-3ubuntu1) oneiric; urgency=low
19+
20+ * Makefile: reordered linker parameters to work with GCC-4.6 (LP: #770806)
21+ * debian/control: Added dependency misc dependency to binary package section.
22+ * Added debian/watch to allow uscan to check for new versions.
23+
24+ -- Sebastian Carneiro <scarneiro@fibertel.com.ar> Tue, 21 Jun 2011 21:20:59 -0300
25+
26 googlizer (0.3-3) unstable; urgency=medium
27
28 * Rebuild because liblinc1 has gone. (closes: #306152)
29
30=== modified file 'debian/control'
31--- debian/control 2003-04-02 00:51:16 +0000
32+++ debian/control 2011-06-22 00:31:25 +0000
33@@ -7,7 +7,7 @@
34
35 Package: googlizer
36 Architecture: any
37-Depends: ${shlibs:Depends}
38+Depends: ${shlibs:Depends}, ${misc:Depends}
39 Recommends: gnome-panel
40 Description: utility to search Google via your GNOME menu/panel
41 This is a very simple and very handy utility that just spawns the
42
43=== added file 'debian/watch'
44--- debian/watch 1970-01-01 00:00:00 +0000
45+++ debian/watch 2011-06-22 00:31:25 +0000
46@@ -0,0 +1,2 @@
47+version=3
48+http://ftp.acc.umu.se/pub/GNOME/sources/googlizer/(\d\.\d)/googlizer-([\d\.]*)\.tar\.gz

Subscribers

People subscribed via source and target branches