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 +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Jan Luebbe Build-Depends: debhelper (>= 5.0.0) Standards-Version: 3.7.3 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 | abrowser | firefox-3.0 +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,24 @@ +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 Thu, 11 Dec 2008 13:21:50 +0530 + scrapbook (1.3.3.4-1) unstable; urgency=low * New upstream release @@ -11,6 +32,42 @@ -- Jan Luebbe Wed, 13 Feb 2008 22:25:30 +0100 +scrapbook (1.3.2.5-2ubuntu4) intrepid; urgency=low + + * fix LP: #272772: packages that Depend/Recommend/Suggest firefox + (meta-package) must alternatively Depend/Recommend/Suggest abrowser + - update debian/control + + -- Fabien Tassin Sun, 21 Sep 2008 23:16:45 +0200 + +scrapbook (1.3.2.5-2ubuntu3) hardy; urgency=low + + * In install.rdf: Bumped maxVersion to 3.0.* (LP: #212622) + + -- Sasa Bodiroza 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) 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) Mon, 11 Feb 2008 17:30:08 +0100 + scrapbook (1.3.2.5-2) unstable; urgency=low * Really add debian/watch file @@ -39,0 +97 @@ + 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} +