[SCM] BOINC packaging branch, master, updated. debian/6.10.17+dfsg-3-30-g3bfb038

rmayorga rmayorga at debian.org
Wed Jul 14 01:14:43 UTC 2010


The following commit has been merged in the master branch:
commit 3bfb0382ff5987464f76b6f3c279ea062faaad70
Author: rmayorga <rmayorga at debian.org>
Date:   Tue Jul 13 19:12:17 2010 -0600

    Update changelog entry, set correct Debian Distribution

diff --git a/debian/changelog b/debian/changelog
index 8fa4751..d2e967c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,51 +1,29 @@
-boinc (6.10.58-1) lucid; urgency=low
+boinc (6.10.58-1) unstable; urgency=low
 
+  [ Steffen Moeller ]
   * Adopted Daniel's changes for Debian, added him to
     uploaders.
   * Allowed DM-Upload (for Daniel)
   * Eye candy in debian/README* and debian/po*
   * Updated my email address
 
- -- Steffen Moeller <moeller at debian.org>  Wed, 14 Jul 2010 00:44:46 +0200
-
-boinc (6.10.58-0ubuntu2~blueyedppa1~lucid) lucid; urgency=low
-
-  * Backport for Lucid.
-
- -- Daniel Hahler <ubuntu at thequod.de>  Tue, 13 Jul 2010 22:55:35 +0200
-
-boinc (6.10.58-0ubuntu2) maverick; urgency=low
-
+  [ Daniel Hahler ]
   * Refresh patches, especially 006_correct_catalog_path.patch
-  * New release fixes LP: #452213
-
- -- Daniel Hahler <ubuntu at thequod.de>  Tue, 13 Jul 2010 22:50:29 +0200
-
-boinc (6.10.58-0ubuntu1) maverick; urgency=low
-
   * New upstream release
-
- -- Daniel Hahler <ubuntu at thequod.de>  Tue, 13 Jul 2010 22:29:47 +0200
-
-boinc (6.10.17+dfsg-3ubuntu2) maverick; urgency=low
-
   * Check that files exist on which we tweak permissions
-    during post-installation (LP: #572612)
-
- -- Daniel Hahler <ubuntu at thequod.de>  Sun, 02 May 2010 00:39:26 +0200
-
-boinc (6.10.17+dfsg-3ubuntu1) lucid; urgency=low
+    during post-installation
+  * Bump build-depend on debhelper to install udev rules into
+    /lib/udev/rules.d, add Breaks on udev to get correct version.
+  * Provide meta package "boinc", which depends on boinc-client and
+     boinc-manager.
+  * debian/control: libmysqlclient15-dev -> libmysqlclient-dev
 
-  * Merge from debian testing.  Remaining changes:
-    - Bump build-depend on debhelper to install udev rules into
-      /lib/udev/rules.d, add Breaks on udev to get correct version.
-    - Provide meta package "boinc", which depends on boinc-client and
-      boinc-manager.
-    - debian/control: libmysqlclient15-dev -> libmysqlclient-dev 
-      transition.
-  * Fixes LP: #512977
+  [ Rene Mayorga ]
+  * Set the correct distribution (unstable).
+  * Trim some Ubuntu's specific changelog entries and merge all 
+    last Daniel's changes on this changelog enty.
 
- -- Daniel Hahler <ubuntu at thequod.de>  Sat, 13 Mar 2010 01:06:53 +0100
+ -- Rene Mayorga <rmayorga at debian.org>  Tue, 13 Jul 2010 18:58:58 -0600
 
 boinc (6.10.17+dfsg-3) unstable; urgency=low
 
@@ -62,21 +40,6 @@ boinc (6.10.17+dfsg-2ubuntu2) lucid; urgency=low
 
  -- Ilya Barygin <barygin at gmail.com>  Tue, 26 Jan 2010 14:05:12 +0300
 
-boinc (6.10.17+dfsg-2ubuntu1) lucid; urgency=low
-
-  * Merge from Debian testing, remaining changes:
-    - Bump build-depend on debhelper to install udev rules into
-      /lib/udev/rules.d, add Breaks on udev to get correct version.
-    - Provide meta package "boinc", which depends on boinc-client and
-      boinc-manager.
-    - debian/control: libmysqlclient15-dev -> libmysqlclient-dev 
-      transition. 
-  * Drop Ubuntu patch, package builds without it:
-    - Fix FTBFS, added 103_include_config_h.patch, use system functions
-      when available
-
- -- Ilya Barygin <barygin at gmail.com>  Tue, 26 Jan 2010 01:06:53 +0300
-
 boinc (6.10.17+dfsg-2) unstable; urgency=low
 
   * debian/control: remove kboincspy from boinc-client Suggest
@@ -86,25 +49,6 @@ boinc (6.10.17+dfsg-2) unstable; urgency=low
 
  -- Rene Mayorga <rmayorga at debian.org>  Wed, 18 Nov 2009 19:04:45 -0600
 
-boinc (6.10.17+dfsg-1ubuntu2) lucid; urgency=low
-
-  * debian/control: libmysqlclient15-dev -> libmysqlclient-dev 
-    transition. 
-
- -- Chuck Short <zulcss at ubuntu.com>  Thu, 14 Jan 2010 14:37:48 -0500
-
-boinc (6.10.17+dfsg-1ubuntu1) lucid; urgency=low
-
-  * Merge from debian testing (LP: #490942), remaining changes:
-    - Bump build-depend on debhelper to install udev rules into
-      /lib/udev/rules.d, add Breaks on udev to get correct version.
-    - Provide meta package "boinc", which depends on boinc-client and
-      boinc-manager.
-    - Fix FTBFS, added 103_include_config_h.patch, use system functions
-      when available (LP: #447933)
-
- -- Andres Rodriguez <andreserl at ubuntu.com>  Tue, 01 Dec 2009 12:52:23 -0500
-
 boinc (6.10.17+dfsg-1) unstable; urgency=low
 
   * New upstream release (Closes: #553998)
@@ -150,18 +94,6 @@ boinc (6.4.5+dfsg-2ubuntu2) karmic; urgency=low
 
  -- Joao Pinto <joao.pinto at getdeb.net>  Sat, 10 Oct 2009 11:42:30 +0100
 
-boinc (6.4.5+dfsg-2ubuntu1) karmic; urgency=low
-
-  * Merge from debian unstable (LP: #396665), remaining changes:
-    - Bump build-depend on debhelper to install udev rules into
-      /lib/udev/rules.d, add Breaks on udev to get correct version.
-    - Provide meta package "boinc", which depends on boinc-client and
-      boinc-manager.
-  * debian/patches:
-    - 102_wxPanel_instead_wxControl_r17501.patch. Dropped. Included Upstream.
-
- -- Andres Rodriguez <andreserl at ubuntu.com>  Tue, 07 Jul 2009 12:42:18 -0500
-
 boinc (6.4.5+dfsg-2) unstable; urgency=low
 
   * Uploaded to unstable
@@ -233,14 +165,6 @@ boinc (6.2.18-4) unstable; urgency=low
 
  -- Rene Mayorga <rmayorga at debian.org>  Sat, 21 Mar 2009 13:44:13 -0600
 
-boinc (6.2.18-3ubuntu1) jaunty; urgency=low
-
-  * Merge from debian unstable (LP: #335074), remaining changes:
-    - Bump build-depend on debhelper to install udev rules into
-      /lib/udev/rules.d, add Breaks on udev to get correct version.
-
- -- Daniel Hahler <ubuntu at thequod.de>  Sat, 28 Feb 2009 22:01:52 +0100
-
 boinc (6.2.18-3) unstable; urgency=low
 
   * Uploaded to unstable
@@ -300,16 +224,6 @@ boinc (6.2.18-1) experimental; urgency=low
 
  -- Frank S. Thomas <fst at debian.org>  Thu, 21 Aug 2008 20:25:31 +0200
 
-boinc (6.2.14-3ubuntu1) jaunty; urgency=low
-
-  * Merge from Debian unstable (LP: #326599). Remaining Ubuntu changes:
-    - Bump build-depend on debhelper to install udev rules into
-      /lib/udev/rules.d, add Breaks on udev to get correct version.
-  * Do not check for "/RebootPending.txt", which is only used on
-    Windows (LP: #297447)
-
- -- Daniel Hahler <ubuntu at thequod.de>  Sun, 08 Feb 2009 18:04:23 +0100
-
 boinc (6.2.14-3) unstable; urgency=low
 
   * Add debian/patches/101_check_RSA_returned_values.patch 
@@ -323,13 +237,6 @@ boinc (6.2.14-3) unstable; urgency=low
 
  -- Rene Mayorga <rmayorga at debian.org.sv>  Tue, 13 Jan 2009 14:05:38 -0600
 
-boinc (6.2.14-2ubuntu1) jaunty; urgency=low
-
-  * Bump build-depend on debhelper to install udev rules into
-    /lib/udev/rules.d, add Breaks on udev to get correct version.
-
- -- Scott James Remnant <scott at ubuntu.com>  Tue, 13 Jan 2009 02:06:21 +0000
-
 boinc (6.2.14-2) unstable; urgency=low
 
   * Updated translations for the BOINC Manager from the 6.2.16 release:

-- 
BOINC packaging



More information about the pkg-boinc-commits mailing list