Hi, sorry for the delay...
I am not able to apply this - it fails on line 16 of control, which in
master has libtirpsc on it, not libjpeg...
Applying: Fix building in pbuilder/pdebuild
error: patch failed: cde/debian/control:16
error: cde/debian/control: patch does not apply
Patch failed at 0001 Fix building in pbuilder/pdebuild
hint: Use 'git am --show-current-patch' to see the failed patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
-jon
On 3/21/21 4:45 PM, Anthony Perkins via cdesktopenv-devel wrote:
Hi,
I've included a patch to fix building in pbuilder or pdebuild on Debian and
Ubuntu, and bumped the debian/control version number while I was there.
I've also included the patch as an attachment, in case my mail client breaks
the inline version.
All the best,
Anthony
---
cde/debian/changelog | 2 +-
cde/debian/control | 4 ++--
cde/debian/rules | 6 +++---
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/cde/debian/changelog b/cde/debian/changelog
index 8d6433b9..bbcadedb 100644
--- a/cde/debian/changelog
+++ b/cde/debian/changelog
@@ -1,4 +1,4 @@
-cde-desktop (2.3.0-1) UNRELEASED; urgency=medium
+cde-desktop (2.3.2-1) UNRELEASED; urgency=medium
* Initial release (Closes: #689098)
diff --git a/cde/debian/control b/cde/debian/control
index 54b5afdc..ad2c6843 100644
--- a/cde/debian/control
+++ b/cde/debian/control
@@ -16,7 +16,7 @@ Build-Depends: debhelper (>= 10),
libxss-dev,
libtirpc-dev,
x11-xserver-utils,
- libjpeg62-dev,
+ libjpeg62-dev | libjpeg62-turbo-dev,
libfreetype6-dev,
libssl-dev,
tcl-dev,
@@ -45,7 +45,7 @@ Depends: libxt6,
libxaw7,
libx11-6,
libxss1,
- libtirpc1,
+ libtirpc3 | libtirpc1,
x11-xserver-utils,
libjpeg62,
libfreetype6,
diff --git a/cde/debian/rules b/cde/debian/rules
index bb4b22fd..a0747180 100755
--- a/cde/debian/rules
+++ b/cde/debian/rules
@@ -6,8 +6,8 @@
#make clean cleans everything except the doc directory for some reason
override_dh_auto_clean:
- $(MAKE) clean
- $(MAKE) clean.doc
+ test ! -f xmakefile || $(MAKE) clean
+ test ! -f xmakefile || $(MAKE) clean.doc
#make World needs to be called, not just make
override_dh_auto_build:
@@ -15,5 +15,5 @@ override_dh_auto_build:
#make install is broken, so we use the install script instead
override_dh_auto_install:
- sudo ./admin/IntegTools/dbTools/installCDE -s . -destDir \
+ ./admin/IntegTools/dbTools/installCDE -s . -destdir \
./debian/cde-desktop
_______________________________________________
cdesktopenv-devel mailing list
cdesktopenv-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/cdesktopenv-devel
--
Jon Trulson
"Entropy. It isn't what it used to be."
-- Sheldon
_______________________________________________
cdesktopenv-devel mailing list
cdesktopenv-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/cdesktopenv-devel
