r25590 - in /desktop/experimental/gtk+3.0/debian: changelog libgail3.0-doc.doc-base.gail-reference libgtk3.0-bin.postrm libgtk3.0-bin.preinst libgtk3.0-doc.doc-base.gdk libgtk3.0-doc.doc-base.gdk.in rules
pochu at users.alioth.debian.org
pochu at users.alioth.debian.org
Tue Nov 16 05:31:18 UTC 2010
Author: pochu
Date: Tue Nov 16 05:31:14 2010
New Revision: 25590
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=25590
Log:
* debian/libgtk3.0-bin.{preinst,postrm}:
+ Add #DEBHELPER# token. Make errors fatal with set -e.
* debian/rules:
+ Exclude .in files from the dh_installdocs call, so that
it picks the real .doc-base files and not the .in ones.
* debian/libgtk3.0-doc.doc-base.gdk{,.in}:
+ Don't hardcode the package name, generate it at build time.
* debian/libgail3.0-doc.doc-base.gail-reference:
+ Fix paths to the manual.
Added:
desktop/experimental/gtk+3.0/debian/libgtk3.0-doc.doc-base.gdk.in
- copied, changed from r25536, desktop/experimental/gtk+3.0/debian/libgtk3.0-doc.doc-base.gdk
Removed:
desktop/experimental/gtk+3.0/debian/libgtk3.0-doc.doc-base.gdk
Modified:
desktop/experimental/gtk+3.0/debian/changelog
desktop/experimental/gtk+3.0/debian/libgail3.0-doc.doc-base.gail-reference
desktop/experimental/gtk+3.0/debian/libgtk3.0-bin.postrm
desktop/experimental/gtk+3.0/debian/libgtk3.0-bin.preinst
desktop/experimental/gtk+3.0/debian/rules
Modified: desktop/experimental/gtk+3.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B3.0/debian/changelog?rev=25590&op=diff
==============================================================================
--- desktop/experimental/gtk+3.0/debian/changelog [utf-8] (original)
+++ desktop/experimental/gtk+3.0/debian/changelog [utf-8] Tue Nov 16 05:31:14 2010
@@ -7,8 +7,17 @@
- Bump glib2.0 build requirement.
+ debian/patches/*:
- Refreshed.
-
- -- Emilio Pozuelo Monfort <pochu at debian.org> Mon, 15 Nov 2010 23:45:43 +0100
+ * debian/libgtk3.0-bin.{preinst,postrm}:
+ + Add #DEBHELPER# token. Make errors fatal with set -e.
+ * debian/rules:
+ + Exclude .in files from the dh_installdocs call, so that
+ it picks the real .doc-base files and not the .in ones.
+ * debian/libgtk3.0-doc.doc-base.gdk{,.in}:
+ + Don't hardcode the package name, generate it at build time.
+ * debian/libgail3.0-doc.doc-base.gail-reference:
+ + Fix paths to the manual.
+
+ -- Emilio Pozuelo Monfort <pochu at debian.org> Tue, 16 Nov 2010 06:30:33 +0100
gtk+3.0 (2.91.3-1) experimental; urgency=low
Modified: desktop/experimental/gtk+3.0/debian/libgail3.0-doc.doc-base.gail-reference
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B3.0/debian/libgail3.0-doc.doc-base.gail-reference?rev=25590&op=diff
==============================================================================
--- desktop/experimental/gtk+3.0/debian/libgail3.0-doc.doc-base.gail-reference [utf-8] (original)
+++ desktop/experimental/gtk+3.0/debian/libgail3.0-doc.doc-base.gail-reference [utf-8] Tue Nov 16 05:31:14 2010
@@ -5,6 +5,5 @@
Section: Accessibility
Format: HTML
-Index: /usr/share/gtk-doc/html/gail-libgail-util-3.0/index.html
-Files: /usr/share/gtk-doc/html/gail-libgail-util-3.0/*.html
-
+Index: /usr/share/gtk-doc/html/gail-libgail-util3/index.html
+Files: /usr/share/gtk-doc/html/gail-libgail-util3/*.html
Modified: desktop/experimental/gtk+3.0/debian/libgtk3.0-bin.postrm
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B3.0/debian/libgtk3.0-bin.postrm?rev=25590&op=diff
==============================================================================
--- desktop/experimental/gtk+3.0/debian/libgtk3.0-bin.postrm [utf-8] (original)
+++ desktop/experimental/gtk+3.0/debian/libgtk3.0-bin.postrm [utf-8] Tue Nov 16 05:31:14 2010
@@ -1,4 +1,5 @@
#!/bin/sh -e
+set -e
if [ "$1" = remove ] ; then
dpkg-divert --remove --package libgtk3.0-bin --rename \
@@ -9,4 +10,6 @@
/usr/share/man/man8/update-icon-caches.8.gz
fi
+#DEBHELPER#
+
exit 0
Modified: desktop/experimental/gtk+3.0/debian/libgtk3.0-bin.preinst
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B3.0/debian/libgtk3.0-bin.preinst?rev=25590&op=diff
==============================================================================
--- desktop/experimental/gtk+3.0/debian/libgtk3.0-bin.preinst [utf-8] (original)
+++ desktop/experimental/gtk+3.0/debian/libgtk3.0-bin.preinst [utf-8] Tue Nov 16 05:31:14 2010
@@ -1,4 +1,5 @@
#!/bin/sh -e
+set -e
if [ "$1" = install ] || [ "$1" = upgrade ] ; then
dpkg-divert --add --package libgtk3.0-bin --rename \
@@ -9,4 +10,6 @@
/usr/share/man/man8/update-icon-caches.8.gz
fi
+#DEBHELPER#
+
exit 0
Copied: desktop/experimental/gtk+3.0/debian/libgtk3.0-doc.doc-base.gdk.in (from r25536, desktop/experimental/gtk+3.0/debian/libgtk3.0-doc.doc-base.gdk)
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B3.0/debian/libgtk3.0-doc.doc-base.gdk.in?rev=25590&op=diff
==============================================================================
--- desktop/experimental/gtk+3.0/debian/libgtk3.0-doc.doc-base.gdk [utf-8] (original)
+++ desktop/experimental/gtk+3.0/debian/libgtk3.0-doc.doc-base.gdk.in [utf-8] Tue Nov 16 05:31:14 2010
@@ -9,5 +9,5 @@
Section: Programming/C
Format: HTML
-Index: /usr/share/doc/libgtk3.0-doc/gdk3/index.html
-Files: /usr/share/doc/libgtk3.0-doc/gdk3/*.html
+Index: /usr/share/doc/@DOC_PKG@/gdk3/index.html
+Files: /usr/share/doc/@DOC_PKG@/gdk3/*.html
Modified: desktop/experimental/gtk+3.0/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B3.0/debian/rules?rev=25590&op=diff
==============================================================================
--- desktop/experimental/gtk+3.0/debian/rules [utf-8] (original)
+++ desktop/experimental/gtk+3.0/debian/rules [utf-8] Tue Nov 16 05:31:14 2010
@@ -271,7 +271,7 @@
# do not merge the calls: dh_installdocs will only install some files
# in the first package
dh_installdocs -p$(COMMON_PKG) $(DH_INSTALLDOCS_FILES)
- dh_installdocs -p$(DOC_PKG) $(DH_INSTALLDOCS_FILES)
+ dh_installdocs -p$(DOC_PKG) -X.in $(DH_INSTALLDOCS_FILES)
# install copyright in all packages; the -p is for the special behavior
# of dh_installdocs (ship README.Debian etc. in the first package)
dh_installdocs -p$(COMMON_PKG) -i
More information about the pkg-gnome-commits
mailing list