r12342 - in /desktop/unstable/libgtkhtml2/debian: changelog gtkhtml2.files libgtkhtml2-0.install libgtkhtml2-data.files libgtkhtml2-dev.files libgtkhtml2-dev.install libgtkhtml2-dev.links rules

[lool at users.alioth.debian.org]

Author: lool
Date: Wed Aug 15 14:53:23 2007
New Revision: 12342

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=12342
Log:
* Convert the package to dh_install and refactor the install process.

Added:
    desktop/unstable/libgtkhtml2/debian/libgtkhtml2-0.install
    desktop/unstable/libgtkhtml2/debian/libgtkhtml2-dev.install
      - copied unchanged from r12334, desktop/unstable/libgtkhtml2/debian/libgtkhtml2-dev.files
    desktop/unstable/libgtkhtml2/debian/libgtkhtml2-dev.links
Removed:
    desktop/unstable/libgtkhtml2/debian/gtkhtml2.files
    desktop/unstable/libgtkhtml2/debian/libgtkhtml2-data.files
    desktop/unstable/libgtkhtml2/debian/libgtkhtml2-dev.files
Modified:
    desktop/unstable/libgtkhtml2/debian/changelog
    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=12342&op=diff
==============================================================================
--- desktop/unstable/libgtkhtml2/debian/changelog (original)
+++ desktop/unstable/libgtkhtml2/debian/changelog Wed Aug 15 14:53:23 2007
@@ -22,8 +22,9 @@
   * Cleanup rules and get rid of the install target.
   * Misc cleanups; drop obsolete lintian override.
   * Use ${binary:Version} instead of ${Source-Version}.
-
- -- Loic Minier <lool at dooz.org>  Wed, 15 Aug 2007 16:33:19 +0200
+  * Convert the package to dh_install and refactor the install process.
+
+ -- Loic Minier <lool at dooz.org>  Wed, 15 Aug 2007 16:49:17 +0200
 
 libgtkhtml2 (2.11.0-3) unstable; urgency=low
 

Added: desktop/unstable/libgtkhtml2/debian/libgtkhtml2-0.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libgtkhtml2/debian/libgtkhtml2-0.install?rev=12342&op=file
==============================================================================
--- desktop/unstable/libgtkhtml2/debian/libgtkhtml2-0.install (added)
+++ desktop/unstable/libgtkhtml2/debian/libgtkhtml2-0.install Wed Aug 15 14:53:23 2007
@@ -1,0 +1,1 @@
+usr/lib/*.so.*

Added: desktop/unstable/libgtkhtml2/debian/libgtkhtml2-dev.links
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libgtkhtml2/debian/libgtkhtml2-dev.links?rev=12342&op=file
==============================================================================
--- desktop/unstable/libgtkhtml2/debian/libgtkhtml2-dev.links (added)
+++ desktop/unstable/libgtkhtml2/debian/libgtkhtml2-dev.links Wed Aug 15 14:53:23 2007
@@ -1,0 +1,1 @@
+usr/share/doc/libgtkhtml2-0 usr/share/doc/libgtkhtml2-dev

Modified: desktop/unstable/libgtkhtml2/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libgtkhtml2/debian/rules?rev=12342&op=diff
==============================================================================
--- desktop/unstable/libgtkhtml2/debian/rules (original)
+++ desktop/unstable/libgtkhtml2/debian/rules Wed Aug 15 14:53:23 2007
@@ -34,26 +34,27 @@
 		-e 's#@GNOME_TEAM@#$(UPLOADERS)#g' \
 		debian/control.in >debian/control
 
-binary-indep: build
-
-binary-arch: build
+install: install-stamp
+install-stamp: build-stamp
 	dh_testdir
 	dh_testroot
-	dh_clean -s
-	dh_installdirs -s
-	$(MAKE) install prefix=$(CURDIR)/debian/$(LIB_PKG)/usr
-	dh_movefiles -s --sourcedir=debian/$(LIB_PKG)
-	find debian -type d | xargs rmdir -p --ignore-fail-on-non-empty
+	dh_clean
+	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
+
+binary-indep: install
+
+binary-arch: install
+	dh_testdir
+	dh_testroot
+	dh_install -s --sourcedir=debian/tmp
 	dh_installdocs -p$(LIB_PKG)
 	dh_installman -s
-	dh_installchangelogs -s ChangeLog
-	rm -rv debian/libgtkhtml2-dev/usr/share/doc/*
-	dh_link -plibgtkhtml2-dev /usr/share/doc/$(LIB_PKG) \
-		/usr/share/doc/libgtkhtml2-dev
+	dh_installchangelogs -p$(LIB_PKG) ChangeLog
+	dh_link -s
 	dh_strip -s
 	dh_compress -s
 	dh_fixperms -s
-	dh_makeshlibs -p$(LIB_PKG) -V
+	dh_makeshlibs -s -V
 	dh_installdeb -s
 	dh_shlibdeps -s -ldebian/$(LIB_PKG)/usr/lib
 	dh_gencontrol -s
@@ -61,4 +62,4 @@
 	dh_builddeb -s
 
 binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary configure
+.PHONY: configure build clean install binary-indep binary-arch binary