[SCM] Extract bibliographic references from various sources branch, debian, updated. debian/1.4.7-1-7-gc85e37c

[Filippo Rusconi (Debian Maintainer)]

The following commit has been merged in the debian branch:
commit c85e37c421e75a768cde8151d0cfb413e83213fa
Merge: c9d24945c72fb98368488c917188629b20402f13 0186aea98a8076aad64c382c2a2de05248ce76fe
Author: Filippo Rusconi (Debian Maintainer) <rusconi-debian at laposte.net>
Date:   Thu May 10 18:17:33 2012 +0200

    Bug fix : missing 'include <unistd.h>'.

diff --combined debian/changelog
index 00a3dbd,041abdd..105026d
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,11 +1,18 @@@
- cb2bib (UNRELEASED) unstable; urgency=low
 -cb2bib (1.4.7-2) UNRELEASED; urgency=low
++cb2bib (1.4.7-2) unstable; urgency=low
 +
 +  * Add debian/upstream to document a reference to a paper describing this
 +    software.
++  
++  * debian/control: set Filippo Rusconi <lopippo at debian.org> as Uploaders.
+ 
+   * Add fix-ftbfs-with-gcc-4.7 patch.
+     Fix FTBFS with gcc 4.7 by fixing missing <unistd.h> includes.
+     Thanks to Cyril Brulebois <kibi at debian.org> for the patch. (Closes: #667129)
+   * Bump Standards-Version to 3.9.3
++  * Both fixes above in git repos thanks to Salvatore Bonaccorso
++    <carnil at debian.org>
  
 - -- Salvatore Bonaccorso <carnil at debian.org>  Thu, 10 May 2012 17:36:18 +0200
 + -- Filippo Rusconi <lopippo at debian.org>  Mon, 07 May 2012 13:36:06 +0200
  
  cb2bib (1.4.7-1) unstable; urgency=low
  
diff --combined debian/control
index e77e198,3d9b4d1..fe6707e
--- a/debian/control
+++ b/debian/control
@@@ -2,10 -2,10 +2,10 @@@ Source: cb2bi
  Section: text
  Priority: optional
  Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.debian.org>
--Uploaders: Filippo Rusconi <rusconi-debian at laposte.net>
++Uploaders: Filippo Rusconi <lopippo at debian.org>
  DM-Upload-Allowed: yes
  Build-Depends: debhelper (>= 7), libx11-dev, x11proto-core-dev, libqt4-dev (>=4.4), libqtwebkit-dev (>=2.1.0~2011week09), cmake (>=2.6.0), imagemagick
- Standards-Version: 3.9.1
+ Standards-Version: 3.9.3
  Homepage: http://www.molspaces.com/cb2bib/
  Vcs-Git: git://git.debian.org/git/debian-science/packages/cb2bib.git
  Vcs-Browser: http://git.debian.org/?p=debian-science/packages/cb2bib.git

-- 
Extract bibliographic references from various sources