This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project wmaker-crm.git.
The branch, next has been updated
via b295a2029ef102e53a96bc0c5d42d36577e73974 (commit)
via 67da339ccb116808dc9c2a0b527afd702d7996b5 (commit)
from 945f4d238926c607c6917cc043f87099d23a3987 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://repo.or.cz/w/wmaker-crm.git/commit/b295a2029ef102e53a96bc0c5d42d36577e73974
commit b295a2029ef102e53a96bc0c5d42d36577e73974
Author: Doug Torrance <dtorra...@monmouthcollege.edu>
Date: Tue May 26 17:13:14 2015 -0500
debian: Import version 0.95.6-1.1.
diff --git a/debian/changelog b/debian/changelog
index feaa46d..308bbc6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+wmaker (0.95.6-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * debian/control:
+ - Add Breaks/Replaces for libwraster3-dev; remove Provides for
+ libwraster-dev (Closes: #784711).
+
+ -- Doug Torrance <dtorra...@monmouthcollege.edu> Thu, 21 May 2015 13:34:40
-0500
+
wmaker (0.95.6-1) unstable; urgency=medium
* New upstream version 0.95.6. [Closes: #148856]
diff --git a/debian/control b/debian/control
index 4580a3e..ce41a77 100644
--- a/debian/control
+++ b/debian/control
@@ -45,7 +45,8 @@ Section: libdevel
Depends: libwraster5 (= ${binary:Version}), libc6-dev, libx11-dev,
libxext-dev, libxpm-dev, libjpeg-dev, libpng-dev, libgif-dev,
libtiff5-dev, ${misc:Depends}
-Provides: libwraster-dev
+Breaks: libwraster3-dev
+Replaces: libwraster3-dev
Description: Static libraries and headers of Window Maker rasterizer
This library is used to manipulate images and convert them to
a format that can be displayed through the X window system.
http://repo.or.cz/w/wmaker-crm.git/commit/67da339ccb116808dc9c2a0b527afd702d7996b5
commit 67da339ccb116808dc9c2a0b527afd702d7996b5
Author: Doug Torrance <dtorra...@monmouthcollege.edu>
Date: Tue May 26 17:13:13 2015 -0500
debian: Import version 0.95.6-1.
diff --git a/debian/changelog b/debian/changelog
index b0bea86..feaa46d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,55 @@
+wmaker (0.95.6-1) unstable; urgency=medium
+
+ * New upstream version 0.95.6. [Closes: #148856]
+ * Bumped to standard version 3.9.6. No changes.
+ * Removed patch 55_typo.diff because is now in upstream.
+ * Patch 56_ungif_problem.diff updated:
+ * New name: 55_ungif_problem.diff
+ * Now udpates the file m4/wm_imgfmt_check.m4, because upstream moved the
+ ungif code from configure.ac to this m4 file.
+ * Removed Encoding in debianfiles/wmaker-common.desktop.
+ * The Encoding key is now deprecated by the FreeDesktop.
+ * Moved library libwings2 to libwings3.
+ * Changed in debian/control.
+ * Moved libwings2.changelog-upstream to libwings3.changelog-upstream.
+ * Moved libwings2.install to libwings3.install.
+ * Moved libwings2.symbols to libwings3.symbols.
+ * Moved libwraster3-dev to libwraster-dev.
+ * Changed in debian/control.
+ * Moved libwraster3-dev.changelog-upstream to
+ libwraster-dev.changelog-upstream.
+ * Moved libwraster3-dev.install to libwraster-dev.install.
+ * Moved libwraster3-dev.docs to libwraster-dev.docs.
+ * Moved libwraster3-dev.manpages to libwraster-dev.manpages.
+ * Updated symbols.
+ * Moved libwraster3 to libwraster5.
+ * Changed in debian/control.
+ * Moved libwraster3.changelog-upstream to libwraster5.changelog-upstream.
+ * Moved libwraster3.docs to libwraster5.docs.
+ * Moved libwraster3.install to libwraster5.install.
+ * Moved libwraster3.symbols to libwraster5.symbols.
+ * Updated symbols.
+ * Moved libwutil3 to libwutil5.
+ * Changed in debian/control.
+ * Moved libwutil3.changelog-upstream to libwutil5.changelog-upstream.
+ * Moved libwutil3.install to libwutil5.install.
+ * Moved libwutil3.symbols to libwutil5.symbols.
+ * Updated symbols.
+ * Removed WindowMaker/Icons/sound.tiff in debian/copyright.
+ * Avoid lintian warning.
+ * Added Keywords in debianfiles/wmaker-common.desktop.
+ * Avoid lintian warning.
+
+ -- Rodolfo García Peñas (kix) <k...@debian.org> Thu, 09 Oct 2014 05:59:36
+0200
+
+wmaker (0.95.5-2) unstable; urgency=low
+
+ * New patch debian/patches/56_ungif_problem.diff. [Closes: #733353]
+ This patch removes the link against -lungif.
+ * Bumped to standard version 3.9.5. No changes.
+
+ -- Rodolfo García Peñas (kix) <k...@debian.org> Tue, 31 Dec 2013 00:20:43
+0100
+
wmaker (0.95.5-1) unstable; urgency=low
* New upstream version 0.95.5. [Closes: #723840]
diff --git a/debian/control b/debian/control
index ecdf31c..4580a3e 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: wmaker
Section: x11
Priority: optional
Maintainer: Rodolfo García Peñas (kix) <k...@debian.org>
-Standards-Version: 3.9.4
+Standards-Version: 3.9.6
Build-Depends: debhelper (>= 9), automake (>= 1:1.11), gettext,
libfontconfig1-dev, libjpeg-dev, libpng-dev, libsm-dev, libtiff5-dev,
libtool, libgif-dev, libx11-dev, libxext-dev, libxft-dev, libxinerama-dev,
@@ -39,10 +39,10 @@ Description: Window Maker - Architecture independent files
.
This package contains the architecture independent files.
-Package: libwraster3-dev
+Package: libwraster-dev
Architecture: any
Section: libdevel
-Depends: libwraster3 (= ${binary:Version}), libc6-dev, libx11-dev,
+Depends: libwraster5 (= ${binary:Version}), libc6-dev, libx11-dev,
libxext-dev, libxpm-dev, libjpeg-dev, libpng-dev, libgif-dev,
libtiff5-dev, ${misc:Depends}
Provides: libwraster-dev
@@ -54,7 +54,7 @@ Description: Static libraries and headers of Window Maker
rasterizer
Contains libwraster and header files, for manipulating and
rasterizing images.
-Package: libwraster3
+Package: libwraster5
Architecture: any
Section: libs
Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -66,9 +66,9 @@ Description: Shared libraries of Window Maker rasterizer
Package: libwings-dev
Architecture: any
Section: libdevel
-Depends: libc6-dev, libx11-dev, libxext-dev, libwraster3-dev, libxft-dev,
- libfontconfig1-dev, libwutil3 (= ${binary:Version}),
- libwings2 (= ${binary:Version}), ${misc:Depends}
+Depends: libc6-dev, libx11-dev, libxext-dev, libwraster-dev, libxft-dev,
+ libfontconfig1-dev, libwutil5 (= ${binary:Version}),
+ libwings3 (= ${binary:Version}), ${misc:Depends}
Description: Window Maker's own widget set
WINGs Is Not GNUstep (WINGs) is a small widget set with the NeXTSTEP
look and feel. Its API is inspired in OpenSTEP and its
@@ -77,7 +77,7 @@ Description: Window Maker's own widget set
or hacking something like rxvt. It is used for basic widgets in
the WindowMaker window manager.
-Package: libwutil3
+Package: libwutil5
Architecture: any
Section: libs
Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -91,7 +91,7 @@ Description: Window Maker's own widget set - utility library
.
This package contains the libWUtils runtime library.
-Package: libwings2
+Package: libwings3
Architecture: any
Section: libs
Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -109,8 +109,8 @@ Package: wmaker-dbg
Architecture: any
Section: debug
Priority: extra
-Depends: libwraster3 (= ${binary:Version}) | libwings2 (= ${binary:Version}) |
- libwutil3 (= ${binary:Version}) | wmaker (= ${binary:Version}),
+Depends: libwraster5 (= ${binary:Version}) | libwings3 (= ${binary:Version}) |
+ libwutil5 (= ${binary:Version}) | wmaker (= ${binary:Version}),
${misc:Depends}
Description: Debugging symbols for WindowMaker packages
Written by Alfredo Kojima almost from scratch, resembles the NeXTStep look
diff --git a/debian/copyright b/debian/copyright
index 4c500d2..c442083 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -83,10 +83,9 @@ Files: WindowMaker/Icons/BitchX.tiff
WindowMaker/Icons/defaultAppIcon.tiff
WindowMaker/Icons/mixer.tiff WindowMaker/Icons/notepad.tiff
WindowMaker/Icons/pdf.tiff WindowMaker/Icons/ps.tiff
WindowMaker/Icons/real.tiff WindowMaker/Icons/sgiterm.tiff
- WindowMaker/Icons/sound.tiff WindowMaker/Icons/staroffice2.tiff
- WindowMaker/Icons/timer.tiff WindowMaker/Icons/wilber.tiff
- WindowMaker/Icons/write.tiff WindowMaker/Icons/xdvi.tiff
- WindowMaker/Icons/xv.tiff
+ WindowMaker/Icons/staroffice2.tiff WindowMaker/Icons/timer.tiff
+ WindowMaker/Icons/wilber.tiff WindowMaker/Icons/write.tiff
+ WindowMaker/Icons/xdvi.tiff WindowMaker/Icons/xv.tiff
Copyright: 1997, Marco van Hylckama Vlieg <ma...@windowmaker.info>
License: attribution
They may be distributed freely and/or modified as long as the original
@@ -101,6 +100,7 @@ Files: WindowMaker/Icons/GNUstepGlow.tiff
WindowMaker/Icons/GNUstepGlow.xpm
WindowMaker/Icons/Jabber.png WindowMaker/Icons/Mozilla.png
WindowMaker/Icons/Pen.png WindowMaker/Icons/Pencil.png
WindowMaker/Icons/Shell.png WindowMaker/Icons/Speaker.png
+ WindowMaker/Icons/XChat.png
WPrefs.app/tiff/msty1.tiff WPrefs.app/tiff/msty2.tiff
WPrefs.app/tiff/msty3.tiff
WPrefs.app/xpm/msty1.xpm WPrefs.app/xpm/msty2.xpm
WPrefs.app/xpm/msty3.xpm
WPrefs.app/WPrefs.tiff WPrefs.app/WPrefs.xpm WPrefs.app/tiff/tdel.tiff
@@ -109,7 +109,6 @@ Files: WindowMaker/Icons/GNUstepGlow.tiff
WindowMaker/Icons/GNUstepGlow.xpm
WPrefs.app/xpm/tnew.xpm WINGs/Resources/defaultIcon.tiff
WINGs/Resources/Images.tiff WINGs/Resources/Images.xpm
WINGs/Resources/defaultIcon.xpm WINGs/Resources/Images.xcf
- WindowMaker/Icons/XChat.png
Copyright: 2000, Banlu Kemiyatorn
License: WTFPL-1
do What The Fuck you want to Public License
diff --git a/debian/debianfiles/wmaker-common.desktop
b/debian/debianfiles/wmaker-common.desktop
index 6f88935..3d6c633 100644
--- a/debian/debianfiles/wmaker-common.desktop
+++ b/debian/debianfiles/wmaker-common.desktop
@@ -5,4 +5,5 @@ Comment=This session logs you into Window Maker
Exec=/usr/bin/wmaker
# no icon yet, only the top three are currently used
Icon=
+Keywords=Window Manager
Type=Application
diff --git a/debian/libwutil3.changelog-upstream
b/debian/libwings3.changelog-upstream
similarity index 100%
rename from debian/libwutil3.changelog-upstream
rename to debian/libwings3.changelog-upstream
diff --git a/debian/libwings2.install b/debian/libwings3.install
similarity index 100%
rename from debian/libwings2.install
rename to debian/libwings3.install
diff --git a/debian/libwings2.symbols b/debian/libwings3.symbols
similarity index 98%
rename from debian/libwings2.symbols
rename to debian/libwings3.symbols
index 91155ff..291a94c 100644
--- a/debian/libwings2.symbols
+++ b/debian/libwings3.symbols
@@ -1,4 +1,4 @@
-libWINGs.so.2 libwings2 #MINVER#
+libWINGs.so.3 libwings3 #MINVER#
WINGsConfiguration@Base 0.95.0
WMAddBoxSubview@Base 0.95.0
WMAddBoxSubviewAtEnd@Base 0.95.0
@@ -58,6 +58,7 @@ libWINGs.so.2 libwings2 #MINVER#
WMCreateRGBAColor@Base 0.95.0
WMCreateRGBColor@Base 0.95.0
WMCreateRuler@Base 0.95.0
+ WMCreateScaledBlendedPixmapFromFile@Base 0.95.6
WMCreateScreen@Base 0.95.0
WMCreateScreenWithRContext@Base 0.95.0
WMCreateScrollView@Base 0.95.0
@@ -358,6 +359,7 @@ libWINGs.so.2 libwings2 #MINVER#
WMSetFontPanelFont@Base 0.95.0
WMSetFrameRelief@Base 0.95.0
WMSetFrameTitle@Base 0.95.0
+ WMSetFrameTitleColor@Base 0.95.6
WMSetFrameTitlePosition@Base 0.95.0
WMSetLabelFont@Base 0.95.0
WMSetLabelImage@Base 0.95.0
@@ -579,7 +581,7 @@ libWINGs.so.2 libwings2 #MINVER#
W_setconf_doubleClickDelay@Base 0.95.5
_BrowserViewDelegate@Base 0.95.0
_ColorWellViewDelegate@Base 0.95.0
- _ListViewDelegate@Base 0.95.0
+#MISSING: 0.95.6-1# _ListViewDelegate@Base 0.95.0
_ProgressIndicatorDelegate@Base 0.95.0
_RulerViewDelegate@Base 0.95.0
_ScrollViewViewDelegate@Base 0.95.0
@@ -600,7 +602,9 @@ libWINGs.so.2 libwings2 #MINVER#
#MISSING: 0.95.5-1# requestDropData@Base 0.95.0
#MISSING: 0.95.5-1# requestDropDataInSelection@Base 0.95.0
#MISSING: 0.95.5-1# requestHandler@Base 0.95.0
+ rgbCharToInt@Base 0.95.6
rgbColors@Base 0.95.0
+ rgbIntToChar@Base 0.95.6
#MISSING: 0.95.5-1# sourceOperationList@Base 0.95.0
#MISSING: 0.95.5-1# storeRequiredTypeList@Base 0.95.0
#MISSING: 0.95.5-1# ulongToRColor@Base 0.95.0
diff --git a/debian/libwraster3.changelog-upstream
b/debian/libwraster-dev.changelog-upstream
similarity index 100%
rename from debian/libwraster3.changelog-upstream
rename to debian/libwraster-dev.changelog-upstream
diff --git a/debian/libwraster3-dev.docs b/debian/libwraster-dev.docs
similarity index 100%
rename from debian/libwraster3-dev.docs
rename to debian/libwraster-dev.docs
diff --git a/debian/libwraster3-dev.install b/debian/libwraster-dev.install
similarity index 100%
rename from debian/libwraster3-dev.install
rename to debian/libwraster-dev.install
diff --git a/debian/libwraster3-dev.manpages b/debian/libwraster-dev.manpages
similarity index 100%
rename from debian/libwraster3-dev.manpages
rename to debian/libwraster-dev.manpages
diff --git a/debian/libwraster3-dev.changelog-upstream
b/debian/libwraster5.changelog-upstream
similarity index 100%
rename from debian/libwraster3-dev.changelog-upstream
rename to debian/libwraster5.changelog-upstream
diff --git a/debian/libwraster3.docs b/debian/libwraster5.docs
similarity index 100%
rename from debian/libwraster3.docs
rename to debian/libwraster5.docs
diff --git a/debian/libwraster3.install b/debian/libwraster5.install
similarity index 100%
rename from debian/libwraster3.install
rename to debian/libwraster5.install
diff --git a/debian/libwraster3.symbols b/debian/libwraster5.symbols
similarity index 91%
rename from debian/libwraster3.symbols
rename to debian/libwraster5.symbols
index 679489c..22bd776 100644
--- a/debian/libwraster3.symbols
+++ b/debian/libwraster5.symbols
@@ -1,4 +1,4 @@
-libwraster.so.3 libwraster3 #MINVER#
+libwraster.so.5 libwraster5 #MINVER#
LIBWRASTER3@LIBWRASTER3 0.95.0
RBevelImage@LIBWRASTER3 0.95.0
RBlurImage@LIBWRASTER3 0.95.0
@@ -17,12 +17,14 @@ libwraster.so.3 libwraster3 #MINVER#
RCreateImageFromDrawable@LIBWRASTER3 0.95.0
RCreateImageFromXImage@LIBWRASTER3 0.95.0
RCreateXImage@LIBWRASTER3 0.95.0
+ RDestroyContext@LIBWRASTER3 0.95.6
RDestroyXImage@LIBWRASTER3 0.95.0
RDrawLine@LIBWRASTER3 0.95.0
RDrawLines@LIBWRASTER3 0.95.0
RDrawSegments@LIBWRASTER3 0.95.0
RErrorCode@LIBWRASTER3 0.95.0
RFillImage@LIBWRASTER3 0.95.0
+ RFlipImage@LIBWRASTER3 0.95.6
RGetClosestXColor@LIBWRASTER3 0.95.0
RGetImageFileFormat@LIBWRASTER3 0.95.0
RGetImageFromXPMData@LIBWRASTER3 0.95.0
@@ -39,6 +41,7 @@ libwraster.so.3 libwraster3 #MINVER#
ROperateLines@LIBWRASTER3 0.95.0
ROperatePixel@LIBWRASTER3 0.95.0
ROperatePixels@LIBWRASTER3 0.95.0
+ ROperateRectangle@LIBWRASTER3 0.95.6
ROperateSegments@LIBWRASTER3 0.95.0
RPutPixel@LIBWRASTER3 0.95.0
RPutPixels@LIBWRASTER3 0.95.0
@@ -52,5 +55,6 @@ libwraster.so.3 libwraster3 #MINVER#
RRotateImage@LIBWRASTER3 0.95.0
RSaveImage@LIBWRASTER3 0.95.0
RScaleImage@LIBWRASTER3 0.95.0
+ RShutdown@LIBWRASTER3 0.95.6
RSmoothScaleImage@LIBWRASTER3 0.95.0
RSupportedFileFormats@LIBWRASTER3 0.95.0
diff --git a/debian/libwings2.changelog-upstream
b/debian/libwutil5.changelog-upstream
similarity index 100%
rename from debian/libwings2.changelog-upstream
rename to debian/libwutil5.changelog-upstream
diff --git a/debian/libwutil3.install b/debian/libwutil5.install
similarity index 100%
rename from debian/libwutil3.install
rename to debian/libwutil5.install
diff --git a/debian/libwutil3.symbols b/debian/libwutil5.symbols
similarity index 97%
rename from debian/libwutil3.symbols
rename to debian/libwutil5.symbols
index 0023f1b..631090e 100644
--- a/debian/libwutil3.symbols
+++ b/debian/libwutil5.symbols
@@ -1,4 +1,4 @@
-libWUtil.so.3 libwutil3 #MINVER#
+libWUtil.so.5 libwutil5 #MINVER#
WHandleEvents@Base 0.95.5
WMAddIdleHandler@Base 0.95.5
WMAddInputHandler@Base 0.95.5
@@ -144,6 +144,7 @@ libWUtil.so.3 libwutil3 #MINVER#
WMPutInPLDictionary@Base 0.95.5
WMReadPropListFromFile@Base 0.95.5
WMReadPropListFromPipe@Base 0.95.5
+ WMReleaseApplication@Base 0.95.6
WMReleaseData@Base 0.95.5
WMReleaseNotification@Base 0.95.5
WMReleasePropList@Base 0.95.5
@@ -201,6 +202,7 @@ libWUtil.so.3 libwutil3 #MINVER#
W_FlushIdleNotificationQueue@Base 0.95.5
W_HandleInputEvents@Base 0.95.5
W_InitNotificationCenter@Base 0.95.5
+ W_ReleaseNotificationCenter@Base 0.95.6
_WINGS_progname@Base 0.95.5
__wmessage@Base 0.95.5
isnamechr@Base 0.95.5
@@ -210,6 +212,8 @@ libWUtil.so.3 libwutil3 #MINVER#
menu_parser_free_macros@Base 0.95.5
menu_parser_register_preset_macros@Base 0.95.5
menu_parser_skip_spaces_and_comments@Base 0.95.5
+ w_save_defaults_changes@Base 0.95.6
+ w_syslog_close@Base 0.95.6
wcopy_file@Base 0.95.5
wdefaultspathfordomain@Base 0.95.5
wexpandpath@Base 0.95.5
@@ -241,3 +245,4 @@ libWUtil.so.3 libwutil3 #MINVER#
wtrimspace@Base 0.95.5
wusergnusteppath@Base 0.95.5
wusleep@Base 0.95.5
+ wutil_shutdown@Base 0.95.6
diff --git a/debian/nightly_build.sh b/debian/nightly_build.sh
deleted file mode 100755
index 5a79957..0000000
--- a/debian/nightly_build.sh
+++ /dev/null
@@ -1,109 +0,0 @@
-#!/bin/sh
-
-CHLOGBKP="/tmp/$$-chlog"
-#BASEVERSION="0.94.0"
-BASEVERSION="`head -1 debian/changelog | cut -d\( -f2 | cut -d\- -f1`"
-REPOVERSION="git-`date +%Y%m%d-%H%M`"
-
-CHANGELOG="Automatic build from the GIT on `date`"
-BUILDLOG="${HOME}/log/wmaker-testing-nightly.log"
-
-STATUSCMD="git log -1 --pretty=oneline"
-PULLCMD="git pull --rebase"
-if [ -n "${WMAKER_DISTRO}" ]; then
- case ${WMAKER_DISTRO} in
- unstable)
- BUILDLOG="${HOME}/log/wmaker-unstable-nightly.log"
- ;;
- esac
-fi
-
-FORCE="0"
-
-if [ $# -gt 0 ]; then
- case $1 in
- -f|--force)
- FORCE="1"
- ;;
- *)
- echo "Usage $0 [-f|--force]"
- exit 0
- ;;
- esac
-fi
-
-cleanup() {
- test -f ${CHLOGBKP} && mv ${CHLOGBKP} debian/changelog
-}
-
-errorExit() {
- echo "$@" 1>&2
- cleanup
- exit 2
-}
-
-doPull() {
- RC="1"
- LATEST="`$STATUSCMD`"
- dh_clean
- git reset --hard HEAD
- git clean -f
- $PULLCMD >>$BUILDLOG 2>&1 || errorExit "Error pulling from the repo"
- CURRENT="`$STATUSCMD`"
- if [ "$FORCE" = "1" -o "$LATEST" != "$CURRENT" ]; then
- echo "last revision: $LATEST" >>$BUILDLOG
- echo "new revision: $CURRENT" >>$BUILDLOG
- echo "FORCE: $FORCE" >>$BUILDLOG
- RC="0"
- else
- echo "No changes to build, and FORCE not given." >>$BUILDLOG
- fi
- return $RC
-}
-
-doEnv() {
- for var in `env | grep GNUSTEP | sed "s/=.*//"`; do
- unset $var
- done
-}
-
-doChlog() {
- cp debian/changelog ${CHLOGBKP}
- debchange -v ${BASEVERSION}-${REPOVERSION}-1 "${CHANGELOG}" || return 1
-}
-
-doTarball() {
- echo tar -czf ../wmaker_${BASEVERSION}-${REPOVERSION}.orig.tar.gz .
- tar -czf ../wmaker_${BASEVERSION}-${REPOVERSION}.orig.tar.gz .
-}
-
-doBuild() {
- ARGS=""
- if [ -n "${WM_GPG_KEY}" ]; then
- ARGS="-k${WM_GPG_KEY}"
- fi
- dpkg-buildpackage -rfakeroot $ARGS >>${BUILDLOG} 2>&1
-}
-
-install -d `dirname $BUILDLOG`
->$BUILDLOG
-trap 'cleanup; exit 2' 2
-trap 'cleanup; exit 2' 9
-trap 'cleanup; exit 2' 15
-
-test -d debian || errorExit "This script must be called from the toplevel
source dir, ./debian must exist."
-
-#git status | grep modified: | awk '{ print $3 }' | xargs git checkout
-git checkout -f >/dev/null
-RC=0
-if doPull ; then
- doEnv
- doChlog || errorExit "Error adding new changelog entry."
- doTarball || errorExit "Error building source tarball."
- doBuild || errorExit "Error during build of .deb package."
-else
- RC=1
-fi
-
-cleanup
-exit $RC
diff --git a/debian/patches/50_def_config_paths.diff
b/debian/patches/50_def_config_paths.diff
index 10fa140..3c6584f 100644
--- a/debian/patches/50_def_config_paths.diff
+++ b/debian/patches/50_def_config_paths.diff
@@ -1,9 +1,11 @@
Description: This patch changes the default config paths
Author: Andreas Metzler <ametz...@debian.org>
Last-Update: 2010-08-07
---- a/src/wconfig.h.in
-+++ b/src/wconfig.h.in
-@@ -125,7 +125,7 @@
+Index: WindowMaker-0.95.6/src/wconfig.h.in
+===================================================================
+--- WindowMaker-0.95.6.orig/src/wconfig.h.in
++++ WindowMaker-0.95.6/src/wconfig.h.in
+@@ -122,7 +122,7 @@
*/
/* list of paths to look for the config files, searched in order of
appearance */
diff --git a/debian/patches/51_wmaker_man.diff
b/debian/patches/51_wmaker_man.diff
index 0e17627..1d4a956 100644
--- a/debian/patches/51_wmaker_man.diff
+++ b/debian/patches/51_wmaker_man.diff
@@ -1,9 +1,11 @@
Description: This patch includes the debian paths
Author: Rodolfo García Peñas (kix) <k...@kix.es>
Last-Update: 2011-08-16
---- a/doc/wmaker.1x
-+++ b/doc/wmaker.1x
-@@ -9,6 +9,9 @@
+Index: WindowMaker-0.95.6/doc/wmaker.1x
+===================================================================
+--- WindowMaker-0.95.6.orig/doc/wmaker.1x
++++ WindowMaker-0.95.6/doc/wmaker.1x
+@@ -9,6 +9,9 @@ wmaker \- X11 window manager with a NEXT
Window Maker is a X11 window manager with a NEXTSTEP look. It tries to
emulate NeXT's look as much as possible, but it deviates from it as
necessary.
@@ -13,7 +15,7 @@ Last-Update: 2011-08-16
.SH "OPTIONS"
.TP
.B \-display host:display.screen
-@@ -78,7 +81,7 @@
+@@ -78,7 +81,7 @@ Attribute Editor (right drag the applica
Attributes) instead of modifying this file directly. There are just a
few options not available using the Attributes Editor.
.TP
@@ -22,7 +24,7 @@ Last-Update: 2011-08-16
All the above-mentioned files are READ from here if not found except
for WMState, which is COPIED from here. No matter where they are read
from, if it's necessary to write configuration changes back into this
-@@ -106,6 +109,9 @@
+@@ -106,6 +109,9 @@ and here, in that order. Unless, the ind
.B ~/GNUstep/Library/WindowMaker/Pixmaps/
Window Maker looks for \fBpixmaps\fP here
.TP
diff --git a/debian/patches/53_Debian_WMState.diff
b/debian/patches/53_Debian_WMState.diff
index 5679b39..03dc418 100644
--- a/debian/patches/53_Debian_WMState.diff
+++ b/debian/patches/53_Debian_WMState.diff
@@ -1,8 +1,10 @@
Description: XTerm and WMPrefs debian configuration. Based on Marcelo E.
Magallon <mmaga...@debian.org> diff patch.
Author: Rodolfo García Peñas (kix) <k...@kix.es>
Last-Update: 2012-01-09
---- a/WindowMaker/Defaults/WMState.in
-+++ b/WindowMaker/Defaults/WMState.in
+Index: WindowMaker-0.95.6/WindowMaker/Defaults/WMState.in
+===================================================================
+--- WindowMaker-0.95.6.orig/WindowMaker/Defaults/WMState.in
++++ WindowMaker-0.95.6/WindowMaker/Defaults/WMState.in
@@ -2,7 +2,7 @@
Dock = {
Applications = (
diff --git a/debian/patches/55_typo.diff b/debian/patches/55_typo.diff
deleted file mode 100644
index 2c93e97..0000000
--- a/debian/patches/55_typo.diff
+++ /dev/null
@@ -1,15 +0,0 @@
-Description: Small typo for the word attempts in src/dock.h.
-Author: Rodolfo García Peñas (kix) <k...@debian.org>
-Forwarded: http://lists.windowmaker.org/dev/msg05381.html
-Last-Update: 2013-09-09
---- a/src/dock.c
-+++ b/src/dock.c
-@@ -4284,7 +4284,7 @@
- }
-
- if (i == UNIQUE_NAME_WATCHDOG)
-- wwarning("Couldn't find a unique name for drawer in %d
attemps.", i);
-+ wwarning("Couldn't find a unique name for drawer in %d
attempts.", i);
- #undef UNIQUE_NAME_WATCHDOG
-
- return buffer;
diff --git a/debian/patches/55_ungif_problem.diff
b/debian/patches/55_ungif_problem.diff
new file mode 100644
index 0000000..2c59883
--- /dev/null
+++ b/debian/patches/55_ungif_problem.diff
@@ -0,0 +1,25 @@
+Description: Remove include ungif library (will use gif library)
+Author: Rodolfo García Peñas (kix) <k...@debian.org>
+Last-Update: 2014-10-09
+Index: WindowMaker-0.95.6/m4/wm_imgfmt_check.m4
+===================================================================
+--- WindowMaker-0.95.6.orig/m4/wm_imgfmt_check.m4
++++ WindowMaker-0.95.6/m4/wm_imgfmt_check.m4
+@@ -19,7 +19,7 @@
+ # WM_IMGFMT_CHECK_GIF
+ # -------------------
+ #
+-# Check for GIF file support through 'libgif', 'libungif' or 'giflib v5'
++# Check for GIF file support through 'libgif' or 'giflib v5'
+ # The check depends on variable 'enable_gif' being either:
+ # yes - detect, fail if not found
+ # no - do not detect, disable support
+@@ -37,7 +37,7 @@ AS_IF([test "x$enable_gif" = "xno"],
+ wm_save_LIBS="$LIBS"
+ dnl
+ dnl We check first if one of the known libraries is available
+- for wm_arg in "-lgif" "-lungif" ; do
++ for wm_arg in "-lgif" ; do
+ AS_IF([wm_fn_lib_try_link "DGifOpenFileName" "$XLFLAGS $XLIBS
$wm_arg"],
+ [wm_cv_imgfmt_gif="$wm_arg" ; break])
+ done
diff --git a/debian/patches/series b/debian/patches/series
index 093bbcc..b704e17 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,4 +2,4 @@
51_wmaker_man.diff
53_Debian_WMState.diff
54_Debian_wmmacros.diff
-55_typo.diff
+55_ungif_problem.diff
-----------------------------------------------------------------------
Summary of changes:
debian/changelog | 61 ++++++++++++
debian/control | 25 ++---
debian/copyright | 9 +-
debian/debianfiles/wmaker-common.desktop | 1 +
...gelog-upstream => libwings3.changelog-upstream} | 0
debian/{libwings2.install => libwings3.install} | 0
debian/{libwings2.symbols => libwings3.symbols} | 8 +-
...-upstream => libwraster-dev.changelog-upstream} | 0
.../{libwraster3-dev.docs => libwraster-dev.docs} | 0
...wraster3-dev.install => libwraster-dev.install} | 0
...aster3-dev.manpages => libwraster-dev.manpages} | 0
...log-upstream => libwraster5.changelog-upstream} | 0
debian/{libwraster3.docs => libwraster5.docs} | 0
.../{libwraster3.install => libwraster5.install} | 0
.../{libwraster3.symbols => libwraster5.symbols} | 6 +-
...gelog-upstream => libwutil5.changelog-upstream} | 0
debian/{libwutil3.install => libwutil5.install} | 0
debian/{libwutil3.symbols => libwutil5.symbols} | 7 +-
debian/nightly_build.sh | 109 ---------------------
debian/patches/50_def_config_paths.diff | 8 +-
debian/patches/51_wmaker_man.diff | 12 ++-
debian/patches/53_Debian_WMState.diff | 6 +-
debian/patches/55_typo.diff | 15 ---
debian/patches/55_ungif_problem.diff | 25 +++++
debian/patches/series | 2 +-
25 files changed, 138 insertions(+), 156 deletions(-)
rename debian/{libwutil3.changelog-upstream => libwings3.changelog-upstream}
(100%)
rename debian/{libwings2.install => libwings3.install} (100%)
rename debian/{libwings2.symbols => libwings3.symbols} (98%)
rename debian/{libwraster3.changelog-upstream =>
libwraster-dev.changelog-upstream} (100%)
rename debian/{libwraster3-dev.docs => libwraster-dev.docs} (100%)
rename debian/{libwraster3-dev.install => libwraster-dev.install} (100%)
rename debian/{libwraster3-dev.manpages => libwraster-dev.manpages} (100%)
rename debian/{libwraster3-dev.changelog-upstream =>
libwraster5.changelog-upstream} (100%)
rename debian/{libwraster3.docs => libwraster5.docs} (100%)
rename debian/{libwraster3.install => libwraster5.install} (100%)
rename debian/{libwraster3.symbols => libwraster5.symbols} (91%)
rename debian/{libwings2.changelog-upstream => libwutil5.changelog-upstream}
(100%)
rename debian/{libwutil3.install => libwutil5.install} (100%)
rename debian/{libwutil3.symbols => libwutil5.symbols} (97%)
delete mode 100755 debian/nightly_build.sh
delete mode 100644 debian/patches/55_typo.diff
create mode 100644 debian/patches/55_ungif_problem.diff
repo.or.cz automatic notification. Contact project admin crma...@gmail.com
if you want to unsubscribe, or site admin ad...@repo.or.cz if you receive
no reply.
--
wmaker-crm.git ("The Window Maker window manager")
--
To unsubscribe, send mail to wmaker-dev-unsubscr...@lists.windowmaker.org.
