As discussed on -devel, I'm intending to upload an NMU with the attached diff and debdiffs. I'm not attaching the full diff because of the new upstream release, though.
I'm not especially happy with the stuff in /usr/include but for a start it shouldn't be a problem. Cheers, -- Yves-Alexis
Differences in midori between 0.2.4-3 and 0.2.7-1.1
[The following lists of changes regard files as different if they have
different names, permissions or owners.]
Files in second .deb but not in first
-------------------------------------
-rw-r--r-- root/root
/usr/include/midori-0.2/extensions/external-applications.h
-rw-r--r-- root/root /usr/include/midori-0.2/extensions/history-list.h
-rw-r--r-- root/root /usr/lib/midori/libaddons.so
-rw-r--r-- root/root /usr/lib/midori/libcopy-tabs.so
-rw-r--r-- root/root /usr/lib/midori/libexternal-applications.so
-rw-r--r-- root/root /usr/lib/midori/libhistory-list.so
-rw-r--r-- root/root /usr/lib/midori/libstatus-clock.so
-rw-r--r-- root/root /usr/lib/midori/libtabs-minimized.so
-rw-r--r-- root/root /usr/share/icons/hicolor/scalable/apps/midori.svg
-rw-r--r-- root/root
/usr/share/icons/hicolor/scalable/categories/extension.svg
-rw-r--r-- root/root /usr/share/icons/hicolor/scalable/status/news-feed.svg
-rw-r--r-- root/root /usr/share/locale/hr/LC_MESSAGES/midori.mo
-rw-r--r-- root/root /usr/share/locale/pa/LC_MESSAGES/midori.mo
-rw-r--r-- root/root /usr/share/locale/ug/LC_MESSAGES/midori.mo
-rw-r--r-- root/root /usr/share/vala/vapi/external-applications.deps
-rw-r--r-- root/root /usr/share/vala/vapi/external-applications.vapi
-rw-r--r-- root/root /usr/share/vala/vapi/history-list.deps
-rw-r--r-- root/root /usr/share/vala/vapi/history-list.vapi
-rwxr-xr-x root/root DEBIAN/preinst
Control files: lines which differ (wdiff format)
------------------------------------------------
Depends: libatk1.0-0 (>= 1.29.3), libc6 (>= 2.2.5), libcairo2 (>= 1.2.4),
libdbus-1-3 (>= 1.0.2), libdbus-glib-1-2 (>= 0.78), libfontconfig1 (>= 2.8.0),
libfreetype6 (>= 2.2.1), libglib2.0-0 (>= 2.24.0), libgtk2.0-0 (>= 2.20.0),
libnotify1 (>= [-0.4.5),-] {+0.5.0),+} libnotify1-gtk2.10, libpango1.0-0 (>=
1.14.0), libsoup2.4-1 (>= 2.27.4), libsqlite3-0 (>= [-3.6.23.1),-]
{+3.7.0.1),+} libunique-1.0-0 (>= 1.0.0), libwebkit-1.0-2 (>= 1.1.17),
[-libx11-6 (>= 0),-] {+libx11-6,+} libxml2 (>= 2.7.4), dbus-x11, libjs-mootools
Installed-Size: [-2976-] {+3612+}
{+Pre-Depends: dpkg (>= 1.15.7.2)+}
Version: [-0.2.4-3-] {+0.2.7-1.1+}
Differences in midori-dbg between 0.2.4-3 and 0.2.7-1.1
[The following lists of changes regard files as different if they have
different names, permissions or owners.]
Files in second .deb but not in first
-------------------------------------
-rw-r--r-- root/root /usr/lib/debug/usr/lib/midori/libaddons.so
-rw-r--r-- root/root /usr/lib/debug/usr/lib/midori/libcopy-tabs.so
-rw-r--r-- root/root
/usr/lib/debug/usr/lib/midori/libexternal-applications.so
-rw-r--r-- root/root /usr/lib/debug/usr/lib/midori/libhistory-list.so
-rw-r--r-- root/root /usr/lib/debug/usr/lib/midori/libstatus-clock.so
-rw-r--r-- root/root /usr/lib/debug/usr/lib/midori/libtabs-minimized.so
Control files: lines which differ (wdiff format)
------------------------------------------------
Depends: midori (= [-0.2.4-3)-] {+0.2.7-1.1)+}
Installed-Size: [-1564-] {+1796+}
Version: [-0.2.4-3-] {+0.2.7-1.1+}
diff --git a/debian/changelog b/debian/changelog
index 8b97fb7..1986775 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
-midori (0.2.6-1) UNRELEASED; urgency=low
+midori (0.2.7-1.1) UNRELEASED; urgency=low
+ [Ryan Niebur]
* New Upstream Version (Closes: #582213)
- fixes segfault (Closes: #579118)
- correct link to FAQ (Closes: #582512)
@@ -8,7 +9,17 @@ midori (0.2.6-1) UNRELEASED; urgency=low
* use dpkg-maintscript-helper to remove old config file
/etc/midori/extensions/libadblock.so (Closes: #573208)
- -- Ryan Niebur <[email protected]> Tue, 01 Jun 2010 21:23:35 -0700
+ [Yves-Alexis Perez]
+ * Non-maintainer upload.
+ * New 2.7 upstream release.
+ * debian/watch edited to correctly track upstream versions.
+ * debian/rules:
+ - use --fail-missing in dh_install
+ * debian/control:
+ - add build-dep on valac to build certain extensions.
+ - update standards version to 3.9.1
+
+ -- Yves-Alexis Perez <[email protected]> Tue, 17 Aug 2010 08:44:46 +0200
midori (0.2.4-3) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 0d9be4e..23f7a53 100644
--- a/debian/control
+++ b/debian/control
@@ -20,6 +20,7 @@ Build-Depends: debhelper (>= 7.0.50),
python-docutils,
libsoup2.4-dev (>= 2.25.2),
libnotify-dev,
+ valac,
# For testing under xvfb:
xvfb,
xauth,
@@ -28,7 +29,7 @@ Build-Depends: debhelper (>= 7.0.50),
Build-Conflicts: gtk-doc-tools,
libgtksourceview2.0-dev (>= 2.0),
libhildon-1-dev
-Standards-Version: 3.8.4
+Standards-Version: 3.9.1
Homepage: http://www.twotoasts.de/index.php?/pages/midori_summary.html
Vcs-Git: git://git.ryan52.info/git/midori
Vcs-Browser: http://git.ryan52.info/?p=midori;a=summary
diff --git a/debian/rules b/debian/rules
index 8afbbbf..88c8b36 100755
--- a/debian/rules
+++ b/debian/rules
@@ -32,7 +32,7 @@ debian/presubj: debian/presubj.in
sed -e "s,%LIBWEBKIT_PKG%,$(LIBWEBKIT_PKG),g" -e "s,%GTKLAUNCHER%,$(GTKLAUNCHER),g" [email protected] > $@
override_dh_install: debian/presubj
- $(CMD)
+ $(CMD) --fail-missing
WAFADMIN_FILE=debian/wafadmin/Runner.py
WAFADMIN_APPEND=debian/runner-append
diff --git a/debian/watch b/debian/watch
index 0f16241..22cd0bd 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,2 @@
version=3
-http://archive.xfce.org/src/apps/midori/(?:[\d.]+)/midori-([\d.]+).tar.bz2
+http://archive.xfce.org/src/apps/midori/([\d\.]+)/midori-([\d.]+).tar.bz2
signature.asc
Description: This is a digitally signed message part
