r13471 - in /desktop/experimental/evince/debian: changelog evince-gtk.install evince-gtk.install.disabled evince-gtk.menu evince.install evince.install.disabled evince.menu rules

joss at users.alioth.debian.org joss at users.alioth.debian.org
Sat Nov 17 10:36:33 UTC 2007 

Author: joss
Date: Sat Nov 17 10:36:33 2007
New Revision: 13471

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=13471
Log:
* Simplify the build process by installing directly the stuff in
  debian/evince(-gtk). This way dh_* are executed in the correct
  order, and this fixes the GConf schemas installation.
  Closes: #448640.
* Update the menu files to the new layout.

Added:
    desktop/experimental/evince/debian/evince-gtk.install
    desktop/experimental/evince/debian/evince.install
      - copied, changed from r13470, desktop/experimental/evince/debian/evince.install.disabled
Removed:
    desktop/experimental/evince/debian/evince-gtk.install.disabled
    desktop/experimental/evince/debian/evince.install.disabled
Modified:
    desktop/experimental/evince/debian/changelog
    desktop/experimental/evince/debian/evince-gtk.menu
    desktop/experimental/evince/debian/evince.menu
    desktop/experimental/evince/debian/rules

Modified: desktop/experimental/evince/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/evince/debian/changelog?rev=13471&op=diff
==============================================================================
--- desktop/experimental/evince/debian/changelog (original)
+++ desktop/experimental/evince/debian/changelog Sat Nov 17 10:36:33 2007
@@ -1,3 +1,13 @@
+evince (2.20.1-2) UNRELEASED; urgency=low
+
+  * Simplify the build process by installing directly the stuff in
+    debian/evince(-gtk). This way dh_* are executed in the correct
+    order, and this fixes the GConf schemas installation.
+    Closes: #448640.
+  * Update the menu files to the new layout.
+
+ -- Josselin Mouette <joss at debian.org>  Sat, 17 Nov 2007 11:23:14 +0100
+
 evince (2.20.1-1) experimental; urgency=low
 
   * New upstream bugfix release:

Added: desktop/experimental/evince/debian/evince-gtk.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/evince/debian/evince-gtk.install?rev=13471&op=file
==============================================================================
--- desktop/experimental/evince/debian/evince-gtk.install (added)
+++ desktop/experimental/evince/debian/evince-gtk.install Sat Nov 17 10:36:33 2007
@@ -1,0 +1,1 @@
+debian/evince.xpm /usr/share/pixmaps/

Modified: desktop/experimental/evince/debian/evince-gtk.menu
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/evince/debian/evince-gtk.menu?rev=13471&op=diff
==============================================================================
--- desktop/experimental/evince/debian/evince-gtk.menu (original)
+++ desktop/experimental/evince/debian/evince-gtk.menu Sat Nov 17 10:36:33 2007
@@ -1,3 +1,3 @@
-?package(evince-gtk):needs="X11" section="Apps/Viewers"\
+?package(evince-gtk):needs="X11" section="Applications/Viewers"\
  title="Evince" command="/usr/bin/evince"\
  hints="Documents" icon="/usr/share/pixmaps/evince.xpm"

Copied: desktop/experimental/evince/debian/evince.install (from r13470, desktop/experimental/evince/debian/evince.install.disabled)
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/evince/debian/evince.install?rev=13471&op=diff
==============================================================================
--- desktop/experimental/evince/debian/evince.install.disabled (original)
+++ desktop/experimental/evince/debian/evince.install Sat Nov 17 10:36:33 2007
@@ -1,15 +1,1 @@
-/etc/gconf/schemas/ usr/share/gconf/
-/usr/share/applications/evince.desktop
-/usr/share/evince/
-/usr/share/icons/hicolor/
-/usr/share/gnome/help/evince/
-/usr/share/locale/
-/usr/share/omf/evince/
-/usr/share/man/man1/
-
-#Don't install gtk-doc for usual application package:
-#/usr/share/gtk-doc/
-
-/usr/bin/evince
-/usr/bin/evince-thumbnailer
-/usr/lib/nautilus/extensions-1.0/libevince-properties-page.so
+debian/evince.xpm /usr/share/pixmaps/

Modified: desktop/experimental/evince/debian/evince.menu
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/evince/debian/evince.menu?rev=13471&op=diff
==============================================================================
--- desktop/experimental/evince/debian/evince.menu (original)
+++ desktop/experimental/evince/debian/evince.menu Sat Nov 17 10:36:33 2007
@@ -1,3 +1,3 @@
-?package(evince):needs="X11" section="Apps/Viewers"\
+?package(evince):needs="X11" section="Applications/Viewers"\
  title="Evince" command="/usr/bin/evince"\
  hints="Documents,GNOME" icon="/usr/share/pixmaps/evince.xpm"

Modified: desktop/experimental/evince/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/evince/debian/rules?rev=13471&op=diff
==============================================================================
--- desktop/experimental/evince/debian/rules (original)
+++ desktop/experimental/evince/debian/rules Sat Nov 17 10:36:33 2007
@@ -1,9 +1,4 @@
 #!/usr/bin/make -f
-
-DEB_BUILDDIR := $(CURDIR)/debian/build/evince
-DEB_DESTDIR := $(CURDIR)/debian/tmp/
-DEB_BUILDDIR_evince-gtk := $(CURDIR)/debian/build/evince-gtk
-DEB_DESTDIR_evince-gtk := $(CURDIR)/debian/tmp-gtk
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/gnome.mk
@@ -11,6 +6,11 @@
 include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
 include /usr/share/gnome-pkg-tools/1/rules/check-dist.mk
 -include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
+
+DEB_BUILDDIR := $(CURDIR)/debian/build/evince
+DEB_DESTDIR := $(CURDIR)/debian/evince
+DEB_BUILDDIR_evince-gtk := $(CURDIR)/debian/build/evince-gtk
+DEB_DESTDIR_evince-gtk := $(CURDIR)/debian/evince-gtk
 
 DEB_CONFIGURE_EXTRA_FLAGS := --disable-scrollkeeper --enable-djvu \
 			--enable-dvi --with-print=gtk --enable-pixbuf \
@@ -39,10 +39,8 @@
 	make -C $(DEB_BUILDDIR_evince-gtk) install DESTDIR=$(DEB_DESTDIR_evince-gtk)
 
 binary-install/evince::
-	cp debian/evince.install.disabled debian/evince.install
-	dh_install -pevince --sourcedir=$(DEB_DESTDIR)
-	dh_installmime -pevince
-	rm debian/evince.install
+	rm -rf debian/evince/usr/share/gtk-doc
+	rm -f debian/evince/usr/lib/nautilus/*/*a
 	dh_install -pevince debian/evince.xpm /usr/share/pixmaps/
 
 binary-install/evince-dbg::
@@ -50,11 +48,8 @@
 	dh_link -pevince-dbg usr/share/doc/evince usr/share/doc/evince-dbg
 
 binary-install/evince-gtk::
-	cp debian/evince-gtk.install.disabled debian/evince-gtk.install
-	dh_install -pevince-gtk --sourcedir=$(DEB_DESTDIR_evince-gtk)
-	dh_installmime -pevince-gtk
-	rm debian/evince-gtk.install
-	dh_install -pevince-gtk debian/evince.xpm /usr/share/pixmaps/
+	rm -rf debian/evince-gtk/usr/share/gtk-doc
+	rm -rf debian/evince-gtk/usr/lib/nautilus
 
 binary-install/evince-gtk-dbg::
 	rm -rf debian/evince-gtk-dbg/usr/share/doc/evince-gtk-dbg
@@ -63,4 +58,3 @@
 binary-post-install/evince::
 	# check for missing MIME types
 	desktop-check-mime-types
-

More information about the pkg-gnome-commits mailing list