Merge authors: Dmitrijs Ledkovs (dmitrij.ledkov) ------------------------------------------------------------ revno: 47 [merge] committer: Jonathan Marsden <[email protected]> branch nick: main timestamp: Thu 2010-05-20 13:48:42 -0700 message: [ Jonathan Marsden ] [ Dmitrijs Ledkovs ] * debian/control: - Bumped standards version to 3.8.4, no changes required - Added myself to uploaders - Added Vcs fields - Removed duplicate quilt build-dep * debian/patches: add spelling-mistake.patch * debian/README.Source: small note that we are using quilt * debian/bibledit.links: Symlinking manpages bibleditgui.1 -> bibledit.1 * debian/patches: converted patch to just manpage (not touching Makefile.am) removed: debian/patches/02_bibledit-shutdown-manpage.patch added: debian/README.source debian/bibledit-shutdown.1 debian/bibledit.links debian/patches/spelling-mistake.patch modified: debian/changelog debian/control debian/manpages debian/patches/series
-- lp:~pkgcrosswire/bibledit/main https://code.launchpad.net/~pkgcrosswire/bibledit/main Your team Crosswire Packaging Team is subscribed to branch lp:~pkgcrosswire/bibledit/main. To unsubscribe from this branch go to https://code.launchpad.net/~pkgcrosswire/bibledit/main/+edit-subscription
=== added file 'debian/README.source' --- debian/README.source 1970-01-01 00:00:00 +0000 +++ debian/README.source 2010-03-22 00:25:27 +0000 @@ -0,0 +1,8 @@ +This package uses quilt to manage all modifications to the upstream +source. Changes are stored in the source package as diffs in +debian/patches and applied during the build. + +This package uses quilt in a standard way. For futher details see +/usr/share/doc/quilt/README.source + + -- Dmitrijs Ledkovs <[email protected]>, Tue, 25 Aug 2009 02:16:38 +0300 === added file 'debian/bibledit-shutdown.1' --- debian/bibledit-shutdown.1 1970-01-01 00:00:00 +0000 +++ debian/bibledit-shutdown.1 2010-03-22 01:48:09 +0000 @@ -0,0 +1,14 @@ +.TH BIBLEDIT-SHUTDOWN 1 "June 15 2009" "Version 3.7.42" +.SH NAME +.B bibledit-shutdown \- internal command for bibledit, a Bible editor +.SH DESCRIPTION +Bibledit is a Bible editor. +It is started by typing "bibledit" on +the commandline. +Binary "bibledit-shutdown" is used by Bibledit internally. +For more information see the +online help of the graphical user interface. +.PP +.SH LICENSE +This program is distributed under the GNU General Public License, as noted in +each source file. === added file 'debian/bibledit.links' --- debian/bibledit.links 1970-01-01 00:00:00 +0000 +++ debian/bibledit.links 2010-03-22 00:25:27 +0000 @@ -0,0 +1,1 @@ +usr/share/man/man1/bibledit.1.gz usr/share/man/man1/bibleditgui.1.gz === modified file 'debian/changelog' --- debian/changelog 2010-05-20 16:05:45 +0000 +++ debian/changelog 2010-05-20 20:48:42 +0000 @@ -1,4 +1,4 @@ -bibledit (4.0-2~lucid2) lucid; urgency=low +bibledit (4.0-2) unstable; urgency=low * debian/bibledit.install: - Add usr/share/pixmaps so menu icons work. @@ -18,12 +18,24 @@ bibledit (4.0-1) unstable; urgency=low + [ Jonathan Marsden ] * New upstream version 4.0 * debian/patches/*: Remove 03_fix-64bit-compile.patch (fixed upstream). * debian/control: - Added Build-Depends: openssh-client - -- Jonathan Marsden <[email protected]> Sat, 26 Dec 2009 23:11:26 -0800 + [ Dmitrijs Ledkovs ] + * debian/control: + - Bumped standards version to 3.8.4, no changes required + - Added myself to uploaders + - Added Vcs fields + - Removed duplicate quilt build-dep + * debian/patches: add spelling-mistake.patch + * debian/README.Source: small note that we are using quilt + * debian/bibledit.links: Symlinking manpages bibleditgui.1 -> bibledit.1 + * debian/patches: converted patch to just manpage (not touching Makefile.am) + + -- Dmitrijs Ledkovs <[email protected]> Mon, 22 Mar 2010 01:46:56 +0000 bibledit (3.8-1) unstable; urgency=low === modified file 'debian/control' --- debian/control 2010-05-15 21:02:27 +0000 +++ debian/control 2010-05-20 20:48:42 +0000 @@ -1,16 +1,20 @@ Source: bibledit Build-Depends: autotools-dev, quilt, patchutils (>= 0.2.25), cdbs (>= 0.4.27), debhelper (>= 7), libsqlite3-dev, pkg-config, libgtk2.0-dev, psmisc, - iputils-ping | ping, quilt, rcs, libenchant-dev, libgtkhtml3.14-dev, + iputils-ping | ping, rcs, libenchant-dev, libgtkhtml3.14-dev, git-core, libcurl4-gnutls-dev, libgtksourceview2.0-dev, libwebkit-dev, libdbus-glib-1-dev (>= 0.70), openssh-client, autoconf Section: gnome Priority: optional Maintainer: Debian Crosswire Packaging Team <[email protected]> Uploaders: Jonathan Marsden <[email protected]>, - Daniel Glassey <[email protected]> + Daniel Glassey <[email protected]>, + Dmitrijs Ledkovs <[email protected]> +>>>>>>> MERGE-SOURCE Standards-Version: 3.8.4 Homepage: http://www.bibledit.org +Vcs-Bzr: http://bazaar.launchpad.net/~pkgcrosswire/bibledit/main +Vcs-Browser: http://bazaar.launchpad.net/~pkgcrosswire/xiphos/main/files Package: bibledit Architecture: any === modified file 'debian/manpages' --- debian/manpages 2009-04-21 11:19:46 +0000 +++ debian/manpages 2010-03-22 01:48:09 +0000 @@ -1,1 +1,1 @@ -man/*.1 +debian/*.1 === removed file 'debian/patches/02_bibledit-shutdown-manpage.patch' --- debian/patches/02_bibledit-shutdown-manpage.patch 2009-06-15 07:11:14 +0000 +++ debian/patches/02_bibledit-shutdown-manpage.patch 1970-01-01 00:00:00 +0000 @@ -1,30 +0,0 @@ -Add a man page for bibledit-shutdown. -Index: main/man/Makefile.am -=================================================================== ---- main.orig/man/Makefile.am 2009-06-15 00:05:18.000000000 -0700 -+++ main/man/Makefile.am 2009-06-15 00:08:49.000000000 -0700 -@@ -1,3 +1,3 @@ --man_MANS = bibledit.1 bibledit-help.1 bibledit-one.1 bibledit-bin.1 bibledit-bibletime.1 bibledit-git.1 --EXTRA_DIST = bibledit.1 bibledit-help.1 bibledit-one.1 bibledit-bin.1 bibledit-bibletime.1 bibledit-git.1 update-date-version -+man_MANS = bibledit.1 bibledit-help.1 bibledit-one.1 bibledit-bin.1 bibledit-bibletime.1 bibledit-git.1 bibledit-shutdown.1 -+EXTRA_DIST = bibledit.1 bibledit-help.1 bibledit-one.1 bibledit-bin.1 bibledit-bibletime.1 bibledit-git.1 update-date-version bibledit-shutdown.1 - CLEANFILES = *~ -Index: main/man/bibledit-shutdown.1 -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ main/man/bibledit-shutdown.1 2009-06-15 00:08:49.000000000 -0700 -@@ -0,0 +1,14 @@ -+.TH BIBLEDIT-SHUTDOWN 1 "June 15 2009" "Version 3.7.42" -+.SH NAME -+.B bibledit-shutdown \- internal command for bibledit, a Bible editor -+.SH DESCRIPTION -+Bibledit is a Bible editor. -+It is started by typing "bibledit" on -+the commandline. -+Binary "bibledit-shutdown" is used by Bibledit internally. -+For more information see the -+online help of the graphical user interface. -+.PP -+.SH LICENSE -+This program is distributed under the GNU General Public License, as noted in -+each source file. === modified file 'debian/patches/series' --- debian/patches/series 2009-12-16 06:10:34 +0000 +++ debian/patches/series 2010-03-22 01:48:09 +0000 @@ -1,1 +1,1 @@ -02_bibledit-shutdown-manpage.patch +spelling-mistake.patch === added file 'debian/patches/spelling-mistake.patch' --- debian/patches/spelling-mistake.patch 1970-01-01 00:00:00 +0000 +++ debian/patches/spelling-mistake.patch 2010-03-22 00:25:27 +0000 @@ -0,0 +1,14 @@ +Spelling mistake found by lintian. +Index: bibledit/src/windowshowrelatedverses.cpp +=================================================================== +--- bibledit.orig/src/windowshowrelatedverses.cpp 2010-03-21 23:29:42.325865340 +0000 ++++ bibledit/src/windowshowrelatedverses.cpp 2010-03-21 23:29:50.793552830 +0000 +@@ -172,7 +172,7 @@ + + // Terms derived from the Strong's numbers in this verse. + htmlwriter.heading_open (3); +- htmlwriter.text_add ("Similiar words in other verses"); ++ htmlwriter.text_add ("Similar words in other verses"); + htmlwriter.heading_close (); + + // Get the data.
_______________________________________________ Pkg-crosswire-devel mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/pkg-crosswire-devel
