[Pkg-cli-libs-commits] [SCM] poppler-sharp branch, ubuntu, updated. debian/0.0.2-1-12-ge7e063d

Chow Loong Jin hyperair at debian.org
Wed Jan 18 19:22:44 UTC 2012


The following commit has been merged in the ubuntu branch:
commit e7e063d71d26bf1547f711041f93af8480d956f5
Merge: a305625e16ae110724f143ec3f9ef53bc098e6ba f3caca1eefc5fe93af1cefb8fa153dab86b0021c
Author: Chow Loong Jin <hyperair at debian.org>
Date:   Tue Jan 17 04:57:26 2012 +0800

    Merge branch 'master' into ubuntu
    
    Conflicts:
    	debian/changelog

diff --combined debian/changelog
index b35e7f2,8d71f74..661ef28
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,23 -1,28 +1,48 @@@
 -poppler-sharp (0.0.3-1) UNRELEASED; urgency=low
++poppler-sharp (0.0.3-0ubuntu1) precise; urgency=low
+ 
+   * [8eb679c] Fix missing " in monodoc .source file (Closes: #619154)
+   * [183834e] Imported Upstream version 0.0.3
+     + Update for new libpoppler-glib API (Closes: #651385)
+   * [251185b] Bump build-dep of libpoppler-glib-dev to 0.18
+ 
 - -- Chow Loong Jin <hyperair at ubuntu.com>  Fri, 09 Dec 2011 01:04:38 +0800
++ -- Chow Loong Jin <hyperair at debian.org>  Tue, 17 Jan 2012 04:57:17 +0800
+ 
+ poppler-sharp (0.0.2-1) unstable; urgency=low
+ 
+   * debian/copyright:
+     + [00611d5] Amend to GPL-2, rather than GPL-2+, since poppler is licensed
+       under GPL-2, so derived works such as poppler-sharp cannot be licensed
+       under GPL-2+
+     + [8461409] Fix copyright statements in debian/copyright
+   * [b7a6c86] Imported Upstream version 0.0.1.git20110706.r1.be8456f
+     + Update for new libpoppler-glib API (Closes: #632942)
+   * [f109d6e] Drop all patches (upstreamed)
+   * [0db9861] No-change Standards-Version bump from 3.8.4 to 3.9.2
+   * [5fafa86] Drop debian/poppler-sharp.dll.config
+   * [cca9e3e] Imported Upstream version 0.0.2
+ 
+  -- Chow Loong Jin <hyperair at ubuntu.com>  Wed, 06 Jul 2011 21:06:26 +0800
+ 
 +poppler-sharp (0.0.1-1ubuntu3) natty; urgency=low
 +
 +  * [c84c6a8] Autogenerate soname in .dll.config
 +
 + -- Chow Loong Jin <hyperair at ubuntu.com>  Wed, 02 Feb 2011 01:34:20 +0800
 +
 +poppler-sharp (0.0.1-1ubuntu2) natty; urgency=low
 +
 +  * No changes upload for libpoppler-glib5 -> libpoppler-glib6
 +    transition
 +
 + -- Fabrice Coutadeur <fabricesp at ubuntu.com>  Sun, 30 Jan 2011 08:29:57 +0000
 +
 +poppler-sharp (0.0.1-1ubuntu1) maverick; urgency=low
 +
 +  * Build against libpoppler-glib.so.5 (LP: #633358).
 +   - Adjust target in debian/poppler-sharp.dll.config
 +
 + -- Andrew Starr-Bochicchio <a.starr.b at gmail.com>  Tue, 21 Sep 2010 15:29:15 -0400
 +
  poppler-sharp (0.0.1-1) unstable; urgency=low
  
    * Initial release (Closes: #585517)
diff --combined debian/control
index eea8894,f2eb29b..51f05f0
--- a/debian/control
+++ b/debian/control
@@@ -1,7 -1,6 +1,7 @@@
  Source: poppler-sharp
  Priority: optional
 -Maintainer: Debian CLI Libraries Team <pkg-cli-libs-team at lists.alioth.debian.org>
 +Maintainer: Ubuntu Developers <ubuntu-devel-discuss at lists.ubuntu.com>
 +XSBC-Original-Maintainer: Debian CLI Libraries Team <pkg-cli-libs-team at lists.alioth.debian.org>
  Uploaders: Chow Loong Jin <hyperair at ubuntu.com>
  Build-Depends: debhelper (>= 7.0.50),
                 mono-devel (>= 2.4.3),
@@@ -9,9 -8,9 +9,9 @@@
                 monodoc-base,
                 gtk-sharp2-gapi,
                 autotools-dev,
-                libpoppler-glib-dev,
+                libpoppler-glib-dev (>= 0.18),
                 libgtk2.0-cil-dev
- Standards-Version: 3.8.4
+ Standards-Version: 3.9.2
  Section: cli-mono
  Homepage: http://www.github.com/jacintos/poppler-sharp
  

-- 
poppler-sharp



More information about the Pkg-cli-libs-commits mailing list