Permalink
Browse files

Merge branch 'master' into upstream-merge

  • Loading branch information...
2 parents fbb0019 + edffc69 commit aa8e10c542bfb1eb95e73f44f07573a54f014892 Philippe Normand committed May 16, 2012
View
@@ -12,14 +12,5 @@ Package: webkit
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: webkit for webOS
- WebKit is an open source web browser engine. QtWebKit is the Qt Port of WebKit. This code is based on the source found in
- webkit.org but it contains modifications introduced by the isis-project.
-
- For more information see:
-
- http://www.webkit.org
- http://developer.qt.nokia.com/wiki/QtWebKit
- http://en.wikipedia.org/wiki/Webkit
- http://isis-project.org/
View
@@ -7,7 +7,28 @@
# This special exception was added by Craig Small in version 0.37 of dh-make.
# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+export DH_VERBOSE=1
+export DEB_STAGING_LIBDIR=debian/webkit/usr/lib
%:
dh $@
+
+.PHONY: override_dh_auto_build override_dh_auto_test override_dh_install
+
+override_dh_auto_build:
+
+override_dh_auto_test:
+
+override_dh_auto_clean:
+
+override_dh_install:
+
+override_dh_auto_install:
+
+override_dh_installdirs:
+ mkdir -p $(DEB_STAGING_LIBDIR)
+ install -m 444 ./lib/libQtWebKit.so* $(DEB_STAGING_LIBDIR)
+
+# this is temporary until we figure out the dependencies
+override_dh_shlibdeps:
+
View
@@ -1 +1 @@
-3.0 (quilt)
+3.0 (native)
@@ -0,0 +1,47 @@
+dh_auto_configure
+dh_auto_build
+dh_auto_test
+dh_prep
+dh_installdirs
+dh_auto_install
+dh_install
+dh_installdocs
+dh_installchangelogs
+dh_installexamples
+dh_installman
+dh_installcatalogs
+dh_installcron
+dh_installdebconf
+dh_installemacsen
+dh_installifupdown
+dh_installinfo
+dh_pysupport
+dh_installinit
+dh_installmenu
+dh_installmime
+dh_installmodules
+dh_installlogcheck
+dh_installlogrotate
+dh_installpam
+dh_installppp
+dh_installudev
+dh_installwm
+dh_installxfonts
+dh_installgsettings
+dh_bugfiles
+dh_ucf
+dh_lintian
+dh_gconf
+dh_icons
+dh_perl
+dh_usrlocal
+dh_link
+dh_compress
+dh_fixperms
+dh_strip
+dh_makeshlibs
+dh_shlibdeps
+dh_installdeb
+dh_gencontrol
+dh_md5sums
+dh_builddeb
View
@@ -0,0 +1 @@
+/usr/lib/* /usr/lib/
@@ -0,0 +1,5 @@
+# Automatically added by dh_makeshlibs
+if [ "$1" = "configure" ]; then
+ ldconfig
+fi
+# End automatically added section
@@ -0,0 +1,5 @@
+# Automatically added by dh_makeshlibs
+if [ "$1" = "remove" ]; then
+ ldconfig
+fi
+# End automatically added section
View
@@ -0,0 +1 @@
+misc:Depends=

0 comments on commit aa8e10c

Please sign in to comment.