Merge ipe 6.0pre30-2 from Debian(Unstable)

Bug #192974 reported by Stefan Ebner
2
Affects Status Importance Assigned to Milestone
ipe (Ubuntu)
Fix Released
Undecided
Unassigned

Bug Description

Binary package hint: ipe

Debian changelog's entries since latest Ubuntu one:

 ipe (6.0pre30-2) unstable; urgency=low

   * debian/control: Merge repeated Conflicts line for libipe1c2a. Closes:
     #464303. Add Homepage field; remove homepage from ipe description.
     Add sharutils build-dep. Upgrade to standards-version 3.7.3; no
     changes required. Switch from substvar Source-Version to
     binary:Version.

   * debian/rules: Install desktop file and icon. Closes: #451022. Note
     that I'm not applying the stylesheet part of the patch.

   * src/ipelib/ipedct.cpp:
   * src/ipelib/ipepdfwriter.cpp: Include <cstring>, to build with GCC 4.3
     (thanks brian m. carlson). Closes: #454844.

   * src/ipecanvas/ipecanvaspainter.cpp:
   * src/ipecanvas/ipecanvaspainter.h:
   * src/ipecanvas/ipefonts.cpp:
   * src/ipelib/ipepdfparser.cpp: Applied patch dated 2007-12-14 for Ipe
     bug 253 (see http://http.theano.de/bugzilla). Closes: #455247.

   * ipe/menu.ipe: Change from section Apps/ to section Applications/ per
     menu documentation.

 -- Steve M. Robbins <email address hidden> Thu, 07 Feb 2008 00:49:24 -0600

Remaining changes to be merged:

    + debian/ipe.{desktop,png.uu}:
      - added files to provide an icon and desktop file
    + debian/control:
      - Updated to match Ubuntu Maintainer Policy
      - Added Build-Dep for sharutils
    + debian/rules:
      - Added lines to install desktop and png file.
    + debian/ipe.desktop:
      - removed deprecated "Encoding" key
      - reworded Comment key in line with HIG
    + src/ipelib/ipestdstyles.cpp: (LP: #162213)
      - added colors to default stylesheet (palette courtesy of Chris Conway).

Related branches

Stefan Ebner (sebner)
Changed in ipe:
assignee: nobody → hellboy195
Revision history for this message
Stefan Ebner (sebner) wrote :

I don't know why debian folks didn't apply the colors patch but if they do next time we can sync this package :)

Changed in ipe:
assignee: hellboy195 → nobody
status: New → Confirmed
Revision history for this message
Daniel Holbach (dholbach) wrote :

daniel@bert:~/ipe-6.0pre30$ patch -p1 < ../*diff
patching file debian/changelog
Hunk #1 FAILED at 1.
Hunk #2 succeeded at 25 with fuzz 2 (offset -8 lines).
Hunk #3 succeeded at 71 with fuzz 2 (offset 10 lines).
Hunk #4 succeeded at 121 with fuzz 2 (offset 25 lines).
1 out of 4 hunks FAILED -- saving rejects to file debian/changelog.rej
patching file debian/control
Hunk #1 FAILED at 2.
1 out of 1 hunk FAILED -- saving rejects to file debian/control.rej
patching file src/ipelib/ipestdstyles.cpp
Reversed (or previously applied) patch detected! Assume -R? [n] n
Apply anyway? [n] n
Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file src/ipelib/ipestdstyles.cpp.rej
daniel@bert:~/ipe-6.0pre30$

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

Oops... my bad.

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

This bug was fixed in the package ipe - 6.0pre30-2ubuntu1

---------------
ipe (6.0pre30-2ubuntu1) hardy; urgency=low

  * Merge from debian unstable. (LP: #192974) remaining changes:
      - Modify Maintainer value to match Debian-Maintainer-Field Spec
    + src/ipelib/ipestdstyles.cpp: (LP: #162213)
      - added colors to default stylesheet (palette courtesy of Chris Conway).

ipe (6.0pre30-2) unstable; urgency=low

  * debian/control: Merge repeated Conflicts line for libipe1c2a. Closes:
    #464303. Add Homepage field; remove homepage from ipe description.
    Add sharutils build-dep. Upgrade to standards-version 3.7.3; no
    changes required. Switch from substvar Source-Version to
    binary:Version.

  * debian/rules: Install desktop file and icon. Closes: #451022. Note
    that I'm not applying the stylesheet part of the patch.

  * src/ipelib/ipedct.cpp:
  * src/ipelib/ipepdfwriter.cpp: Include <cstring>, to build with GCC 4.3
    (thanks brian m. carlson). Closes: #454844.

  * src/ipecanvas/ipecanvaspainter.cpp:
  * src/ipecanvas/ipecanvaspainter.h:
  * src/ipecanvas/ipefonts.cpp:
  * src/ipelib/ipepdfparser.cpp: Applied patch dated 2007-12-14 for Ipe
    bug 253 (see http://http.theano.de/bugzilla). Closes: #455247.

  * ipe/menu.ipe: Change from section Apps/ to section Applications/ per
    menu documentation.

 -- Stefan Ebner <email address hidden> Mon, 18 Feb 2008 19:33:06 +0100

Changed in ipe:
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.