[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.0.1-4-2877-g8410c4b
Mike Hommey
glandium at debian.org
Sat Oct 25 11:00:55 UTC 2008
The following commit has been merged in the debian/experimental branch:
commit b1a62ccf62d8e9e067d3bdf3bbc0ea721b501e30
Author: Mike Hommey <glandium at debian.org>
Date: Sat Oct 25 09:15:21 2008 +0200
Don't rely on autotools anymore
Now that configure and other autotools generated files are shipped upstream,
we can stop relying on autogen.sh and stop removing auto-generated files.
diff --git a/debian/changelog b/debian/changelog
index c9aec69..a130a41 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+webkit (1.0.2~pre.svn37878-1) UNRELEASED; urgency=low
+
+ * Upstream 1.0.2 pre-release, taken from svn revision 37878.
+ * debian/rules:
+ - Use configure instead of autogen.sh, now configure is shipped.
+ - Don't remove automake/autoconf generated files.
+ * debian/control: Don't build depend on autotools.
+
+ -- Mike Hommey <glandium at debian.org> Sat, 25 Oct 2008 09:08:57 +0200
+
webkit (1.0.1-4) unstable; urgency=high
* WebCore/dom/Document.*, WebCore/loader/DocLoader.*: Avoid DoS via
diff --git a/debian/control b/debian/control
index fc7f4ec..ddbcbad 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Priority: optional
Section: web
Maintainer: Debian WebKit Maintainers <pkg-webkit-maintainers at lists.alioth.debian.org>
Uploaders: Mike Hommey <glandium at debian.org>
-Build-Depends: debhelper (>= 5.0), libgtk2.0-dev (>= 2.10), libpango1.0-dev (>= 1.16), libicu-dev, libxslt-dev, libcurl4-dev, libsqlite3-dev, gperf, bison, flex, libjpeg62-dev, libpng12-dev, autoconf, automake, libtool, libxt-dev
+Build-Depends: debhelper (>= 5.0), libgtk2.0-dev (>= 2.10), libpango1.0-dev (>= 1.16), libicu-dev, libxslt-dev, libcurl4-dev, libsqlite3-dev, gperf, bison, flex, libjpeg62-dev, libpng12-dev, libxt-dev
Standards-Version: 3.8.0.1
Homepage: http://webkit.org/
Vcs-Browser: http://git.debian.org/?p=pkg-webkit/webkit.git
diff --git a/debian/rules b/debian/rules
index a8ed06b..97e4e44 100755
--- a/debian/rules
+++ b/debian/rules
@@ -22,9 +22,6 @@ clean:
rm -f build-stamp install-stamp
rm -rf build
- rm -f GNUmakefile.in INSTALL README aclocal.m4 aconfig.h.in compile config.guess config.sub configure depcomp install-sh ltmain.sh missing
- rm -rf autom4te.cache
-
dh_clean
build: build-stamp
@@ -38,7 +35,7 @@ build-stamp:
CXXFLAGS="$(CFLAGS)" \
CC="gcc -Wl,--as-needed" \
CXX="g++ -Wl,--as-needed" \
- ../autogen.sh --prefix=/usr --enable-svg-experimental
+ ../configure --prefix=/usr --enable-svg-experimental
$(MAKE) -C build
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list