[SCM] Packaging of padre perl editor branch, master, updated. debian/0.84.ds1-1-23-g79b4148

Damyan Ivanov dmn at debian.org
Mon Aug 29 19:25:03 UTC 2011


The following commit has been merged in the master branch:
commit 37666e433b2565aa0311076e653838b4e187b19e
Merge: 93c4d132c2e1f63f47717f6130934b60e67ea79d 498232ac75b949a080c7360274bfdd9fe0f43458
Author: Damyan Ivanov <dmn at debian.org>
Date:   Mon Aug 29 21:28:10 2011 +0300

    Merge branch 'unstable' into 'master'
    
    Conflicts:
    	debian/changelog
    	debian/control

diff --combined debian/changelog
index b3c484d,71c9c5e..5faad34
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,38 -1,11 +1,44 @@@
 +padre (0.90.ds1-1) experimental; urgency=low
 +
-   TODO: merge changes from unstable branch before uploading to unstable
- 
 +  * New upstream release
 +   + update dependencies:
 +     - add libcapture-tiny-perl 0.06 to Depends
 +     - add (build-) dependency on libmodule-corelist-perl 2.22 or a suitable perl
 +     - remove module-refresh and module-starter from (build-)dependencies
 +     - bump (build-)dependency on libppix-editortools-perl to 0.13
 +     - add (build-)dependency on libprobe-perl-perl
 +   + update debian/copyright to match the new release
 +
 +  * Move Vcs-Git from apps/ to packages/
 +  * stop removing bundled fork of ORLite::Migrate (now heavily modified)
 +  * update debian/not-real-manual.list
 +  * revert the plugin API version bump
 +
 + -- Damyan Ivanov <dmn at debian.org>  Sun, 28 Aug 2011 18:44:38 +0300
 +
 +padre (0.84.ds1-1) experimental; urgency=low
 +
 +  * New upstream release
 +  * update dependencies
 +  * bump plugin API version
 +  * upload to experimental for staging the plugin API transition
 +  * bump years of upstream copyright
 +  * add two translators to copyright
 +  * Bump B-D on libperl-apireference-perl to 0.05-2 (Closes: #627190)
 +  * claim conformance to Policy 3.9.2
 +  * fix lintian overrides about not executable sample scripts
 +  * update debian/not-real-manual.list
 +
 + -- Damyan Ivanov <dmn at debian.org>  Mon, 23 May 2011 08:18:21 +0300
 +
+ padre (0.76.ds1-2) unstable; urgency=low
+ 
+   * Change Maintainer to pkg-perl, and add myself as an uploader
+   * Add alternative dependencies on perl 5.14; fixes FTBFS with perl
+     5.14 (Closes: #639042)
+ 
+  -- Dominic Hargreaves <dom at earth.li>  Thu, 25 Aug 2011 21:26:59 +0100
+ 
  padre (0.76.ds1-1) unstable; urgency=low
  
    * New upstream release
diff --combined debian/control
index c06ea52,bec1872..52f8d94
--- a/debian/control
+++ b/debian/control
@@@ -3,9 -3,9 +3,9 @@@ Section: per
  Priority: optional
  Build-Depends: debhelper (>= 8)
  Build-Depends-Indep: perl (>= 5.10.1),
 - libperl-apireference-perl (>= 0.04),
   libcapture-tiny-perl (>= 0.06),
   libclass-adapter-perl (>= 1.05),
 + libclass-inspector-perl (>= 1.22),
   libclass-unload-perl (>= 0.03),
   libclass-xsaccessor-perl (>= 1.05-2),
   libdbd-sqlite3-perl (>= 1.27),
@@@ -17,7 -17,7 +17,7 @@@
   libfile-find-rule-perl (>= 0.30),
   libfile-homedir-perl (>= 0.91),
   libfile-pushd-perl (>= 1.00),
 - libfile-remove-perl (>= 1.42),
 + libfile-remove-perl (>= 1.40),
   libfile-sharedir-perl (>= 1.00),
   libfile-spec-perl (>= 3.2701),
   libfile-which-perl (>= 1.08),
@@@ -28,21 -28,20 +28,21 @@@
   libjson-xs-perl (>= 2.29),
   liblist-moreutils-perl (>= 0.22),
   liblocale-msgfmt-perl,
 + perl (>= 5.11.2) | libmodule-corelist-perl (>= 2.22),
   libmodule-manifest-perl (>= 0.07),
 - libmodule-refresh-perl (>= 0.13),
 - libmodule-starter-perl (>= 1.470),
 - liborlite-perl (>= 1.46),
 + liborlite-perl (>= 1.48),
   liborlite-migrate-perl (>= 0.03),
   libparams-util-perl (>= 0.33),
   libparse-errorstring-perl-perl (>= 0.14),
   libparse-exuberantctags-perl,
 + libperl-apireference-perl (>= 0.05-2),
   libpod-abstract-perl (>= 0.16),
   libpod-pom-perl (>= 0.17),
   libpod2-base-perl (>= 0.043),
   libppi-perl (>= 1.213),
 - libppix-editortools-perl (>= 0.10),
 + libppix-editortools-perl (>= 0.13),
   libppix-regexp-perl (>= 0.011),
 + libprobe-perl-perl,
   libtemplate-tiny-perl (>= 0.11),
   libtest-exception-perl (>= 0.27),
   libtest-mockobject-perl (>= 1.09),
@@@ -50,8 -49,8 +50,8 @@@
   libtest-nowarnings-perl (>= 0.084),
   libtest-script-perl (>= 1.07),
   libtext-diff-perl (>= 0.35),
 - libtext-findindent-perl (>= 0.06),
 + libtext-findindent-perl (>= 0.10),
-  libthreads-shared-perl (>= 1.33),
+  libthreads-shared-perl (>= 1.33) | perl (>= 5.14),
   liburi-perl,
   libwww-perl (>= 5.836),
   libwx-perl (>= 0.91),
@@@ -61,21 -60,21 +61,23 @@@
   xauth,
   xfonts-base,
   xvfb
- Maintainer: Damyan Ivanov <dmn at debian.org>
- Uploaders: Ryan Niebur <ryan at debian.org>
+ Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
+ Uploaders: Damyan Ivanov <dmn at debian.org>,
+  Ryan Niebur <ryan at debian.org>,
+  Dominic Hargreaves <dom at earth.li>
 -Standards-Version: 3.9.1
 +Standards-Version: 3.9.2
  Homepage: http://search.cpan.org/dist/Padre/
 -Vcs-Browser: http://git.debian.org/?p=pkg-perl/apps/padre.git
 -Vcs-Git: git://git.debian.org/git/pkg-perl/apps/padre.git
 +Vcs-Browser: http://git.debian.org/?p=pkg-perl/packages/padre.git
 +Vcs-Git: git://git.debian.org/git/pkg-perl/packages/padre.git
  
  Package: padre
  Architecture: all
  Depends: perl (>= 5.10.1),
   ${misc:Depends},
   ack-grep,
 + libcapture-tiny-perl (>= 0.06),
   libclass-adapter-perl (>= 1.05),
 + libclass-inspector-perl (>= 1.22),
   libclass-unload-perl (>= 0.03),
   libclass-xsaccessor-perl (>= 1.05-2),
   libdbd-sqlite3-perl (>= 1.27),
@@@ -87,7 -86,7 +89,7 @@@
   libfile-find-rule-perl (>= 0.30),
   libfile-homedir-perl (>= 0.91),
   libfile-pushd-perl (>= 1.00),
 - libfile-remove-perl (>= 1.42),
 + libfile-remove-perl (>= 1.40),
   libfile-sharedir-perl (>= 1.00),
   libfile-spec-perl (>= 3.2701),
   libfile-which-perl (>= 1.08),
@@@ -97,9 -96,10 +99,9 @@@
   libipc-run-perl (>= 0.83),
   libjson-xs-perl (>= 2.29),
   liblist-moreutils-perl (>= 0.22),
 + perl (>= 5.11.2) | libmodule-corelist-perl (>= 2.22),
   libmodule-manifest-perl (>= 0.07),
 - libmodule-refresh-perl (>= 0.13),
 - libmodule-starter-perl (>= 1.470),
 - liborlite-perl (>= 1.46),
 + liborlite-perl (>= 1.48),
   liborlite-migrate-perl (>= 0.03),
   libparams-util-perl (>= 0.33),
   libparse-errorstring-perl-perl (>= 0.14),
@@@ -108,13 -108,12 +110,13 @@@
   libpod-pom-perl (>= 0.17),
   libpod2-base-perl (>= 0.043),
   libppi-perl (>= 1.213),
 - libppix-editortools-perl (>= 0.10),
 + libppix-editortools-perl (>= 0.13),
   libppix-regexp-perl (>= 0.011),
 + libprobe-perl-perl,
   libtemplate-tiny-perl (>= 0.11),
   libtext-diff-perl (>= 0.35),
 - libtext-findindent-perl (>= 0.06),
 + libtext-findindent-perl (>= 0.10),
-  libthreads-shared-perl (>= 1.33),
+  libthreads-shared-perl (>= 1.33) | perl (>= 5.14),
   liburi-perl,
   libwww-perl (>= 5.836),
   libwx-perl (>= 0.91),

-- 
Packaging of padre perl editor



More information about the Pkg-perl-cvs-commits mailing list