[Pkg-crosswire-devel] [Branch ~pkgcrosswire/bibledit/main] Rev 22: Revert previous commit r20

[noreply at launchpad.net]

------------------------------------------------------------
revno: 22
committer: Jonathan Marsden <jmarsden at fastmail.fm>
branch nick: main
timestamp: Tue 2009-04-21 00:49:53 -0700
message:
  Revert previous commit r20
modified:
  debian/changelog
  debian/control

=== modified file 'debian/changelog'
--- debian/changelog	2009-04-21 06:21:48 +0000
+++ debian/changelog	2009-04-21 07:49:53 +0000
@@ -4,14 +4,13 @@
   * debian/patches: Remove 01_manpage_section.patch, included upstream.
   * debian/control:
     - Remove unnecessary Section: headers.
-    - Remove Depends: ping from bibletime-data.
-    - Depend on iputils-ping | inetutils-ping, not ping.
+    - Depends iputils-ping | ping, not just ping.
     - Bump Standards-Version to 3.8.1 (no changes needed).
     - Soften Recommends: bibletime to Suggests:.
     - Remove Conflicts: scripturechecks from bibledit-data (Closes: #524194).
   * debian/copyright: Fix typo in licence file location description.
 
- -- Jonathan Marsden <jmarsden at fastmail.fm>  Mon, 20 Apr 2009 23:20:03 -0700
+ -- Jonathan Marsden <jmarsden at fastmail.fm>  Sat, 18 Apr 2009 16:43:29 -0700
 
 bibledit (3.6-1) unstable; urgency=low
 

=== modified file 'debian/control'
--- debian/control	2009-04-21 06:21:48 +0000
+++ debian/control	2009-04-21 07:49:53 +0000
@@ -1,7 +1,7 @@
 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 | inetutils-ping, quilt, rcs, libenchant-dev, libgtkhtml3.14-dev,
+ iputils-ping | ping, quilt, rcs, libenchant-dev, libgtkhtml3.14-dev,
  git-core, libcurl4-gnutls-dev, libgtksourceview2.0-dev
 Section: gnome
 Priority: optional
@@ -13,8 +13,7 @@
 
 Package: bibledit
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, psmisc, 
- iputils-ping | inetutils-ping, bibledit-data
+Depends: ${shlibs:Depends}, ${misc:Depends}, psmisc, iputils-ping | ping, bibledit-data
 Conflicts: scripturechecks
 Suggests: bibletime
 Provides: scripturechecks
@@ -34,7 +33,7 @@
 
 Package: bibledit-data
 Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, psmisc, iputils-ping | ping
 Suggests: bibletime
 Description: documentation and data for bibledit, a Bible translation tool
  Bibledit is a multi-platform USFM Bible editor or Scripture processor.



--
Packaging bibledit for Debian and Ubuntu
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.