[DRE-commits] [SCM] redmine.git branch, master-experimental, updated. debian/1.1.3-1-48-g58aaf8f

[Jérémy Lal]

The following commit has been merged in the master-experimental branch:
commit 04300e51310656b07e273cd5d635441c2e8f8558
Merge: e8ef11098e82bc42150edbf49a9a08e07bacf957 a109a943764f9d8c2ef2b226a9b63f416cfef4e0
Author: Jérémy Lal <kapouer at melix.org>
Date:   Mon Aug 22 21:02:27 2011 +0200

    Merge branch 'master-experimental' of ssh://git.debian.org/git/pkg-ruby-extras/redmine into master-experimental
    
    Conflicts:
    	debian/changelog

diff --combined debian/changelog
index af4385a,e69c345..9dd934c
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,5 -1,19 +1,19 @@@
 -redmine (1.2.1-1) unstable; urgency=low
 +redmine (1.2.1-1) UNRELEASED; urgency=low
  
+   [ TODO ]
+   * DFSG vendor/plugins/rfpdf/lib/fonts/ and debian/copyright (tcpdf FIXME) 
+   * ttf2ufm sits in NEW queue
+ 
+   [ Ondřej Surý ]
+   * Alternatively depend on rails to allow easy backports
+   * Imported Upstream version 1.2.1
+   * Add patch to prefix subtasks in generated PDF
+     (http://www.redmine.org/issues/8617)
+ 
+  -- Ondřej Surý <ondrej at debian.org>  Wed, 10 Aug 2011 09:24:05 +0200
+ 
+ redmine (1.2.0-1) UNRELEASED; urgency=low
+ 
    [ Ondřej Surý ]
    * Push redmine-1.2.0 to experimental
    * Imported Upstream version 1.2.0
@@@ -12,10 -26,6 +26,6 @@@
    [ Jérémy Lal ]
    * Add new locale fa (Persian) in debian config
    * email.yml renamed to configuration.yml : ucf purge accordingly.
-   * Upstream update to version 1.2.1
-   * vendor/plugins/rfpdf is removed because it includes tcpdf, which
-     has copyright issues, see http://bugs.debian.org/495985.
- TODO * pdf creation is done using webkit2pdf
  
   -- Jérémy Lal <kapouer at melix.org>  Sat, 02 Jul 2011 16:51:40 +0200
  

-- 
redmine.git