Merge firestarter 1.0.3-9 (universe) from Debian unstable (main)

[Mahyuddin Susanto]

Binary package hint: firestarter

Firestater can't build in natty because LDSO linking
http://people.ubuntuwire.org/~lucas/ubuntu-nbs/32/firestarter_1.0.3-8ubuntu1_lubuntu32.buildlog
http://people.ubuntuwire.org/~lucas/ubuntu-nbs/64/firestarter_1.0.3-8ubuntu1_lubuntu64.buildlog

Summary errors:
[LD_ERROR] libX11.so.6: could not read symbols: Invalid operation

Possibility to merge, 2 patch from Ubuntu landed in Debian and one changes not landed

[Mahyuddin Susanto (udienz)]

Building success with this debdiff,
log https://launchpad.net/~udienz/+archive/motu/+build/2112743

[Micah Gersten (micahg)]

Thank you for trying to make Ubuntu better. This should actually be a dpatch (current patch system) patch and not a change directly to the source. Please resubscribe ubuntu-sponsors when ready.

[Mahyuddin Susanto (udienz)]

Tested in Natty Pbuilder

[Micah Gersten (micahg)]

I'm sorry, but I asked about this patch and there are a few more things that need fixing:
* -l flags belong in LIBS, not LDFLAGS
* You should patch configure to pass the LIBS instead of patching Makefile.in
* You should add the appropriate -dev library to build-depends in debian/control for each of the LIBS flags that you add

Please subscribe ubuntu-sponsors when done.

[Artur Rona (ari-tczew)]

rename patch 23_fix_ftbfs_bingold.patch -> 23_fix_ftbfs_binutils-gold.dpatch
add DEP3 tags https://wiki.ubuntu.com/UbuntuDevelopment/PatchTaggingGuidelines

[Artur Rona (ari-tczew)]

@Micah Gersten: I see no point to adding libx11-dev to Build-Depends. Without this one package built fine (with Mahyuddin's patch).

@Mahyuddin Susanto: run also update-maintainer.

[Micah Gersten (micahg)]

@Artur Rona
It's part of the whole point of linking to the library, it's not just about fixing the FTBFS error.

@Mahyuddin Susanto
You're still patching the Make files, why not patch configure.in?

[Mahyuddin Susanto (udienz)]

Well Done

[Angel Abad (angelabad)]

Hi! There is a new Debian revision 1.0.3-9 including all previous ubuntu changes, but package still ftbfs in natty.

Thanks

[Mahyuddin Susanto (udienz)]

Aha... thanks Angel Albad and congratulations!
here is new debdiff from 1.0.3-9

[Lorenzo De Liso (blackz)]

Hello Angel,

> Hi! There is a new Debian revision 1.0.3-9 including all previous ubuntu changes, but package still ftbfs in natty.

The package in Debian includes the two patches present in the Ubuntu package but it doesn't include our added debian/watch file. I opened a bug report on the Debian BTS: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=609065 . We should still keep this change.

[Artur Rona (ari-tczew)]

Thank you for your work! However, there are some issues.

1.1) debian/changelog: You have typos like pacthes, should be patches. You can copy filename from debdiff.
1.2) debian/changelog: We usually put dropped changes at the end of revision.
1.3) debian/changelog: Please complete manually, not blindly grab from Merge-o-Matic since you can see unnecessary + and - in debdiff.
1.4) debian/changelog: Please mention change about debian/control.

2) debian/control: You lost one change:
-Depends: ${shlibs:Depends}, ${misc:Depends}, iptables (>= 1.2.11), gksu (>= 0.8.5), lsb-base (>=3.1)
+Depends: ${shlibs:Depends}, ${misc:Depends}, iptables (>= 1.2.11), menu, lsb-base (>=3.1)

3) debian/patches/23_fix_ftbfs_binutils-gold.dpatch: DEP3 tags.

[Artur Rona (ari-tczew)]

Thanks for trying fix, but still some issues:

1) Please avoid unnecessary changes in debian/changelog like:

   * New upstream release (closes: #284109)
@@ -192,7 +431,7 @@
     firestarter) is incompatible with /etc/ppp/ip-up.d/1firestarter.

  -- Yann Verley <email address hidden> Wed, 28 Nov 2004 22:23:07 +0100
-
+
 firestarter (0.9.3-6) unstable; urgency=low

   * adopting orphaned package.
@@ -454,0 +694 @@
+

You can see it in debdiff debian-ubuntu.

2) You added 2 patches, 23 and 24, but these are not a part of remaining changes so should be mentioned in separate star like dropped changes. Please forward them to Debian and upstream.

3) Please use better describe of change in debian/control. In future please research older entries in debian/changelog or Bazaar. I found following: "Replace gksu dependency with menu to ensure that su-to-root is available." (http://bazaar.launchpad.net/~ubuntu-branches/ubuntu/natty/firestarter/natty/revision/23)

4) Also debian/watch is described incorrect. Below remaining changes is a place for describe why change has been added. "Added from previous Ubuntu changes" is not a reason. I know that last uploader wasn't too talkative, so you can use "Added for uscan." Please forward it to Debian.

5) Please fix this change in debian/patches/00list:
-21_locales_failing
-22_remove_encoding_from_desktop
+21_locales_failing.dpatch
+22_remove_encoding_from_desktop.dpatch
You shouldn't touch it since it's not our delta. Keep patch filenames from Debian source.

6) Fix DEP3 tags in your patches. It should like in example: http://bazaar.launchpad.net/~ubuntu-branches/ubuntu/maverick/lcms/maverick-updates/revision/18#debian/patches/CVE-2009-0793.dpatch

7) If you have forwarded changes, please add to debian/changelog (Closes: #XXXXXX) as well.

[Artur Rona (ari-tczew)]

And please add closer (LP: #694413) to line with phrase "Merge from debian..." because now this bug report is related to merge, not about FTBFS.

Dunno why CVE has been linked :/ probably due to my last comment where is CVE in URL.

[Mahyuddin Susanto (udienz)]

Here is attached a new debdiff

1. Removed unnecessary changes in debian/changelog
2. Separate patch 23 and 24 from merge fields
3. updated description in d/changelog about d/control changes
4. updated description in d/changelog about adding d/watch
5. using patch from debian
6. used dep3 in patch as example files given by Ari
7. adding Closes: XXXX to d/changelog as a bug forwarded to debian

[Artur Rona (ari-tczew)]

I'll review it tomorrow.

[Artur Rona (ari-tczew)]

I did 2 changes:
- removed unnecessary blank line at the end of debian/changelog, MoM bug 681375 in future please review debdiff before submitting
- change "that landed" -> "which landed", english issue.
Now is very good. Congrats!

Thank you for your contribution!

[Launchpad Janitor (janitor)]

This bug was fixed in the package firestarter - 1.0.3-9ubuntu1

---------------
firestarter (1.0.3-9ubuntu1) natty; urgency=low

  * Merge from debian unstable. (LP: #694413) Remaining changes:
    - debian/watch: Added for uscan. (Closes: #609065)
    - debian/control: Replace gksu dependency with menu to ensure that
      su-to-root is available
  * debian/patches/23_fix_ftbfs_binutils-gold.dpatch: fix FTBFS
    binutils-gold with ld --no-add-needed by adding X11 library
    in src/Makefile.* (Closes: #554370)
  * debian/patches/24_fix_categories_and_path_desktop_file.dpatch: Removed
    extension in icon field, change System;Application; -> System;Security;
    (Closes: #611801)
  * Drop two patch Ubuntu which landed in Debian:
    - debian/patches/21_locales_failing.dpatch.
    - debian/patches/22_remove_encoding_from_desktop.dpatch.

firestarter (1.0.3-9) unstable; urgency=low

  * Update non-routables file from
    http://www.cymru.com/Documents/bogon-bn-nonagg.txt
    (closes: #604850)
  * Remove gksu dependency and add menu (closes: #551077)
  * Add Homepage link
  * Capitalise GTK in description (closes: #502932)
  * Add Ubuntu patches 21 (locales) and 22 (encoding) with
    thanks (closes: #585980)
  * Update Standards-Version
  * Update debhelper to V5.
  * Add $remote_fs to init script LSB header
  * Build-dep on chrpath to remove RPATH in binary
 -- Mahyuddin Susanto <email address hidden> Wed, 02 Feb 2011 19:54:34 +0700