Merge lp:~ubuntu-branches/ubuntu/quantal/schooltool.gradebook/quantal-201210032052 into lp:ubuntu/quantal/schooltool.gradebook

[Ubuntu Package Importer]

The package importer has detected a possible inconsistency between the package history in the archive and the history in bzr. As the archive is authoritative the importer has made lp:ubuntu/quantal/schooltool.gradebook reflect what is in the archive and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/quantal/schooltool.gradebook/quantal-201210032052. This merge proposal was created so that an Ubuntu developer can review the situations and perform a merge/upload if necessary. There are three typical cases where this can happen.
  1. Where someone pushes a change to bzr and someone else uploads the package without that change. This is the reason that this check is done by the importer. If this appears to be the case then a merge/upload should be done if the changes that were in bzr are still desirable.
  2. The importer incorrectly detected the above situation when someone made a change in bzr and then uploaded it.
  3. The importer incorrectly detected the above situation when someone just uploaded a package and didn't touch bzr.

If this case doesn't appear to be the first situation then set the status of the merge proposal to "Rejected" and help avoid the problem in future by filing a bug at https://bugs.launchpad.net/udd linking to this merge proposal.

(this is an automatically generated message)

Unmerged revisions

13. By Gediminas Paulauskas on 2012-10-03

* New upstream bugfix release.
* debian/control: Change section to education.

=== modified file 'debian/changelog'
--- debian/changelog	2012-10-03 20:13:58 +0000
+++ debian/changelog	2012-10-03 21:00:30 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 schooltool.gradebook (2.1.1-0ubuntu2) quantal; urgency=low
 
   * Upload to Quantal.
@@ -323,3 +324,324 @@
   * Inital Release
 
  -- Brian Sutherland <[e-mail]>  Thu,  8 Nov 2007 19:27:48 +0100
+=======
+schooltool.gradebook (2.1.1-0ubuntu1) precise; urgency=low
+
+  * New upstream bugfix release.
+  * debian/control: Change section to education.
+
+ -- Gediminas Paulauskas <[e-mail]>  Wed, 03 Oct 2012 20:10:04 +0300
+
+schooltool.gradebook (2.1.0-0ubuntu1) precise; urgency=low
+
+  * New upstream release.
+
+ -- Gediminas Paulauskas <[e-mail]>  Wed, 18 Apr 2012 20:48:24 +0300
+
+schooltool.gradebook (2.0.3-0ubuntu1) precise; urgency=low
+
+  * New upstream release.
+
+ -- Gediminas Paulauskas <[e-mail]>  Fri, 16 Mar 2012 18:54:07 +0200
+
+schooltool.gradebook (2.0.2-0ubuntu1) precise; urgency=low
+
+  * New upstream release.
+
+ -- Gediminas Paulauskas <[e-mail]>  Thu, 02 Feb 2012 21:01:15 +0200
+
+schooltool.gradebook (2.0.1-0ubuntu1) precise; urgency=low
+
+  * New upstream release.
+  * debian/rules: install upstream changelog.
+
+ -- Gediminas Paulauskas <[e-mail]>  Fri, 23 Dec 2011 20:42:57 +0200
+
+schooltool.gradebook (2.0.0-0ubuntu2) precise; urgency=low
+
+  * Upload to Precise.
+  * debian/rules: Fix to not install *.po files.
+
+ -- Gediminas Paulauskas <[e-mail]>  Tue, 29 Nov 2011 20:56:56 +0200
+
+schooltool.gradebook (2.0.0-0ubuntu1) oneiric; urgency=low
+
+  * New upstream release.
+
+ -- Gediminas Paulauskas <[e-mail]>  Tue, 22 Nov 2011 20:04:50 +0200
+
+schooltool.gradebook (1.9.3-0ubuntu1) oneiric; urgency=low
+
+  * New upstream release.
+  * debian/rules: specify buildsystem, latest release includes a Makefile.
+  * debian/pydist-overrides: remove, we use van.pydeb.
+
+ -- Gediminas Paulauskas <[e-mail]>  Fri, 18 Nov 2011 04:43:45 +0200
+
+schooltool.gradebook (1.9.2-0ubuntu1) oneiric; urgency=low
+
+  * New upstream release.
+
+ -- Gediminas Paulauskas <[e-mail]>  Thu, 03 Nov 2011 20:28:03 +0200
+
+schooltool.gradebook (1.9.1-0ubuntu1) oneiric; urgency=low
+
+  * New upstream release, "flourish beta".
+    - Fully translatable.
+
+ -- Gediminas Paulauskas <[e-mail]>  Thu, 06 Oct 2011 21:44:53 +0300
+
+schooltool.gradebook (1.9.0-0ubuntu1) oneiric; urgency=low
+
+  * New upstream release, "flourish alpha".
+  * debian/watch: switch to flourish series.
+
+ -- Gediminas Paulauskas <[e-mail]>  Thu, 22 Sep 2011 20:10:01 +0300
+
+schooltool.gradebook (0.9.2-0ubuntu1) oneiric; urgency=low
+
+  * New upstream release.
+  * debian/copyright: update after dep5 format changes.
+
+ -- Gediminas Paulauskas <[e-mail]>  Thu, 22 Sep 2011 19:56:44 +0300
+
+schooltool.gradebook (0.9.1-0ubuntu1) oneiric; urgency=low
+
+  * New upstream release.
+  * debian/rules: attendance extra was renamed to journal.
+  * debian/control: add Homepage, python:Provides.
+
+ -- Gediminas Paulauskas <[e-mail]>  Mon, 04 Jul 2011 23:23:34 +0300
+
+schooltool.gradebook (0.9.0-0ubuntu2) oneiric; urgency=low
+
+  * dh_python2 transition
+  * changed to source format 3.0 (quilt).
+  * added debian/pydist-overrides to assist dhp2 calculate Depends.
+  * debian/control
+    - changed python-all to (>= 2.6.6-3~).
+    - removed B-D on python-central.
+    - changed XS-P-V: all  to X-P-V: >= 2.6.
+    - removed XB-P-V, no longer needed.
+  * debian/rules
+    - changed "--with python-central" to "--with python2".
+    - changed rm statement to dh_install exclude.
+
+ -- Charlie Smotherman <[e-mail]>  Sat, 25 Jun 2011 21:51:54 -0500
+
+schooltool.gradebook (0.9.0-0ubuntu1) natty; urgency=low
+
+  * New upstream release:
+    - Make dependency on schooltool.lyceum.journal optional (LP: #768885).
+
+ -- Gediminas Paulauskas <[e-mail]>  Mon, 25 Apr 2011 11:28:38 +0300
+
+schooltool.gradebook (0.9.0~b2-0ubuntu1) natty; urgency=low
+
+  * New upstream release:
+    - Register reports using the new report package in schooltool (LP: #429588)
+    - Remove width restriction on names in layout report card view (LP: #643700)
+    - Fix linked column forms to use activity categories properly (LP: #703078)
+    - Fix the Detailed Student Report to show data only from the selected term
+    - Save due date in New Activity form (LP: #700520)
+    - Make gradebook.js static thus greatly improving Gradebook performance.
+    - Update translations.
+
+ -- Gediminas Paulauskas <[e-mail]>  Mon, 18 Apr 2011 19:50:10 +0300
+
+schooltool.gradebook (0.9.0~a1-0ubuntu2) natty; urgency=low
+
+  * Upload to Ubuntu (LP: #724352).
+
+ -- Gediminas Paulauskas <[e-mail]>  Thu, 24 Feb 2011 16:53:53 +0200
+
+schooltool.gradebook (0.9.0~a1-0ubuntu1) natty; urgency=low
+
+  * New upstream alpha release.
+  * debian/copyright: Add section about bootstrap.py, update FSF address.
+
+ -- Gediminas Paulauskas <[e-mail]>  Wed, 23 Feb 2011 18:30:56 +0200
+
+schooltool.gradebook (0.8.1-1) maverick; urgency=low
+
+  * New upstream release.
+
+ -- Gediminas Paulauskas <[e-mail]>  Mon, 04 Oct 2010 22:30:35 +0300
+
+schooltool.gradebook (0.8.0-1) maverick; urgency=low
+
+  * New upstream release.
+  * Remove gettext from Build-Depends, tarball includes compiled translations.
+  * Convert to debhelper 7 and the pydeb dh7 extension.
+  * debian/copyright: convert to dep5 format.
+
+ -- Gediminas Paulauskas <[e-mail]>  Thu, 16 Sep 2010 18:19:41 +0300
+
+schooltool.gradebook (0.7.2-1) lucid; urgency=low
+
+  * New upstream release.
+
+ -- Gediminas Paulauskas <[e-mail]>  Thu, 16 Sep 2010 18:17:17 +0300
+
+schooltool.gradebook (0.7.1-1) lucid; urgency=low
+
+  * New upstream release.
+    - Fixed accessing gradebook if last visited section was deleted (LP: #591872)
+    - Fixed all averages displayed as "A" (LP: #596311)
+    - Fix a crash in manage Activity categories (LP: #585805)
+
+ -- Gediminas Paulauskas <[e-mail]>  Fri, 25 Jun 2010 01:22:46 +0300
+
+schooltool.gradebook (0.7.0-1) lucid; urgency=low
+
+  * New upstream release.
+
+ -- Gediminas Paulauskas <[e-mail]>  Fri, 21 May 2010 18:12:57 +0300
+
+schooltool.gradebook (0.6.2-1) lucid; urgency=low
+
+  * New upstream release.
+    - See https://launchpad.net/schooltool.gradebook/+milestone/0.6.2 for
+      details
+  * Do not include *.po translation files in the package.
+
+ -- Gediminas Paulauskas <[e-mail]>  Thu, 29 Apr 2010 03:44:48 +0300
+
+schooltool.gradebook (0.6.1-1) karmic; urgency=low
+
+  * New upstream release.
+    - See https://launchpad.net/schooltool.gradebook/+milestone/0.6.1 for
+      details
+  * Switch to using van.pydeb
+  * Move test dependencies to Suggests
+  * Fix debian/tests to work on python2.6
+
+ -- Gediminas Paulauskas <[e-mail]>  Wed, 24 Feb 2010 19:28:40 +0200
+
+schooltool.gradebook (0.6.0-1) karmic; urgency=low
+
+  * New upstream release
+    - Port to zope versions available in karmic (LP: #498803)
+
+ -- Gediminas Paulauskas <[e-mail]>  Wed, 06 Jan 2010 19:15:28 +0200
+
+python-schooltool.gradebook (0.5.2-1) karmic; urgency=low
+
+  * New upstream release
+    - Added ability to hide worksheets (LP: #427494)
+    - Skip worksheets and activities that have no score for a student
+      (LP: #427489)
+    - Fix to allow changing activity order (LP: #494262)
+    - Updated translations
+
+ -- Gediminas Paulauskas <[e-mail]>  Wed, 30 Dec 2009 16:09:32 +0200
+
+python-schooltool.gradebook (0.5.1-1) karmic; urgency=low
+
+  * New upstream release
+    - Fix term selection in gradebook overview and student's views (LP: #478666)
+    - Traceback on gradebook averages when a student has no scores (LP: #479305)
+
+ -- Gediminas Paulauskas <[e-mail]>  Wed, 11 Nov 2009 23:55:15 +0200
+
+python-schooltool.gradebook (0.5.0-1) karmic; urgency=low
+
+  * New upstream feature release
+    - See https://launchpad.net/schooltool.gradebook/+milestone/0.5.0 for
+      details
+  * Override setup.py to depend on python-schooltool (>= 1:1.2.0)
+
+ -- Gediminas Paulauskas <[e-mail]>  Thu, 05 Nov 2009 16:08:34 +0200
+
+python-schooltool.gradebook (0.4.9-1) hardy; urgency=low
+
+  * New upstream release
+
+ -- Gediminas Paulauskas <[e-mail]>  Tue, 07 Jul 2009 11:23:47 -0400
+
+python-schooltool.gradebook (0.4.8-2ubuntu1) hardy; urgency=low
+
+  * Activate trigger manually from postinst, with --no-await option.
+
+ -- Gediminas Paulauskas <[e-mail]>  Thu, 28 May 2009 18:34:25 +0300
+
+python-schooltool.gradebook (0.4.8-2) hardy; urgency=low
+
+  * Activate update-schooltool trigger to restart the server.
+  * Add copyright file and description.
+  * Change maintainer to myself.
+
+ -- Gediminas Paulauskas <[e-mail]>  Tue, 26 May 2009 17:37:56 +0300
+
+python-schooltool.gradebook (0.4.8-1) gutsy; urgency=low
+
+  * New upstream release
+
+ -- Brian Sutherland <[e-mail]>  Tue, 12 May 2009 10:01:51 -0400
+
+python-schooltool.gradebook (0.4.7-1) gutsy; urgency=low
+
+  * New upstream release
+
+ -- Brian Sutherland <[e-mail]>  Wed, 29 Apr 2009 13:37:29 -0400
+
+python-schooltool.gradebook (0.4.6-1) gutsy; urgency=low
+
+  * New upstream release
+
+ -- Brian Sutherland <[e-mail]>  Tue, 21 Apr 2009 09:08:24 -0400
+
+python-schooltool.gradebook (0.4.3-1) gutsy; urgency=low
+
+  * New upstream release
+
+ -- Brian Sutherland <[e-mail]>  Mon, 20 Apr 2009 08:57:33 -0400
+
+python-schooltool.gradebook (0.4.2-1) gutsy; urgency=low
+
+  * New upstream release
+
+ -- Brian Sutherland <[e-mail]>  Mon, 30 Mar 2009 04:14:25 -0400
+
+python-schooltool.gradebook (0.3.5-1) gutsy; urgency=low
+
+  * New upstream release
+
+ -- Brian Sutherland <[e-mail]>  Fri, 05 Dec 2008 14:50:26 -0500
+
+python-schooltool.gradebook (0.3.4-1) gutsy; urgency=low
+
+  * New upstream release
+
+ -- Brian Sutherland <[e-mail]>  Thu, 30 Oct 2008 12:16:30 -0400
+
+python-schooltool.gradebook (0.3.3-1) gutsy; urgency=low
+
+  * New upstream release
+
+ -- Brian Sutherland <[e-mail]>  Mon, 27 Oct 2008 14:27:43 -0400
+
+python-schooltool.gradebook (0.2.1-1) gutsy; urgency=low
+
+  * New upstream release
+
+ -- Brian Sutherland <[e-mail]>  Tue, 13 May 2008 15:41:46 -0400
+
+python-schooltool.gradebook (0.2.0-1) gutsy; urgency=low
+
+  * New upstream release
+
+ -- Brian Sutherland <[e-mail]>  Mon, 12 May 2008 02:24:36 -0400
+
+python-schooltool.gradebook (0.0.2-1) gutsy; urgency=low
+
+  * New upstream release
+
+ -- Brian Sutherland <[e-mail]>  Wed, 23 Apr 2008 18:12:40 -0400
+
+python-schooltool.gradebook (0.0.1-1) gutsy; urgency=low
+
+  * Inital Release
+
+ -- Brian Sutherland <[e-mail]>  Thu,  8 Nov 2007 19:27:48 +0100
+>>>>>>> MERGE-SOURCE