r27699 - in /desktop/unstable/gtk-doc/debian: changelog control control.in patches/ patches/01_highlight_options.patch patches/series rules
joss at users.alioth.debian.org
joss at users.alioth.debian.org
Wed Apr 20 18:06:17 UTC 2011
Author: joss
Date: Wed Apr 20 18:06:09 2011
New Revision: 27699
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=27699
Log:
* 01_highlight_options.patch: stolen from upstream git. Pass the
correct output options for highlight 3.4. Closes: #623490.
* Use dh-autoreconf.
* Depend on highlight 3.4.
Added:
desktop/unstable/gtk-doc/debian/patches/
desktop/unstable/gtk-doc/debian/patches/01_highlight_options.patch
desktop/unstable/gtk-doc/debian/patches/series
Modified:
desktop/unstable/gtk-doc/debian/changelog
desktop/unstable/gtk-doc/debian/control
desktop/unstable/gtk-doc/debian/control.in
desktop/unstable/gtk-doc/debian/rules
Modified: desktop/unstable/gtk-doc/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk-doc/debian/changelog?rev=27699&op=diff
==============================================================================
--- desktop/unstable/gtk-doc/debian/changelog [utf-8] (original)
+++ desktop/unstable/gtk-doc/debian/changelog [utf-8] Wed Apr 20 18:06:09 2011
@@ -1,3 +1,12 @@
+gtk-doc (1.17-2) unstable; urgency=low
+
+ * 01_highlight_options.patch: stolen from upstream git. Pass the
+ correct output options for highlight 3.4. Closes: #623490.
+ * Use dh-autoreconf.
+ * Depend on highlight 3.4.
+
+ -- Josselin Mouette <joss at debian.org> Wed, 20 Apr 2011 20:05:54 +0200
+
gtk-doc (1.17-1) unstable; urgency=low
* debian/control.in:
Modified: desktop/unstable/gtk-doc/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk-doc/debian/control?rev=27699&op=diff
==============================================================================
--- desktop/unstable/gtk-doc/debian/control [utf-8] (original)
+++ desktop/unstable/gtk-doc/debian/control [utf-8] Wed Apr 20 18:06:09 2011
@@ -12,14 +12,15 @@
XS-Python-Version: >= 2.3
Build-Depends: cdbs,
debhelper (>= 5),
- gnome-pkg-tools (>= 0.10)
+ gnome-pkg-tools (>= 0.10),
+ dh-autoreconf
Build-Depends-Indep: jade (>= 1.2.1-35),
docbook-dsssl,
xsltproc (>= 1.1.15),
libxml2-utils,
docbook-xml (>= 4.3),
docbook-xsl,
- highlight,
+ highlight (>= 3.4),
libglib2.0-dev (>= 2.6.0),
pkg-config (>= 0.19.0),
python (>= 2.3),
@@ -42,7 +43,7 @@
docbook-xsl (>= 1.64.1.0),
docbook-to-man,
xsltproc (>= 1.1.15),
- highlight,
+ highlight (>= 3.4),
gnome-common
Conflicts: sgml2x (<< 1.0.0-2)
Recommends: pkg-config (>= 0.19.0)
Modified: desktop/unstable/gtk-doc/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk-doc/debian/control.in?rev=27699&op=diff
==============================================================================
--- desktop/unstable/gtk-doc/debian/control.in [utf-8] (original)
+++ desktop/unstable/gtk-doc/debian/control.in [utf-8] Wed Apr 20 18:06:09 2011
@@ -7,14 +7,15 @@
XS-Python-Version: >= 2.3
Build-Depends: cdbs,
debhelper (>= 5),
- gnome-pkg-tools (>= 0.10)
+ gnome-pkg-tools (>= 0.10),
+ dh-autoreconf
Build-Depends-Indep: jade (>= 1.2.1-35),
docbook-dsssl,
xsltproc (>= 1.1.15),
libxml2-utils,
docbook-xml (>= 4.3),
docbook-xsl,
- highlight,
+ highlight (>= 3.4),
libglib2.0-dev (>= 2.6.0),
pkg-config (>= 0.19.0),
python (>= 2.3),
@@ -37,7 +38,7 @@
docbook-xsl (>= 1.64.1.0),
docbook-to-man,
xsltproc (>= 1.1.15),
- highlight,
+ highlight (>= 3.4),
gnome-common
Conflicts: sgml2x (<< 1.0.0-2)
Recommends: pkg-config (>= 0.19.0)
Added: desktop/unstable/gtk-doc/debian/patches/01_highlight_options.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk-doc/debian/patches/01_highlight_options.patch?rev=27699&op=file
==============================================================================
--- desktop/unstable/gtk-doc/debian/patches/01_highlight_options.patch (added)
+++ desktop/unstable/gtk-doc/debian/patches/01_highlight_options.patch [utf-8] Wed Apr 20 18:06:09 2011
@@ -1,0 +1,23 @@
+From 24b3544330758e07ee159a0e3217e05fe82382bf Mon Sep 17 00:00:00 2001
+From: Stefan Kost <ensonic at users.sf.net>
+Date: Wed, 13 Apr 2011 12:05:01 +0000
+Subject: configure: use more compatible option for highlight
+
+Hightlight change the version between 2.16 and 3.4. Both versions have
+--out-format, so lets use that one.
+---
+diff --git a/configure.ac b/configure.ac
+index 30fe622..72f2b0f 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -115,7 +115,7 @@ if test "$with_highlight" = "auto"; then
+ else
+ AC_PATH_PROG([HIGHLIGHT], [highlight])
+ if test -n "$HIGHLIGHT"; then
+- HIGHLIGHT_OPTIONS="-X -f --class-name=gtkdoc "
++ HIGHLIGHT_OPTIONS="--out-format=xhtml -f --class-name=gtkdoc "
+ else
+ AC_PATH_PROG([HIGHLIGHT], [vim])
+ if test -n "$HIGHLIGHT"; then
+--
+cgit v0.9
Added: desktop/unstable/gtk-doc/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk-doc/debian/patches/series?rev=27699&op=file
==============================================================================
--- desktop/unstable/gtk-doc/debian/patches/series (added)
+++ desktop/unstable/gtk-doc/debian/patches/series [utf-8] Wed Apr 20 18:06:09 2011
@@ -1,0 +1,1 @@
+01_highlight_options.patch
Modified: desktop/unstable/gtk-doc/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk-doc/debian/rules?rev=27699&op=diff
==============================================================================
--- desktop/unstable/gtk-doc/debian/rules [utf-8] (original)
+++ desktop/unstable/gtk-doc/debian/rules [utf-8] Wed Apr 20 18:06:09 2011
@@ -1,5 +1,6 @@
#!/usr/bin/make -f
+include /usr/share/cdbs/1/rules/autoreconf.mk
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/autotools.mk
include /usr/share/cdbs/1/rules/utils.mk
More information about the pkg-gnome-commits
mailing list