r10552 - in /desktop/unstable/libgtkhtml2/debian: changelog control
control.in rules
lool at users.alioth.debian.org
lool at users.alioth.debian.org
Mon Apr 30 09:17:32 UTC 2007
Author: lool
Date: Mon Apr 30 09:17:31 2007
New Revision: 10552
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=10552
Log:
* Rename CURRENT to SONAME.
* Move control generation to clean.
* Cleanups.
* DISABLE_UPDATE_UPLOADERS and build-depend on gnome-pkg-tools >= 0.11.
Modified:
desktop/unstable/libgtkhtml2/debian/changelog
desktop/unstable/libgtkhtml2/debian/control
desktop/unstable/libgtkhtml2/debian/control.in
desktop/unstable/libgtkhtml2/debian/rules
Modified: desktop/unstable/libgtkhtml2/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libgtkhtml2/debian/changelog?rev=10552&op=diff
==============================================================================
--- desktop/unstable/libgtkhtml2/debian/changelog (original)
+++ desktop/unstable/libgtkhtml2/debian/changelog Mon Apr 30 09:17:31 2007
@@ -7,8 +7,12 @@
* Add a get-orig-source target to retrieve the upstream tarball.
* Simply use "dh_makeshlibs -V" instead of computing the upstream version
and passing it to dh_makeshlibs.
-
- -- Loic Minier <lool at dooz.org> Mon, 30 Apr 2007 10:58:20 +0200
+ * Rename CURRENT to SONAME.
+ * Move control generation to clean.
+ * Cleanups.
+ * DISABLE_UPDATE_UPLOADERS and build-depend on gnome-pkg-tools >= 0.11.
+
+ -- Loic Minier <lool at dooz.org> Mon, 30 Apr 2007 11:11:42 +0200
libgtkhtml2 (2.11.0-3) unstable; urgency=low
Modified: desktop/unstable/libgtkhtml2/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libgtkhtml2/debian/control?rev=10552&op=diff
==============================================================================
--- desktop/unstable/libgtkhtml2/debian/control (original)
+++ desktop/unstable/libgtkhtml2/debian/control Mon Apr 30 09:17:31 2007
@@ -2,9 +2,9 @@
Section: libs
Priority: optional
Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
-Uploaders: Andrew Lau <netsnipe at users.sourceforge.net>, Clément Stenac <zorglub at debian.org>, Dafydd Harries <daf at debian.org>, Guilherme de S. Pastore <gpastore at debian.org>, Gustavo Franco <stratus at debian.org>, Gustavo Noronha Silva <kov at debian.org>, J.H.M. Dassen (Ray) <jdassen at debian.org>, Jordi Mallach <jordi at debian.org>, Jose Carlos Garcia Sogo <jsogo at debian.org>, Josselin Mouette <joss at debian.org>, Loic Minier <lool at dooz.org>, Marc HE Brockschmidt <he at debian.org>, Marco Cabizza <marco87 at gmail.com>, Oystein Gisnas <oystein at gisnas.net>, OndÅej Surý <ondrej at debian.org>, Ross Burton <ross at debian.org>, Sebastien Bacher <seb128 at debian.org>, Sjoerd Simons <sjoerd at debian.org>
+Uploaders: Loic Minier <lool at dooz.org>, Sebastien Bacher <seb128 at debian.org>
Standards-Version: 3.7.2
-Build-Depends: debhelper (>= 5), gettext (>= 0.10.38), libxml2-dev (>= 2.4.16), libgail-dev (>= 1.4), libgtk2.0-dev (>= 2.2), libgnomevfs2-dev (>= 1.9.8), gnome-pkg-tools, autotools-dev
+Build-Depends: debhelper (>= 5), gettext (>= 0.10.38), libxml2-dev (>= 2.4.16), libgail-dev (>= 1.4), libgtk2.0-dev (>= 2.2), libgnomevfs2-dev (>= 1.9.8), gnome-pkg-tools (>= 0.11), autotools-dev
Package: libgtkhtml2-0
Architecture: any
Modified: desktop/unstable/libgtkhtml2/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libgtkhtml2/debian/control.in?rev=10552&op=diff
==============================================================================
--- desktop/unstable/libgtkhtml2/debian/control.in (original)
+++ desktop/unstable/libgtkhtml2/debian/control.in Mon Apr 30 09:17:31 2007
@@ -4,9 +4,9 @@
Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
Uploaders: @GNOME_TEAM@
Standards-Version: 3.7.2
-Build-Depends: debhelper (>= 5), gettext (>= 0.10.38), libxml2-dev (>= 2.4.16), libgail-dev (>= 1.4), libgtk2.0-dev (>= 2.2), libgnomevfs2-dev (>= 1.9.8), gnome-pkg-tools, autotools-dev
+Build-Depends: debhelper (>= 5), gettext (>= 0.10.38), libxml2-dev (>= 2.4.16), libgail-dev (>= 1.4), libgtk2.0-dev (>= 2.2), libgnomevfs2-dev (>= 1.9.8), gnome-pkg-tools (>= 0.11), autotools-dev
-Package: libgtkhtml2- at CURRENT@
+Package: libgtkhtml2- at SONAME@
Architecture: any
Section: libs
Depends: ${misc:Depends}, ${shlibs:Depends}
@@ -19,7 +19,7 @@
Package: libgtkhtml2-dev
Architecture: any
Section: libdevel
-Depends: ${misc:Depends}, libgtkhtml2- at CURRENT@ (= ${Source-Version}), libxml2-dev, libgail-dev (>= 1.2)
+Depends: ${misc:Depends}, libgtkhtml2- at SONAME@ (= ${Source-Version}), libxml2-dev, libgail-dev (>= 1.2)
Description: HTML rendering/editing library - development files. for (GNOME2)
This is GtkHTML, a lightweight HTML rendering/printing/editing engine. It
was originally based on KHTMLW, but is now being developed independently.
Modified: desktop/unstable/libgtkhtml2/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libgtkhtml2/debian/rules?rev=10552&op=diff
==============================================================================
--- desktop/unstable/libgtkhtml2/debian/rules (original)
+++ desktop/unstable/libgtkhtml2/debian/rules Mon Apr 30 09:17:31 2007
@@ -1,17 +1,12 @@
#!/usr/bin/make -f
-CURRENT := 0
-
+DISABLE_UPDATE_UPLOADERS := 1
include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
-
GNOME_MODULE := libgtkhtml
-debian/control: debian/control.in
- dh_testdir
- sed -e "s/@CURRENT@/${CURRENT}/g" \
- -e 's/@GNOME_TEAM@/${uploaders}/' $@.in > $@
- @echo "*** GTKHTML_CURRENT : ${CURRENT}"
+SONAME := 0
+LIB_PKG := libgtkhtml2-$(SONAME)
configure: configure-stamp
configure-stamp: debian/control
@@ -27,47 +22,48 @@
build-stamp: configure
dh_testdir
$(MAKE)
- touch build-stamp
+ touch $@
clean:: debian/control
dh_testdir
dh_testroot
rm -f *-stamp
- [ ! -f Makefile ] || $(MAKE) distclean
+ if [ -f Makefile ]; then $(MAKE) distclean; fi
dh_clean
+ sed -e 's#@SONAME@#$(SONAME)#g' \
+ -e 's#@GNOME_TEAM@#$(UPLOADERS)#g' \
+ debian/control.in >debian/control
install: build
dh_testdir
dh_testroot
dh_clean
dh_installdirs
- $(MAKE) install prefix=$(CURDIR)/debian/libgtkhtml2-${CURRENT}/usr
- dh_movefiles --sourcedir=debian/libgtkhtml2-${CURRENT}
+ $(MAKE) install prefix=$(CURDIR)/debian/$(LIB_PKG)/usr
+ dh_movefiles --sourcedir=debian/$(LIB_PKG)
find debian -type d | xargs rmdir -p --ignore-fail-on-non-empty
touch install-stamp
-# Build architecture-independent files here.
binary-indep: build install
-
binary-arch: build install
dh_testdir
dh_testroot
- dh_installdocs -plibgtkhtml2-${CURRENT}
+ dh_installdocs -p$(LIB_PKG)
dh_installman
dh_installchangelogs ChangeLog
- rm -r debian/libgtkhtml2-dev/usr/share/doc/*
- dh_link -plibgtkhtml2-dev /usr/share/doc/libgtkhtml2-${CURRENT} \
- /usr/share/doc/libgtkhtml2-dev
+ rm -rv debian/libgtkhtml2-dev/usr/share/doc/*
+ dh_link -plibgtkhtml2-dev /usr/share/doc/$(LIB_PKG) \
+ /usr/share/doc/libgtkhtml2-dev
dh_strip
dh_compress
dh_fixperms
- dh_makeshlibs -plibgtkhtml2-${CURRENT} -V
+ dh_makeshlibs -p$(LIB_PKG) -V
dh_installdeb
- dh_shlibdeps -ldebian/libgtkhtml2-${CURRENT}/usr/lib
+ dh_shlibdeps -ldebian/$(LIB_PKG)/usr/lib
dh_gencontrol
dh_md5sums
dh_builddeb
binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure debian/control update
+.PHONY: build clean binary-indep binary-arch binary install configure
More information about the pkg-gnome-commits
mailing list