Please merge gnunet 0.8.0a-1 (universe) from Debian unstable (main).

Bug #256576 reported by Bhavani Shankar
4
Affects Status Importance Assigned to Milestone
gnunet (Ubuntu)
Fix Released
Wishlist
Unassigned

Bug Description

Debian has a new version which needs to be merged.

Tags: merge

Related branches

Revision history for this message
Daniel Holbach (dholbach) wrote :

What about

gnunet (0.8.0-1ubuntu1) intrepid; urgency=low

  * Merge from Debian unstable. (LP: #243082) Remaining Ubuntu changes:
    - debian/rules:
      + Make use of code from cdbs' clean-la.mk file to clear the
        dependency_libs field in all .la files in the gnunet-dev package.
    - Update maintainer field as per spec.

Changed in gnunet:
status: New → Incomplete
Revision history for this message
Bhavani Shankar (bhavi) wrote :
Changed in gnunet:
status: Incomplete → Confirmed
description: updated
Revision history for this message
Daniel Holbach (dholbach) wrote :

daniel@devel:~/gnunet-0.8.0a$ patch -p1 < ../debian.debdiff
patching file debian/rules
patching file debian/changelog
patch: **** malformed patch at line 32: * Merging upstream version 0.8.0a.

daniel@devel:~/gnunet-0.8.0a$

Changed in gnunet:
status: Confirmed → Incomplete
Revision history for this message
Bhavani Shankar (bhavi) wrote :
Changed in gnunet:
status: Incomplete → Confirmed
Revision history for this message
Daniel Holbach (dholbach) wrote :

daniel@devel:~/gnunet-0.8.0a$ patch -p1 < ../debian.debdiff
patching file debian/rules
patching file debian/changelog
patch: **** malformed patch at line 32: * Merging upstream version 0.8.0a.

daniel@devel:~/gnunet-0.8.0a$

Revision history for this message
Bhavani Shankar (bhavi) wrote :

bhavani@intrepid:~/gnunet-0.8.0a$ patch -p1 < ../debian.debdiff
patching file debian/rules
patching file debian/changelog
patching file debian/control
patching file debian/po/nl.po
patching file debian/po/vi.po
patching file po/de.po
patching file po/vi.po
patching file po/es.po
patching file po/sv.po
patching file po/GNUnet.pot
bhavani@intrepid:~/gnunet-0.8.0a$

Revision history for this message
Daniel Holbach (dholbach) wrote :

This looks much better. I'm just not sure about these changes yet:
  patching file debian/po/nl.po
  patching file debian/po/vi.po
  patching file po/de.po
  patching file po/vi.po
  patching file po/es.po
  patching file po/sv.po
  patching file po/GNUnet.pot

Why do we make translations changes?

Revision history for this message
Bhavani Shankar (bhavi) wrote :

Daniel, I really did not know that we must delete po files except when its done by us..

Here is the newly generated debdiff

Revision history for this message
Daniel Holbach (dholbach) wrote :

That's not the reason. None of our changelog entries mention that we changed any .po files. Your patch adds our changes to the Debian source package. Yet your patch seems to contain .po file changes. Why?

Revision history for this message
Launchpad Janitor (janitor) wrote :

This bug was fixed in the package gnunet - 0.8.0a-1ubuntu1

---------------
gnunet (0.8.0a-1ubuntu1) intrepid; urgency=low

  * Merge from debian unstable, remaining changes: (LP: #256576)
    - debian/rules:
     + Make use of code from cdbs' clean-la.mk file to clear the
        dependency_libs field in all .la files in the gnunet-dev
        package.

gnunet (0.8.0a-1) unstable; urgency=low

  * Merging upstream version 0.8.0a.

gnunet (0.8.0-2) unstable; urgency=low

  * Creating /var/run/gnunetd in initscript in case /var/run is on a tmpfs.
  * Adding versioned conflicts/replaces against gnunet in order to allow etch to
    lenny upgrades.
  * Updating contact address in po files.

 -- Bhavani Shankar <email address hidden> Tue, 19 Aug 2008 19:44:30 +0530

Changed in gnunet:
status: Confirmed → Fix Released
To post a comment you must log in.
This report contains Public information  
Everyone can see this information.

Other bug subscribers

Remote bug watches

Bug watches keep track of this bug in other bug trackers.