r45384 - in /desktop/unstable/evince/debian: changelog rules

[biebl at users.alioth.debian.org]

Author: biebl
Date: Wed Jun 24 21:05:15 2015
New Revision: 45384

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=45384
Log:
Remove leftover bits from the flavors build which are no longer necessary.

Modified:
    desktop/unstable/evince/debian/changelog
    desktop/unstable/evince/debian/rules

Modified: desktop/unstable/evince/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/evince/debian/changelog?rev=45384&op=diff
==============================================================================
--- desktop/unstable/evince/debian/changelog	[utf-8] (original)
+++ desktop/unstable/evince/debian/changelog	[utf-8] Wed Jun 24 21:05:15 2015
@@ -1,5 +1,6 @@
 evince (3.14.2-2) UNRELEASED; urgency=medium
 
+  [ Fabian Greffrath ]
   * Team upload.
   * Build only the full-flavored variant of Evince (Closes: #755071).
     + Disable building of the evince-gtk flavor.
@@ -10,6 +11,9 @@
       the infamous dependency on libnautilus*.
   * Append "-Wl,--as-needed -Wl,-z,defs" to LDFLAGS to avoid more
     unnecessary dependencies.
+
+  [ Michael Biebl ]
+  * Remove leftover bits from the flavors build which are no longer necessary.
 
  -- Fabian Greffrath <fabian at debian.org>  Tue, 19 May 2015 17:19:59 +0200
 

Modified: desktop/unstable/evince/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/evince/debian/rules?rev=45384&op=diff
==============================================================================
--- desktop/unstable/evince/debian/rules	[utf-8] (original)
+++ desktop/unstable/evince/debian/rules	[utf-8] Wed Jun 24 21:05:15 2015
@@ -1,10 +1,6 @@
 #!/usr/bin/make -f
 
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
-
-DEB_BUILDDIR = debian/build
-DEB_MAKE_DESTDIRSKEL = $(CURDIR)/debian/install/@FLAVOR@
-DEB_MAKE_FLAVORS = evince # evince-gtk
 
 include /usr/share/cdbs/1/rules/autoreconf.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
@@ -17,31 +13,18 @@
 export DEB_LDFLAGS_MAINT_APPEND = -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
 include /usr/share/dpkg/buildflags.mk
 
-DEB_DH_INSTALL_ARGS += --sourcedir=debian/install/evince
-DEB_DH_INSTALL_ARGS_evince-gtk += --sourcedir=debian/install/evince-gtk
+DEB_CONFIGURE_EXTRA_FLAGS += --enable-djvu \
+                             --enable-dvi \
+                             --enable-xps \
+                             --enable-comics \
+                             --enable-introspection \
+                             --enable-gtk-doc
 
-DEB_CONFIGURE_EXTRA_FLAGS = \
-			--enable-djvu \
-			--enable-dvi \
-			--enable-xps \
-			--enable-comics
-
-DEB_DH_MAKESHLIBS_ARGS += -X /usr/lib/nautilus/ -X /usr/lib/evince/ \
-	-V -- -c4
+DEB_DH_MAKESHLIBS_ARGS += -X /usr/lib/nautilus/ \
+                          -X /usr/lib/evince/ \
+                          -V -- -c4
 
 DEB_DH_SHLIBDEPS_ARGS += -X /usr/lib/nautilus/
-
-DEB_DH_STRIP_ARGS_evince-gtk =
-
-DEB_CONFIGURE_FLAGS_evince = \
-			--enable-introspection \
-			--enable-gtk-doc
-
-DEB_CONFIGURE_FLAGS_evince-gtk = \
-			--without-keyring \
-			--disable-nautilus \
-			--disable-introspection \
-			--disable-gtk-doc
 
 install/evince-common::
 	dh_install -p${cdbs_curpkg} --ignore=debian/${cdbs_curpkg}.install \