r47177 - in /packages/ipe/trunk/debian: changelog control patches/build-nostrip.patch patches/fPIC.patch patches/fix-moc.patch patches/series rules

[smr at users.alioth.debian.org]

Author: smr
Date: Sat Nov 21 16:05:48 2015
New Revision: 47177

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=47177
Log:
Updates for Ipe 7.1.10.

Added:
    packages/ipe/trunk/debian/patches/fix-moc.patch
Removed:
    packages/ipe/trunk/debian/patches/fPIC.patch
Modified:
    packages/ipe/trunk/debian/changelog
    packages/ipe/trunk/debian/control
    packages/ipe/trunk/debian/patches/build-nostrip.patch
    packages/ipe/trunk/debian/patches/series
    packages/ipe/trunk/debian/rules

Modified: packages/ipe/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/ipe/trunk/debian/changelog?rev=47177&op=diff
==============================================================================
--- packages/ipe/trunk/debian/changelog	(original)
+++ packages/ipe/trunk/debian/changelog	Sat Nov 21 16:05:48 2015
@@ -1,3 +1,12 @@
+ipe (7.1.10-1) unstable; urgency=medium
+
+  * New upstream.
+  * control: adjust build-dependencies.  Now builds with Qt5.
+  * patches/fPIC.patch: Remove.  Applied upstream.
+  * patches/fix-moc.patch: New.  Temporary workaround for #805726.
+
+ -- Steve M. Robbins <smr at debian.org>  Sat, 21 Nov 2015 07:51:36 -0600
+
 ipe (7.1.8-1) unstable; urgency=medium
 
   * New upstream.

Modified: packages/ipe/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/ipe/trunk/debian/control?rev=47177&op=diff
==============================================================================
--- packages/ipe/trunk/debian/control	(original)
+++ packages/ipe/trunk/debian/control	Sat Nov 21 16:05:48 2015
@@ -8,12 +8,13 @@
 Uploaders: Steve M. Robbins <smr at debian.org>
 Build-Depends: sharutils,
 	       debhelper (>= 9),
-	       libqt4-dev,
-	       qt4-dev-tools,
+	       zlib1g-dev,
+	       qtbase5-dev,
+	       qtbase5-dev-tools,
 	       libfreetype6-dev (>= 2.3.9),
-	       zlib1g-dev,
 	       libcairo2-dev,
-	       libjpeg-dev,
+	       libjpeg8-dev,
+	       libpng12-dev,
 	       liblua5.2-dev,
 	       gsfonts
 Build-Conflicts: libipe1-dev
@@ -48,7 +49,7 @@
  Package texlive-latex-recommended enables unicode text entry (for
  accented characters).
 
-Package: libipe7.1.8
+Package: libipe7.1.10
 Architecture: any
 Section: libs
 Depends: ${misc:Depends}, ${shlibs:Depends}
@@ -62,7 +63,7 @@
 Package: libipe-dev
 Architecture: any
 Section: libdevel
-Depends: ${misc:Depends}, libipe7.1.8 (= ${binary:Version})
+Depends: ${misc:Depends}, libipe7.1.10 (= ${binary:Version})
 Conflicts: libipe1-dev
 Replaces: libipe1-dev
 Description: Ipe library used by ipelets (developer files)

Modified: packages/ipe/trunk/debian/patches/build-nostrip.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/ipe/trunk/debian/patches/build-nostrip.patch?rev=47177&op=diff
==============================================================================
--- packages/ipe/trunk/debian/patches/build-nostrip.patch	(original)
+++ packages/ipe/trunk/debian/patches/build-nostrip.patch	Sat Nov 21 16:05:48 2015
@@ -1,6 +1,6 @@
---- ipe-7.1.8.orig/src/common.mak
-+++ ipe-7.1.8/src/common.mak
-@@ -174,7 +174,7 @@
+--- ipe-7.1.10.orig/src/common.mak
++++ ipe-7.1.10/src/common.mak
+@@ -207,7 +207,7 @@
  # stripping is faulty on Mac?
  INSTALL_PROGRAMS = install -m 0755
  else
@@ -8,4 +8,4 @@
 +INSTALL_PROGRAMS = install -m 0755
  endif
  
- MAKE_BINDIR = mkdir -p $(BUILDDIR)/bin
+ MAKE_BINDIR = mkdir -p $(buildbin)

Added: packages/ipe/trunk/debian/patches/fix-moc.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/ipe/trunk/debian/patches/fix-moc.patch?rev=47177&op=file
==============================================================================
--- packages/ipe/trunk/debian/patches/fix-moc.patch	(added)
+++ packages/ipe/trunk/debian/patches/fix-moc.patch	Sat Nov 21 16:05:48 2015
@@ -0,0 +1,15 @@
+Temporary workaround for Bug #805726.
+Hope the buildd machine does not have two architectures installed!
+
+
+--- ipe-7.1.10.orig/src/config.mak
++++ ipe-7.1.10/src/config.mak
+@@ -58,7 +58,7 @@
+ #
+ # MOC is the Qt meta-object compiler.
+ # Make sure it's the right one for Qt5.
+-MOC	      ?= moc
++MOC	      ?= /usr/lib/*/qt5/bin/moc
+ #
+ # --------------------------------------------------------------------
+ #

Modified: packages/ipe/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/ipe/trunk/debian/patches/series?rev=47177&op=diff
==============================================================================
--- packages/ipe/trunk/debian/patches/series	(original)
+++ packages/ipe/trunk/debian/patches/series	Sat Nov 21 16:05:48 2015
@@ -1,3 +1,3 @@
 default-editor.patch
 build-nostrip.patch
-fPIC.patch
+fix-moc.patch

Modified: packages/ipe/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/ipe/trunk/debian/rules?rev=47177&op=diff
==============================================================================
--- packages/ipe/trunk/debian/rules	(original)
+++ packages/ipe/trunk/debian/rules	Sat Nov 21 16:05:48 2015
@@ -3,7 +3,7 @@
 export IPEPREFIX=/usr
 export INSTALL_ROOT=$(shell pwd)/debian/tmp
 
-IPEVER = 7.1.8
+IPEVER = 7.1.10
 
 %:
 	dh $@ --sourcedirectory=src