Please merge scrapbook-1.3.3.4-1(universe) from debian unstable (main)

[Bhavani Shankar]

Binary package hint: scrapbook

Debian has a new version which needs to be merged.

[Bhavani Shankar (bhavi)]

scrapbook (1.3.3.4-1ubuntu1) intrepid; urgency=low

  * Merge from debian unstable, remaining changes (LP: #254649)
    - debian/control: Bumped to standards version 3.8.0 with no changes.

 -- Bhavani Shankar <email address hidden> Mon, 04 Aug 2008 18:57:57 +0530

[Michael Bienia (geser)]

Your merge changes more than just the standards version, please mention the changes properly in your changelog entry.

[Bhavani Shankar (bhavi)]

Ok here it is

scrapbook (1.3.3.4-1ubuntu1) intrepid; urgency=low

  * Merge from debian unstable, remaining changes (LP: #254649)
    - debian/control: Bumped to standards version 3.8.0 with no changes.

  * Change paths in debian/install, debian/links and debian/dirs.

  -- Bhavani Shankar <email address hidden> Tue, 05 Aug 2008 12:15:15 +0530

[Bhavani Shankar (bhavi)]

sorry left a line in the changelog: Modified is below:

scrapbook (1.3.3.4-1ubuntu1) intrepid; urgency=low

  * Merge from debian unstable, remaining changes (LP: #254649)
    - debian/control: Bumped to standards version 3.8.0 with no changes.
  * Change paths in debian/install, debian/links and debian/dirs.

  -- Bhavani Shankar <email address hidden> Tue, 05 Aug 2008 12:15:15 +0530

[Saša Bodiroža (jazzva)]

Hello,

I think there are more changes from previous versions that need to be mentioned. There are a lot of changes to debian/control from version 1.3.2.5-2ubuntu1, which aren't mentioned in remaining changes. Please add them.

Thanks for your work.

[Saša Bodiroža (jazzva)]

Sorry, I mentioned changes only to debian/control file, but there are also some more. For example, this one:

 * Remove the "iceweasel-scrapbook." prefix from file names.

[Bhavani Shankar (bhavi)]

Ok will do it in a coupla days

[Nathan Handler (nhandler)]

I have updated the bug description and title to reflect that this is a merge, and not a sync.

[Bhavani Shankar (bhavi)]

Okay! here is the changed debdiff:

[Nathan Handler (nhandler)]

"debian/control:" and all of the entries for it need to be indented. They are old Ubuntu changes that are being retained in the merge. As a result, they should be indented farther to the right than this line "Merge from debian unstable, remaining changes: (LP: #254649)". The last two items in your debian/changelog entry should also be indented more. I would line them up with the "debian/control:" line.

[Bhavani Shankar (bhavi)]

Okay here is the modified diff

[Saša Bodiroža (jazzva)]

Hello,

I would like if you could improve this a bit more:

 * additional dependency should be firefox-3.0, as firefox-3 package
doesn't exist. Please update that in the changelog entry, too.
 * it seems that you missed to include few more remaining changes,
specifically "Change iceweasel-scrapbook transitional package's arch
to all." from 1.3.2.5-2ubuntu2 and "Modify Maintainer value to match
the DebianMaintainerField specification." from 1.3.2.5-2ubuntu1
 * you can safely remove the line "usr/share/scrapbook
usr/lib/iceweasel/extensions/{53A03D43-5363-4669-8190-99061B2DEBA5}"
from debian/links, because we're not shipping Iceweasel. Pleas mention
that as a new change in the changelog.

Also, in case scrapbook 1.3.3.4 is compatible with Firefox 2, please
add firefox-2 package as additional dependency.

Thank you for your work.

[Daniel Holbach (dholbach)]

Unsubscribing Ubuntu Sponsors for universe from this bug for now.

[Steve Stalcup (vorian)]

Nice work on the changelog file.

Uploaded. Thank you for your contribution to Ubuntu. :)

[Launchpad Janitor (janitor)]

This bug was fixed in the package scrapbook - 1.3.3.4-1ubuntu1

---------------
scrapbook (1.3.3.4-1ubuntu1) jaunty; urgency=low

  * Merge from debian unstable, remaining changes: (LP: #254649)
    - debian/control:
      + Rename binary package to "scrapbook".
      + Change "Iceweasel" to "Firefox" in the short description.
      + Add a transitional package (iceweasel-scrapbook -> scrapbook),
        and a Conflicts to scrapbook against older iceweasel-scrapbook
        installations.
    - Remove the "iceweasel-scrapbook." prefix from file names.
    - Change paths in debian/install, debian/links and debian/dirs
    - Change iceweasel-scrapbook transitional package's arch to all
    - packages that Depend/Recommend/Suggest firefox
      (meta-package) must alternatively Depend/Recommend/Suggest abrowser
  * Updated alternative dependency to firefox-3.0. (LP: #272959)
  * Remove usr/share/scrapbook,/usr/lib/iceweasel/extensions/
    {53A03D43-5363-4669-8190-99061B2DEBA5}
    from debian/links as we arent shipping iceweasel.

 -- Bhavani Shankar <email address hidden> Thu, 11 Dec 2008 13:21:50 +0530