debian/changelog | 15 +++++++++++++--
debian/control | 7 +++++--
debian/rules | 5 +++--
debian/x11proto-scrnsaver-dev.install | 3 +++
4 files changed, 24 insertions(+), 6 deletions(-)
New commits:
commit ff77a6158ca65a96ddb7ab996ac6fa817ee64a1d
Author: Cyril Brulebois <k...@debian.org>
Date: Wed Nov 3 22:44:57 2010 +0100
Upload to unstable.
diff --git a/debian/changelog b/debian/changelog
index 959ebb9..209da6a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-x11proto-scrnsaver (1.2.1-1) UNRELEASED; urgency=low
+x11proto-scrnsaver (1.2.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-scrnsaver (1.2.1-1) UNRELEASED; urgency=low
* No longer pass --disable-shared, this option is gone.
* Add myself to Uploaders.
- -- Robert Hooker <sarv...@ubuntu.com> Tue, 02 Nov 2010 19:54:18 -0400
+ -- Cyril Brulebois <k...@debian.org> Wed, 03 Nov 2010 22:44:49 +0100
x11proto-scrnsaver (1.2.0-2) unstable; urgency=low
commit dd777fb913a1815c63d6be7be6d1792bf0b12491
Author: Cyril Brulebois <k...@debian.org>
Date: Wed Nov 3 22:44:46 2010 +0100
Bump xutils-dev build-dep for new macros.
diff --git a/debian/changelog b/debian/changelog
index 0c6915e..959ebb9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,7 @@ x11proto-scrnsaver (1.2.1-1) UNRELEASED; urgency=low
[ Cyril Brulebois ]
* Add pkg-config build-dep.
* Add xmlto, xorg-sgml-doctools, and w3m build-dep for the specs.
+ * Bump xutils-dev build-dep for new macros.
* Pass --with-xmlto and --without-fop, we want html and txt only.
* Kill *.xml in the doc directory, no point in shipping them.
* Ship *.html, *.css, and *.txt from the doc directory.
diff --git a/debian/control b/debian/control
index bca13ff..5ff05bb 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: David Nusinow <dnusi...@debian.org>, Andres Salomon
<dilin...@debian.
Build-Depends:
debhelper (>= 5.0.0),
automake,
- xutils-dev (>= 1:7.4+4),
+ xutils-dev (>= 1:7.5+4),
pkg-config,
# specs:
xmlto, xorg-sgml-doctools (>= 1:1.5), w3m,
commit b09a42f434afb653254c005f38bef538a784d95e
Author: Cyril Brulebois <k...@debian.org>
Date: Wed Nov 3 22:30:16 2010 +0100
Add xmlto, xorg-sgml-doctools, and w3m build-dep for the specs.
diff --git a/debian/changelog b/debian/changelog
index 13b3595..0c6915e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,7 +10,7 @@ x11proto-scrnsaver (1.2.1-1) UNRELEASED; urgency=low
[ Cyril Brulebois ]
* Add pkg-config build-dep.
- * Add xmlto 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.
* Kill *.xml in the doc directory, no point in shipping them.
* Ship *.html, *.css, and *.txt from the doc directory.
diff --git a/debian/control b/debian/control
index 7c469be..bca13ff 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,8 @@ Build-Depends:
automake,
xutils-dev (>= 1:7.4+4),
pkg-config,
- xmlto,
+# 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-scrnsaver
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/proto/x11proto-scrnsaver.git
commit 5fe0871dec46e4d31549f83ad206ceca635786e9
Author: Cyril Brulebois <k...@debian.org>
Date: Wed Nov 3 02:27:32 2010 +0100
Add pkg-config build-dep.
diff --git a/debian/changelog b/debian/changelog
index 715a284..13b3595 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ x11proto-scrnsaver (1.2.1-1) UNRELEASED; urgency=low
* New upstream release.
[ Cyril Brulebois ]
+ * Add pkg-config build-dep.
* Add xmlto build-dep.
* Pass --with-xmlto and --without-fop, we want html and txt only.
* Kill *.xml in the doc directory, no point in shipping them.
diff --git a/debian/control b/debian/control
index 5f9f113..7c469be 100644
--- a/debian/control
+++ b/debian/control
@@ -7,6 +7,7 @@ Build-Depends:
debhelper (>= 5.0.0),
automake,
xutils-dev (>= 1:7.4+4),
+ pkg-config,
xmlto,
Standards-Version: 3.8.3
Vcs-Git: git://git.debian.org/git/pkg-xorg/proto/x11proto-scrnsaver
commit 675c413e79ad96b2a2069f0cde70a4840ff70f94
Author: Cyril Brulebois <k...@debian.org>
Date: Wed Nov 3 02:25:37 2010 +0100
Add myself to Uploaders.
diff --git a/debian/changelog b/debian/changelog
index 25cfc20..715a284 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,7 @@ x11proto-scrnsaver (1.2.1-1) UNRELEASED; urgency=low
* Ship *.html, *.css, and *.txt from the doc directory.
* 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 <sarv...@ubuntu.com> Tue, 02 Nov 2010 19:54:18 -0400
diff --git a/debian/control b/debian/control
index 02d8b13..5f9f113 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: x11proto-scrnsaver
Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
-Uploaders: David Nusinow <dnusi...@debian.org>, Andres Salomon
<dilin...@debian.org>
+Uploaders: David Nusinow <dnusi...@debian.org>, Andres Salomon
<dilin...@debian.org>, Cyril Brulebois <k...@debian.org>
Build-Depends:
debhelper (>= 5.0.0),
automake,
commit 6df6e0fd1fa01f4e18a76e6a669a77123d1589e4
Author: Cyril Brulebois <k...@debian.org>
Date: Wed Nov 3 02:24:57 2010 +0100
No longer pass --disable-shared, this option is gone.
diff --git a/debian/changelog b/debian/changelog
index 615ed9f..25cfc20 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,7 @@ x11proto-scrnsaver (1.2.1-1) UNRELEASED; urgency=low
* Kill *.xml in the doc directory, no point in shipping them.
* Ship *.html, *.css, and *.txt from the doc directory.
* Switch from --list-missing to --fail-missing for additional safety.
+ * No longer pass --disable-shared, this option is gone.
-- Robert Hooker <sarv...@ubuntu.com> Tue, 02 Nov 2010 19:54:18 -0400
diff --git a/debian/rules b/debian/rules
index b3ca5dc..312b61a 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
--with-xmlto --without-fop \
+ --infodir=\$${prefix}/share/info --with-xmlto
--without-fop \
$(confflags) CFLAGS="$(CFLAGS)"
cd build && $(MAKE)
>$@
commit ac7c24c7b7e36d0538d5aa622f5634c61b30fe1a
Author: Cyril Brulebois <k...@debian.org>
Date: Wed Nov 3 02:24:41 2010 +0100
Switch from --list-missing to --fail-missing for additional safety.
diff --git a/debian/changelog b/debian/changelog
index dfdff93..615ed9f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,7 @@ x11proto-scrnsaver (1.2.1-1) UNRELEASED; urgency=low
* Pass --with-xmlto and --without-fop, we want html and txt only.
* Kill *.xml in the doc directory, no point in shipping them.
* Ship *.html, *.css, and *.txt from the doc directory.
+ * Switch from --list-missing to --fail-missing for additional safety.
-- Robert Hooker <sarv...@ubuntu.com> Tue, 02 Nov 2010 19:54:18 -0400
diff --git a/debian/rules b/debian/rules
index bca6d15..b3ca5dc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -76,7 +76,7 @@ binary-indep: build install
dh_installdocs
dh_installman
find debian/tmp/usr/share/doc/scrnsaverproto -name '*.xml' -delete
- dh_install --sourcedir=debian/tmp --list-missing
+ dh_install --sourcedir=debian/tmp --fail-missing
dh_installchangelogs
dh_link
dh_strip
commit efb50f58e348ae75b557f99e0ab20f2880cd130d
Author: Cyril Brulebois <k...@debian.org>
Date: Wed Nov 3 02:24:28 2010 +0100
Ship *.html, *.css, and *.txt from the doc directory.
diff --git a/debian/changelog b/debian/changelog
index deaae48..dfdff93 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,7 @@ x11proto-scrnsaver (1.2.1-1) UNRELEASED; urgency=low
* Add xmlto build-dep.
* Pass --with-xmlto and --without-fop, we want html and txt only.
* Kill *.xml in the doc directory, no point in shipping them.
+ * Ship *.html, *.css, and *.txt from the doc directory.
-- Robert Hooker <sarv...@ubuntu.com> Tue, 02 Nov 2010 19:54:18 -0400
diff --git a/debian/x11proto-scrnsaver-dev.install
b/debian/x11proto-scrnsaver-dev.install
index d891cab..d11eaf1 100644
--- a/debian/x11proto-scrnsaver-dev.install
+++ b/debian/x11proto-scrnsaver-dev.install
@@ -1,2 +1,5 @@
usr/include/X11/extensions/*
usr/lib/pkgconfig/scrnsaverproto.pc
+usr/share/doc/scrnsaverproto/*.html usr/share/doc/x11proto-scrnsaver-dev/
+usr/share/doc/scrnsaverproto/*.css usr/share/doc/x11proto-scrnsaver-dev/
+usr/share/doc/scrnsaverproto/*.txt usr/share/doc/x11proto-scrnsaver-dev/
commit e1a73beeb25a3507156d1f78b67e62fc4f48b373
Author: Cyril Brulebois <k...@debian.org>
Date: Wed Nov 3 02:22:48 2010 +0100
Kill *.xml in the doc directory, no point in shipping them.
diff --git a/debian/changelog b/debian/changelog
index f0c0a11..deaae48 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,7 @@ x11proto-scrnsaver (1.2.1-1) UNRELEASED; urgency=low
[ Cyril Brulebois ]
* Add xmlto build-dep.
* Pass --with-xmlto and --without-fop, we want html and txt only.
+ * Kill *.xml in the doc directory, no point in shipping them.
-- Robert Hooker <sarv...@ubuntu.com> Tue, 02 Nov 2010 19:54:18 -0400
diff --git a/debian/rules b/debian/rules
index ea3e299..bca6d15 100755
--- a/debian/rules
+++ b/debian/rules
@@ -75,6 +75,7 @@ binary-indep: build install
dh_installdocs
dh_installman
+ find debian/tmp/usr/share/doc/scrnsaverproto -name '*.xml' -delete
dh_install --sourcedir=debian/tmp --list-missing
dh_installchangelogs
dh_link
commit a877a149156e7366b36d6fd186b2ae8bdc771660
Author: Cyril Brulebois <k...@debian.org>
Date: Wed Nov 3 02:21:20 2010 +0100
Pass --with-xmlto and --without-fop, we want html and txt only.
diff --git a/debian/changelog b/debian/changelog
index 7924a5e..f0c0a11 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ x11proto-scrnsaver (1.2.1-1) UNRELEASED; urgency=low
[ Cyril Brulebois ]
* Add xmlto build-dep.
+ * Pass --with-xmlto and --without-fop, we want html and txt only.
-- Robert Hooker <sarv...@ubuntu.com> Tue, 02 Nov 2010 19:54:18 -0400
diff --git a/debian/rules b/debian/rules
index 5ed6428..ea3e299 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 --disable-shared
--with-xmlto --without-fop \
$(confflags) CFLAGS="$(CFLAGS)"
cd build && $(MAKE)
>$@
commit ea2ed66b97e5b5bd6abf6bb59d525e4564c5c794
Author: Cyril Brulebois <k...@debian.org>
Date: Wed Nov 3 02:20:46 2010 +0100
Add xmlto build-dep.
diff --git a/debian/changelog b/debian/changelog
index f6cb6a7..7924a5e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,9 @@ x11proto-scrnsaver (1.2.1-1) UNRELEASED; urgency=low
[ Robert Hooker ]
* New upstream release.
+ [ Cyril Brulebois ]
+ * Add xmlto build-dep.
+
-- Robert Hooker <sarv...@ubuntu.com> Tue, 02 Nov 2010 19:54:18 -0400
x11proto-scrnsaver (1.2.0-2) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 6ff06d9..02d8b13 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,8 @@ Uploaders: David Nusinow <dnusi...@debian.org>, Andres Salomon
<dilin...@debian.
Build-Depends:
debhelper (>= 5.0.0),
automake,
- xutils-dev (>= 1:7.4+4)
+ xutils-dev (>= 1:7.4+4),
+ xmlto,
Standards-Version: 3.8.3
Vcs-Git: git://git.debian.org/git/pkg-xorg/proto/x11proto-scrnsaver
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/proto/x11proto-scrnsaver.git
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1pdlhj-0001tb...@alioth.debian.org
