The following commit has been merged in the master branch:
commit 3e4efba6b8dcb6d9286ae3b51bbd55012703530a
Merge: e9e2b6ce1229f9e7f881f628d58e2e980316122f 
cc6af5c49bac1ee05910557c75aee7856a26fecd
Author: Ralf Treinen <trei...@free.fr>
Date:   Mon Dec 26 16:20:04 2011 +0100

    Merge branch 'master' of 
git+ssh://git.debian.org/git/pkg-ocaml-maint/packages/advi
    
    Conflicts:
        debian/changelog

diff --combined debian/changelog
index 14b5351,21542a3..3facc9d
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,19 +1,25 @@@
- advi (1.10.0-2) UNRELEASED; urgency=low
++advi (1.10.2-2) UNRELEASED; urgency=low
 +
 +  * Fix mode of /usr/share/doc/advi-examples/examples/basics/alltt.sty
 +
-  -- Ralf Treinen <trei...@debian.org>  Tue, 02 Aug 2011 20:50:24 +0200
++ -- Ralf Treinen <trei...@debian.org>  Mon, 26 Dec 2011 16:19:40 +0100
++
+ advi (1.10.2-1) unstable; urgency=low
+ 
+   * New upstream release.
+   * patch really-clean: remove some files leftover by upstream clean.
+   * debian/rules: fix name of target override_dh_auto_test
+ 
+  -- Ralf Treinen <trei...@debian.org>  Fri, 21 Oct 2011 16:43:53 +0200
+ 
+ advi (1.10.0-2) unstable; urgency=low
+ 
+   * debian/control and debian/jpfonts.conf: replaced ttf-kochi- fonts
+     (closes: #644772). Thanks to Hideki Yamane for the patch!
+   * Add a README to debian/examples/japanese that explains what
+     additional packages are needed.
+ 
+  -- Ralf Treinen <trei...@debian.org>  Thu, 13 Oct 2011 15:32:27 +0200
  
  advi (1.10.0-1) unstable; urgency=low
  
diff --combined debian/rules
index 2bb6e34,d997a71..58614a8
--- a/debian/rules
+++ b/debian/rules
@@@ -16,7 -16,6 +16,7 @@@ override_dh_auto_configure
                        --infodir=\$${prefix}/share/info \
                        --with-gs=/usr/bin/ghostscript \
                        --sysconfdir=/etc
 +      chmod 644 examples/basics/alltt.sty
  
  override_dh_auto_install:
        $(MAKE) install DESTDIR=$(CURDIR)/debian/advi
@@@ -29,4 -28,4 +29,4 @@@ endi
  override_dh_compress:
        dh_compress --exclude=usr/share/doc/advi/splash.dvi
  
- override_dh_autotest:
+ override_dh_auto_test:

-- 
advi packaging

_______________________________________________
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits

Reply via email to