reverted:
--- scrapbook-1.3.3.4/debian/iceweasel-scrapbook.dirs
+++ scrapbook-1.3.3.4.orig/debian/iceweasel-scrapbook.dirs
@@ -1,2 +0,0 @@
-usr/share/iceweasel-extensions/scrapbook
-usr/lib/iceweasel/extensions
diff -u scrapbook-1.3.3.4/debian/control scrapbook-1.3.3.4/debian/control
--- scrapbook-1.3.3.4/debian/control
+++ scrapbook-1.3.3.4/debian/control
@@ -1,17 +1,19 @@
 Source: scrapbook
 Section: web
 Priority: optional
-Maintainer: Jan Lübbe <jluebbe@debian.org>
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+XSBC-Original-Maintainer: Jan Luebbe <jluebbe@debian.org>
 Build-Depends: debhelper (>= 5.0.0)
-Standards-Version: 3.7.3
+Standards-Version: 3.8.0
 Homepage: http://amb.vis.ne.jp/mozilla/scrapbook/
 Vcs-Browser: http://git.sicherheitsschwankung.de/?p=jan/scrapbook.git
 Vcs-Git: git://git.sicherheitsschwankung.de/jan/scrapbook.git
 
-Package: iceweasel-scrapbook
+Package: scrapbook
 Architecture: all
-Depends: iceweasel (>= 2.0.0.3-1)
-Description: Iceweasel extension to save and manage Web pages
+Depends: firefox | firefox-2
+Conflicts: iceweasel-scrapbook (<= 1.3.1-1)
+Description: Firefox extension to save and manage Web pages
  ScrapBook is a Firefox extension, which helps you to save Web pages
  and manage the collection. Key features are lightness, speed, accuracy
  and multi-language support. Major features are:
@@ -26,0 +29,9 @@
+Package: iceweasel-scrapbook
+Architecture: all
+Depends: scrapbook
+Description: dummy transitional package for ScrapBook
+ ScrapBook is a Firefox extension, which helps you to save Web pages
+ and manage the collection. Key features are lightness, speed, accuracy
+ and multi-language support.
+ .
+ This is just a transitional package; see scrapbook instead.
diff -u scrapbook-1.3.3.4/debian/changelog scrapbook-1.3.3.4/debian/changelog
--- scrapbook-1.3.3.4/debian/changelog
+++ scrapbook-1.3.3.4/debian/changelog
@@ -1,3 +1,10 @@
+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 <right2bhavi@gmail.com>  Mon, 04 Aug 2008 18:57:57 +0530
+
 scrapbook (1.3.3.4-1) unstable; urgency=low
 
   * New upstream release
@@ -11,6 +18,34 @@
 
  -- Jan Luebbe <jluebbe@debian.org>  Wed, 13 Feb 2008 22:25:30 +0100
 
+scrapbook (1.3.2.5-2ubuntu3) hardy; urgency=low
+
+  * In install.rdf: Bumped maxVersion to 3.0.* (LP: #212622)
+
+ -- Sasa Bodiroza <jazzva@gmail.com>  Sun, 06 Apr 2008 03:32:40 +0200
+
+scrapbook (1.3.2.5-2ubuntu2) hardy; urgency=low
+
+  * Change iceweasel-scrapbook transitional package's arch to all.
+
+ -- Siegfried-Angel Gevatter Pujals (RainCT) <rainct@ubuntu.com>  Tue, 12 Feb 2008 20:34:20 +0100
+
+scrapbook (1.3.2.5-2ubuntu1) hardy; urgency=low
+
+  * debian/control:
+     - Rename binary package to "scrapbook" (LP: #184115).
+     - Change "Iceweasel" to "Firefox" in the short description.
+     - Add firefox as an alternative dependency to iceweasel.
+     - Add a transitional package (iceweasel-scrapbook -> scrapbook),
+       and a Conflicts to scrapbook against older iceweasel-scrapbook
+       installations.
+     - Modify Maintainer value to match the DebianMaintainerField
+       specification.
+  * Remove the "iceweasel-scrapbook." prefix from file names.
+  * Change paths in debian/install, debian/links and debian/dirs.
+
+ -- Siegfried-Angel Gevatter Pujals (RainCT) <rainct@ubuntu.com>  Mon, 11 Feb 2008 17:30:08 +0100
+
 scrapbook (1.3.2.5-2) unstable; urgency=low
 
   * Really add debian/watch file
@@ -39,0 +75 @@
+
reverted:
--- scrapbook-1.3.3.4/debian/iceweasel-scrapbook.links
+++ scrapbook-1.3.3.4.orig/debian/iceweasel-scrapbook.links
@@ -1 +0,0 @@
-usr/share/iceweasel-extensions/scrapbook usr/lib/iceweasel/extensions/{53A03D43-5363-4669-8190-99061B2DEBA5}
reverted:
--- scrapbook-1.3.3.4/debian/iceweasel-scrapbook.install
+++ scrapbook-1.3.3.4.orig/debian/iceweasel-scrapbook.install
@@ -1 +0,0 @@
-chrome chrome.manifest install.rdf defaults usr/share/iceweasel-extensions/scrapbook
only in patch2:
unchanged:
--- scrapbook-1.3.3.4.orig/debian/install
+++ scrapbook-1.3.3.4/debian/install
@@ -0,0 +1 @@
+chrome chrome.manifest install.rdf defaults usr/share/scrapbook
only in patch2:
unchanged:
--- scrapbook-1.3.3.4.orig/debian/links
+++ scrapbook-1.3.3.4/debian/links
@@ -0,0 +1,3 @@
+usr/share/scrapbook usr/lib/firefox/extensions/{53A03D43-5363-4669-8190-99061B2DEBA5}
+usr/share/scrapbook usr/lib/firefox-addons/extensions/{53A03D43-5363-4669-8190-99061B2DEBA5}
+usr/share/scrapbook usr/lib/iceweasel/extensions/{53A03D43-5363-4669-8190-99061B2DEBA5}