x11proto-fonts: Changes to 'debian-unstable'
debian/changelog | 14 ++++++++++++--
debian/control | 7 +++++--
debian/rules | 6 ++++--
debian/x11proto-fonts-dev.install | 3 +++
4 files changed, 24 insertions(+), 6 deletions(-)
New commits:
commit 6a4b2c909b7d1359f0e18d05bf4738e31d387a1d
Author: Cyril Brulebois <kibi@debian.org>
Date: Sat Nov 6 01:23:23 2010 +0100
Upload to unstable.
diff --git a/debian/changelog b/debian/changelog
index 2ecec98..5dbf2da 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-x11proto-fonts (2.1.1-1) UNRELEASED; urgency=low
+x11proto-fonts (2.1.1-1) unstable; urgency=low
[ Julien Cristau ]
* Rename the build directory to not include DEB_BUILD_GNU_TYPE for no
@@ -19,7 +19,7 @@ x11proto-fonts (2.1.1-1) UNRELEASED; urgency=low
* No longer pass --disable-shared, this option is gone.
* Add myself to Uploaders.
- -- Robert Hooker <sarvatt@ubuntu.com> Tue, 02 Nov 2010 19:24:25 -0400
+ -- Cyril Brulebois <kibi@debian.org> Sat, 06 Nov 2010 01:23:21 +0100
x11proto-fonts (2.1.0-1) unstable; urgency=low
commit 7724ef18077ad6292c899225b15bf91863f060d7
Author: Cyril Brulebois <kibi@debian.org>
Date: Sat Nov 6 01:23:09 2010 +0100
Add myself to Uploaders.
diff --git a/debian/changelog b/debian/changelog
index 8c7b4cb..2ecec98 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,7 @@ x11proto-fonts (2.1.1-1) UNRELEASED; urgency=low
* Kill *.xml in the doc directory, no point in shipping them.
* Switch from --list-missing to --fail-missing for additional safety.
* No longer pass --disable-shared, this option is gone.
+ * Add myself to Uploaders.
-- Robert Hooker <sarvatt@ubuntu.com> Tue, 02 Nov 2010 19:24:25 -0400
diff --git a/debian/control b/debian/control
index d576a66..d3ed26a 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: x11proto-fonts
Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
-Uploaders: David Nusinow <dnusinow@debian.org>, Andres Salomon <dilinger@debian.org>
+Uploaders: David Nusinow <dnusinow@debian.org>, Andres Salomon <dilinger@debian.org>, Cyril Brulebois <kibi@debian.org>
Build-Depends:
debhelper (>= 5.0.0),
automake,
commit 31cc11c0a4391e40a986524c8d4a3be3a8d1c783
Author: Cyril Brulebois <kibi@debian.org>
Date: Sat Nov 6 01:22:53 2010 +0100
Add pkg-config build-dep.
diff --git a/debian/changelog b/debian/changelog
index fd79c2d..8c7b4cb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ x11proto-fonts (2.1.1-1) UNRELEASED; urgency=low
* Bump xutils-dev build dep to 1:7.5+5 for util-macros 1.10 requirement.
[ Cyril Brulebois ]
+ * Add pkg-config build-dep.
* Add xmlto, xorg-sgml-doctools, and w3m build-dep for the specs.
* Pass --with-xmlto and --without-fop, we want html and txt only.
* Ship *.html, *.css, and *.txt from the doc directory.
diff --git a/debian/control b/debian/control
index 4e9afbb..d576a66 100644
--- a/debian/control
+++ b/debian/control
@@ -7,6 +7,7 @@ Build-Depends:
debhelper (>= 5.0.0),
automake,
xutils-dev (>= 1:7.5+4),
+ pkg-config,
# specs:
xmlto, xorg-sgml-doctools (>= 1:1.5), w3m,
Standards-Version: 3.8.3
commit 3307f7a13fcad12a1ab53337cfe058da3cd28cea
Author: Cyril Brulebois <kibi@debian.org>
Date: Thu Nov 4 00:16:19 2010 +0100
No longer pass --disable-shared, this option is gone.
diff --git a/debian/changelog b/debian/changelog
index 2607158..fd79c2d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,7 @@ x11proto-fonts (2.1.1-1) UNRELEASED; urgency=low
* Ship *.html, *.css, and *.txt from the doc directory.
* Kill *.xml in the doc directory, no point in shipping them.
* Switch from --list-missing to --fail-missing for additional safety.
+ * No longer pass --disable-shared, this option is gone.
-- Robert Hooker <sarvatt@ubuntu.com> Tue, 02 Nov 2010 19:24:25 -0400
diff --git a/debian/rules b/debian/rules
index a5dece1..4903ade 100755
--- a/debian/rules
+++ b/debian/rules
@@ -39,7 +39,7 @@ build-stamp:
mkdir -p build
cd build && \
../configure --prefix=/usr --mandir=\$${prefix}/share/man \
- --infodir=\$${prefix}/share/info --disable-shared \
+ --infodir=\$${prefix}/share/info \
--with-xmlto --without-fop \
$(confflags) CFLAGS="$(CFLAGS)"
cd build && $(MAKE)
commit 67660d975eeaae4106a6c1049a48ee4fffde7563
Author: Cyril Brulebois <kibi@debian.org>
Date: Thu Nov 4 00:16:07 2010 +0100
Switch from --list-missing to --fail-missing for additional safety.
diff --git a/debian/changelog b/debian/changelog
index 1532428..2607158 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,7 @@ x11proto-fonts (2.1.1-1) UNRELEASED; urgency=low
* Pass --with-xmlto and --without-fop, we want html and txt only.
* Ship *.html, *.css, and *.txt from the doc directory.
* Kill *.xml in the doc directory, no point in shipping them.
+ * Switch from --list-missing to --fail-missing for additional safety.
-- Robert Hooker <sarvatt@ubuntu.com> Tue, 02 Nov 2010 19:24:25 -0400
diff --git a/debian/rules b/debian/rules
index 4a2c34d..a5dece1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -77,7 +77,7 @@ binary-indep: build install
dh_installdocs
dh_installman
find debian/tmp/usr/share/doc/fontsproto -name '*.xml' -delete
- dh_install --sourcedir=debian/tmp --list-missing
+ dh_install --sourcedir=debian/tmp --fail-missing
dh_installchangelogs
dh_link
dh_strip
commit 7656841ab22972884d9bd0fbcb0e3cc017b6e7c4
Author: Cyril Brulebois <kibi@debian.org>
Date: Thu Nov 4 00:15:47 2010 +0100
Kill *.xml in the doc directory, no point in shipping them.
diff --git a/debian/changelog b/debian/changelog
index fa89fa0..1532428 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,7 @@ x11proto-fonts (2.1.1-1) UNRELEASED; urgency=low
* Add xmlto, xorg-sgml-doctools, and w3m build-dep for the specs.
* Pass --with-xmlto and --without-fop, we want html and txt only.
* Ship *.html, *.css, and *.txt from the doc directory.
+ * Kill *.xml in the doc directory, no point in shipping them.
-- Robert Hooker <sarvatt@ubuntu.com> Tue, 02 Nov 2010 19:24:25 -0400
diff --git a/debian/rules b/debian/rules
index b2da04a..4a2c34d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -76,6 +76,7 @@ binary-indep: build install
dh_installdocs
dh_installman
+ find debian/tmp/usr/share/doc/fontsproto -name '*.xml' -delete
dh_install --sourcedir=debian/tmp --list-missing
dh_installchangelogs
dh_link
commit d9bab60639499873a34b116a711570f1a4a55bfd
Author: Cyril Brulebois <kibi@debian.org>
Date: Thu Nov 4 00:15:04 2010 +0100
Ship *.html, *.css, and *.txt from the doc directory.
diff --git a/debian/changelog b/debian/changelog
index 18ecdd4..fa89fa0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,7 @@ x11proto-fonts (2.1.1-1) UNRELEASED; urgency=low
[ Cyril Brulebois ]
* Add xmlto, xorg-sgml-doctools, and w3m build-dep for the specs.
* Pass --with-xmlto and --without-fop, we want html and txt only.
+ * Ship *.html, *.css, and *.txt from the doc directory.
-- Robert Hooker <sarvatt@ubuntu.com> Tue, 02 Nov 2010 19:24:25 -0400
diff --git a/debian/x11proto-fonts-dev.install b/debian/x11proto-fonts-dev.install
index 1ab921a..4080411 100644
--- a/debian/x11proto-fonts-dev.install
+++ b/debian/x11proto-fonts-dev.install
@@ -1,2 +1,5 @@
usr/include/X11/fonts/*
usr/lib/pkgconfig/fontsproto.pc
+usr/share/doc/fontsproto/*.html usr/share/doc/x11proto-fonts-dev/
+usr/share/doc/fontsproto/*.css usr/share/doc/x11proto-fonts-dev/
+usr/share/doc/fontsproto/*.txt usr/share/doc/x11proto-fonts-dev/
commit 4cc17456b56617c7e69bd4b7207d61da1ed1e6e1
Author: Cyril Brulebois <kibi@debian.org>
Date: Wed Nov 3 23:59:44 2010 +0100
Pass --with-xmlto and --without-fop, we want html and txt only.
diff --git a/debian/changelog b/debian/changelog
index bafdb8d..18ecdd4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,7 @@ x11proto-fonts (2.1.1-1) UNRELEASED; urgency=low
[ Cyril Brulebois ]
* Add xmlto, xorg-sgml-doctools, and w3m build-dep for the specs.
+ * Pass --with-xmlto and --without-fop, we want html and txt only.
-- Robert Hooker <sarvatt@ubuntu.com> Tue, 02 Nov 2010 19:24:25 -0400
diff --git a/debian/rules b/debian/rules
index 97e3304..b2da04a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -40,6 +40,7 @@ build-stamp:
cd build && \
../configure --prefix=/usr --mandir=\$${prefix}/share/man \
--infodir=\$${prefix}/share/info --disable-shared \
+ --with-xmlto --without-fop \
$(confflags) CFLAGS="$(CFLAGS)"
cd build && $(MAKE)
>$@
commit c9fb7e7b1f98445cd053a31b1cae9b9821977ac7
Author: Cyril Brulebois <kibi@debian.org>
Date: Wed Nov 3 23:58:05 2010 +0100
Add xmlto, xorg-sgml-doctools, and w3m build-dep for the specs.
diff --git a/debian/changelog b/debian/changelog
index f21193d..bafdb8d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,9 @@ x11proto-fonts (2.1.1-1) UNRELEASED; urgency=low
* New upstream release.
* Bump xutils-dev build dep to 1:7.5+5 for util-macros 1.10 requirement.
+ [ Cyril Brulebois ]
+ * Add xmlto, xorg-sgml-doctools, and w3m build-dep for the specs.
+
-- Robert Hooker <sarvatt@ubuntu.com> Tue, 02 Nov 2010 19:24:25 -0400
x11proto-fonts (2.1.0-1) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 25f16ba..4e9afbb 100644
--- a/debian/control
+++ b/debian/control
@@ -7,6 +7,8 @@ Build-Depends:
debhelper (>= 5.0.0),
automake,
xutils-dev (>= 1:7.5+4),
+# specs:
+ xmlto, xorg-sgml-doctools (>= 1:1.5), w3m,
Standards-Version: 3.8.3
Vcs-Git: git://git.debian.org/git/pkg-xorg/proto/x11proto-fonts
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/proto/x11proto-fonts.git
commit 6f57cb47b2ab9e3f76a42ee0012ce5b99fe8a815
Author: Cyril Brulebois <kibi@debian.org>
Date: Wed Nov 3 23:55:00 2010 +0100
Tweak xutils-dev build-dep.
Not that it matters, but xutils-dev 1:7.5+4 is sufficient, 1:7.5+5 has
1.11.0.
diff --git a/debian/control b/debian/control
index 398bc91..25f16ba 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: David Nusinow <dnusinow@debian.org>, Andres Salomon <dilinger@debian.
Build-Depends:
debhelper (>= 5.0.0),
automake,
- xutils-dev (>= 1:7.5+5)
+ xutils-dev (>= 1:7.5+4),
Standards-Version: 3.8.3
Vcs-Git: git://git.debian.org/git/pkg-xorg/proto/x11proto-fonts
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/proto/x11proto-fonts.git
Reply to: