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 9fa427bc7f91249568fdccf88682e86438299dab (commit)
from d435ea7468de6d5b13f275d5e08364db5ff08aeb (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/9fa427bc7f91249568fdccf88682e86438299dab
commit 9fa427bc7f91249568fdccf88682e86438299dab
Author: Rodolfo GarcÃa Peñas (kix) <[email protected]>
Date: Sun Oct 2 01:50:07 2011 +0200
Debian full patch migration
* New maintainer [Closes: #632875]
* New upstream version, now from git. [Closes: #556677]
* New package wmaker-common (arch independent files)
* removed the asclock diversions from the wmaker scripts
* new package wmaker-common with the arch independent files
* debian/patches are now DEP-3
* debian/copyright is now DEP-5
* Standard-Version is now 3.9.2
* manpages moved to upstream
* solved some problems with .la files (lintian clean)
diff --git a/debian/WMWindowAttributes b/debian/WMWindowAttributes
index 8e87a86..f1388c1 100644
--- a/debian/WMWindowAttributes
+++ b/debian/WMWindowAttributes
@@ -2,7 +2,7 @@
Logo.WMDock = {Icon = GNUstep.tiff;};
Logo.WMPanel = {Icon = GNUstep.tiff;};
Tile.WMClip = {Icon = clip.tiff;};
- WPrefs = {Icon =
"/usr/lib/GNUstep/System/Applications/WPrefs.app/WPrefs.tiff";};
+ WPrefs = {Icon =
"/usr/share/lib/GNUstep/System/Applications/WPrefs.app/WPrefs.tiff";};
Dockit = {Icon = GNUstep.tiff;};
WMSoundServer = {Icon = Sound.tiff;};
"*" = {Icon = defaultAppIcon.tiff;};
diff --git a/debian/changelog b/debian/changelog
index db9edad..c81581a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,13 +1,26 @@
wmaker (0.94.0-1) unstable; urgency=low
- * New upstream version, now from git
+ * New maintainer [Closes: #632875]
+ * New upstream version, now from git. [Closes: #556677]
+ * New package wmaker-common (arch independent files)
+ * removed the asclock diversions from the wmaker scripts
+ * new package wmaker-common with the arch independent files
* debian/patches are now DEP-3
* debian/copyright is now DEP-5
* Standard-Version is now 3.9.2
* manpages moved to upstream
* solved some problems with .la files (lintian clean)
- -- Rodolfo GarcÃa Peñas (kix) <[email protected]> Mon, 8 Aug 2011 19:29:12 +0200
+ -- Rodolfo GarcÃa Peñas (kix) <[email protected]> Mon, 28 Sep 2011 19:29:12 +0200
+
+wmaker (0.92.0-8.3) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Stop shipping la files. Closes: #633289.
+ * Use dh_clean instead of dh_prep in the clean target to stop shipping
+ temporary debhelper files.
+
+ -- Regis Boudin <[email protected]> Tue, 20 Sep 2011 19:55:32 +0100
wmaker (0.92.0+git-0) unstable; urgency=low
diff --git a/debian/control b/debian/control
index f8ddcf3..9980c7c 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,7 @@
Source: wmaker
Section: x11
Priority: optional
-Maintainer: John H. Robinson, IV <[email protected]>
+Maintainer: Rodolfo GarcÃa Peñas (kix) <[email protected]>
Standards-Version: 3.9.2
Build-Depends: debhelper (>= 7.0.50~), automake (>= 1:1.11), gettext,
dctrl-tools, quilt,
diff --git a/debian/libwings2.symbols b/debian/libwings2.symbols
index 32d3b86..3014391 100644
--- a/debian/libwings2.symbols
+++ b/debian/libwings2.symbols
@@ -8,6 +8,8 @@ libWINGs.so.2 libwings2 #MINVER#
WMAddSplitViewSubview@Base 0.94.0-1~
WMAddTabViewItemWithView@Base 0.94.0-1~
WMAdjustSplitViewSubviews@Base 0.94.0-1~
+ WMAppendTextBlock@Base 0.94.0-1~
+ WMAppendTextStream@Base 0.94.0-1~
WMBlackColor@Base 0.94.0-1~
WMBlueComponentOfColor@Base 0.94.0-1~
WMBoldSystemFontOfSize@Base 0.94.0-1~
@@ -52,8 +54,10 @@ libWINGs.so.2 libwings2 #MINVER#
WMCreatePixmapFromXPMData@Base 0.94.0-1~
WMCreatePixmapFromXPixmaps@Base 0.94.0-1~
WMCreatePopUpButton@Base 0.94.0-1~
+ WMCreateProgressIndicator@Base 0.94.0-1~
WMCreateRGBAColor@Base 0.94.0-1~
WMCreateRGBColor@Base 0.94.0-1~
+ WMCreateRuler@Base 0.94.0-1~
WMCreateScreen@Base 0.94.0-1~
WMCreateScreenWithRContext@Base 0.94.0-1~
WMCreateScrollView@Base 0.94.0-1~
@@ -65,7 +69,11 @@ libWINGs.so.2 libwings2 #MINVER#
WMCreateTabView@Base 0.94.0-1~
WMCreateTabViewItem@Base 0.94.0-1~
WMCreateTabViewItemWithIdentifier@Base 0.94.0-1~
+ WMCreateTextBlockWithObject@Base 0.94.0-1~
+ WMCreateTextBlockWithPixmap@Base 0.94.0-1~
+ WMCreateTextBlockWithText@Base 0.94.0-1~
WMCreateTextField@Base 0.94.0-1~
+ WMCreateTextForDocumentType@Base 0.94.0-1~
WMCreateWindow@Base 0.94.0-1~
WMCreateWindowWithStyle@Base 0.94.0-1~
WMDarkGrayColor@Base 0.94.0-1~
@@ -81,17 +89,20 @@ libWINGs.so.2 libwings2 #MINVER#
WMDestroyInputPanel@Base 0.94.0-1~
WMDestroyMenuItem@Base 0.94.0-1~
WMDestroyTabViewItem@Base 0.94.0-1~
+ WMDestroyTextBlock@Base 0.94.0-1~
WMDestroyWidget@Base 0.94.0-1~
WMDragImageFromView@Base 0.94.0-1~
WMDrawImageString@Base 0.94.0-1~
WMDrawPixmap@Base 0.94.0-1~
WMDrawString@Base 0.94.0-1~
+ WMFindInTextStream@Base 0.94.0-1~
WMFindRowOfListItemWithTitle@Base 0.94.0-1~
WMFontHeight@Base 0.94.0-1~
WMFontPanelFontChangedNotification@Base 0.94.0-1~
WMFreeColorPanel@Base 0.94.0-1~
WMFreeFilePanel@Base 0.94.0-1~
WMFreeFontPanel@Base 0.94.0-1~
+ WMFreezeText@Base 0.94.0-1~
WMGetApplicationIconImage@Base 0.94.0-1~
WMGetApplicationIconPixmap@Base 0.94.0-1~
WMGetBrowserFirstVisibleColumn@Base 0.94.0-1~
@@ -118,6 +129,7 @@ libWINGs.so.2 libwings2 #MINVER#
WMGetFontName@Base 0.94.0-1~
WMGetFontPanel@Base 0.94.0-1~
WMGetFontPanelFont@Base 0.94.0-1~
+ WMGetGrabbedRulerMargin@Base 0.94.0-1~
WMGetHangedData@Base 0.94.0-1~
WMGetLabelFont@Base 0.94.0-1~
WMGetLabelImage@Base 0.94.0-1~
@@ -152,7 +164,13 @@ libWINGs.so.2 libwings2 #MINVER#
WMGetPopUpButtonMenuItem@Base 0.94.0-1~
WMGetPopUpButtonNumberOfItems@Base 0.94.0-1~
WMGetPopUpButtonSelectedItem@Base 0.94.0-1~
+ WMGetProgressIndicatorMaxValue@Base 0.94.0-1~
+ WMGetProgressIndicatorMinValue@Base 0.94.0-1~
+ WMGetProgressIndicatorValue@Base 0.94.0-1~
WMGetRColorFromColor@Base 0.94.0-1~
+ WMGetReleasedRulerMargin@Base 0.94.0-1~
+ WMGetRulerMargins@Base 0.94.0-1~
+ WMGetRulerOffset@Base 0.94.0-1~
WMGetSavePanel@Base 0.94.0-1~
WMGetScrollViewHorizontalScroller@Base 0.94.0-1~
WMGetScrollViewVerticalScroller@Base 0.94.0-1~
@@ -173,11 +191,26 @@ libWINGs.so.2 libwings2 #MINVER#
WMGetTabViewItemIdentifier@Base 0.94.0-1~
WMGetTabViewItemLabel@Base 0.94.0-1~
WMGetTabViewItemView@Base 0.94.0-1~
+ WMGetTextBlockProperties@Base 0.94.0-1~
+ WMGetTextDefaultColor@Base 0.94.0-1~
+ WMGetTextDefaultFont@Base 0.94.0-1~
+ WMGetTextEditable@Base 0.94.0-1~
WMGetTextFieldCursorPosition@Base 0.94.0-1~
WMGetTextFieldDelegate@Base 0.94.0-1~
WMGetTextFieldEditable@Base 0.94.0-1~
WMGetTextFieldFont@Base 0.94.0-1~
WMGetTextFieldText@Base 0.94.0-1~
+ WMGetTextIgnoresNewline@Base 0.94.0-1~
+ WMGetTextInsertType@Base 0.94.0-1~
+ WMGetTextObjects@Base 0.94.0-1~
+ WMGetTextRulerShown@Base 0.94.0-1~
+ WMGetTextSelectedObjects@Base 0.94.0-1~
+ WMGetTextSelectedStream@Base 0.94.0-1~
+ WMGetTextSelectionColor@Base 0.94.0-1~
+ WMGetTextSelectionFont@Base 0.94.0-1~
+ WMGetTextSelectionUnderlined@Base 0.94.0-1~
+ WMGetTextStream@Base 0.94.0-1~
+ WMGetTextUsesMonoFont@Base 0.94.0-1~
WMGetViewPosition@Base 0.94.0-1~
WMGetViewScreenPosition@Base 0.94.0-1~
WMGetViewSize@Base 0.94.0-1~
@@ -197,6 +230,7 @@ libWINGs.so.2 libwings2 #MINVER#
WMIsAntialiasingEnabled@Base 0.94.0-1~
WMIsDoubleClick@Base 0.94.0-1~
WMIsDraggingFromView@Base 0.94.0-1~
+ WMIsMarginEqualToMargin@Base 0.94.0-1~
WMListAllowsEmptySelection@Base 0.94.0-1~
WMListAllowsMultipleSelection@Base 0.94.0-1~
WMListDidScrollNotification@Base 0.94.0-1~
@@ -210,8 +244,11 @@ libWINGs.so.2 libwings2 #MINVER#
WMMoveWidget@Base 0.94.0-1~
WMNextEvent@Base 0.94.0-1~
WMOpenScreen@Base 0.94.0-1~
+ WMPageText@Base 0.94.0-1~
WMPaintColorSwatch@Base 0.94.0-1~
WMPerformButtonClick@Base 0.94.0-1~
+ WMPrependTextBlock@Base 0.94.0-1~
+ WMPrependTextStream@Base 0.94.0-1~
WMRaiseWidget@Base 0.94.0-1~
WMRealizeWidget@Base 0.94.0-1~
WMRedComponentOfColor@Base 0.94.0-1~
@@ -229,7 +266,9 @@ libWINGs.so.2 libwings2 #MINVER#
WMRemoveSplitViewSubview@Base 0.94.0-1~
WMRemoveSplitViewSubviewAt@Base 0.94.0-1~
WMRemoveTabViewItem@Base 0.94.0-1~
+ WMRemoveTextBlock@Base 0.94.0-1~
WMReparentWidget@Base 0.94.0-1~
+ WMReplaceTextSelection@Base 0.94.0-1~
WMRequestSelection@Base 0.94.0-1~
WMResizeScrollViewContent@Base 0.94.0-1~
WMResizeWidget@Base 0.94.0-1~
@@ -247,6 +286,7 @@ libWINGs.so.2 libwings2 #MINVER#
WMScreenPending@Base 0.94.0-1~
WMScreenRContext@Base 0.94.0-1~
WMScreenWidth@Base 0.94.0-1~
+ WMScrollText@Base 0.94.0-1~
WMScrollViewScrollPoint@Base 0.94.0-1~
WMScrollerDidScrollNotification@Base 0.94.0-1~
WMSelectAllListItems@Base 0.94.0-1~
@@ -353,6 +393,13 @@ libWINGs.so.2 libwings2 #MINVER#
WMSetPopUpButtonPullsDown@Base 0.94.0-1~
WMSetPopUpButtonSelectedItem@Base 0.94.0-1~
WMSetPopUpButtonText@Base 0.94.0-1~
+ WMSetProgressIndicatorMaxValue@Base 0.94.0-1~
+ WMSetProgressIndicatorMinValue@Base 0.94.0-1~
+ WMSetProgressIndicatorValue@Base 0.94.0-1~
+ WMSetRulerMargins@Base 0.94.0-1~
+ WMSetRulerMoveAction@Base 0.94.0-1~
+ WMSetRulerOffset@Base 0.94.0-1~
+ WMSetRulerReleaseAction@Base 0.94.0-1~
WMSetScrollViewContentView@Base 0.94.0-1~
WMSetScrollViewHasHorizontalScroller@Base 0.94.0-1~
WMSetScrollViewHasVerticalScroller@Base 0.94.0-1~
@@ -378,6 +425,14 @@ libWINGs.so.2 libwings2 #MINVER#
WMSetTabViewItemLabel@Base 0.94.0-1~
WMSetTabViewItemView@Base 0.94.0-1~
WMSetTabViewType@Base 0.94.0-1~
+ WMSetTextAlignment@Base 0.94.0-1~
+ WMSetTextBackgroundColor@Base 0.94.0-1~
+ WMSetTextBackgroundPixmap@Base 0.94.0-1~
+ WMSetTextBlockProperties@Base 0.94.0-1~
+ WMSetTextDefaultColor@Base 0.94.0-1~
+ WMSetTextDefaultFont@Base 0.94.0-1~
+ WMSetTextDelegate@Base 0.94.0-1~
+ WMSetTextEditable@Base 0.94.0-1~
WMSetTextFieldAlignment@Base 0.94.0-1~
WMSetTextFieldBeveled@Base 0.94.0-1~
WMSetTextFieldBordered@Base 0.94.0-1~
@@ -389,6 +444,17 @@ libWINGs.so.2 libwings2 #MINVER#
WMSetTextFieldPrevTextField@Base 0.94.0-1~
WMSetTextFieldSecure@Base 0.94.0-1~
WMSetTextFieldText@Base 0.94.0-1~
+ WMSetTextForegroundColor@Base 0.94.0-1~
+ WMSetTextHasHorizontalScroller@Base 0.94.0-1~
+ WMSetTextHasRuler@Base 0.94.0-1~
+ WMSetTextHasVerticalScroller@Base 0.94.0-1~
+ WMSetTextIgnoresNewline@Base 0.94.0-1~
+ WMSetTextIndentNewLines@Base 0.94.0-1~
+ WMSetTextRelief@Base 0.94.0-1~
+ WMSetTextSelectionColor@Base 0.94.0-1~
+ WMSetTextSelectionFont@Base 0.94.0-1~
+ WMSetTextSelectionUnderlined@Base 0.94.0-1~
+ WMSetTextUsesMonoFont@Base 0.94.0-1~
WMSetViewDragDestinationProcs@Base 0.94.0-1~
WMSetViewDragImage@Base 0.94.0-1~
WMSetViewDragSourceProcs@Base 0.94.0-1~
@@ -415,6 +481,7 @@ libWINGs.so.2 libwings2 #MINVER#
WMSetWindowUserPosition@Base 0.94.0-1~
WMShowColorPanel@Base 0.94.0-1~
WMShowFontPanel@Base 0.94.0-1~
+ WMShowTextRuler@Base 0.94.0-1~
WMSortBrowserColumn@Base 0.94.0-1~
WMSortBrowserColumnWithComparer@Base 0.94.0-1~
WMSortListItems@Base 0.94.0-1~
@@ -424,6 +491,7 @@ libWINGs.so.2 libwings2 #MINVER#
WMTextDidBeginEditingNotification@Base 0.94.0-1~
WMTextDidChangeNotification@Base 0.94.0-1~
WMTextDidEndEditingNotification@Base 0.94.0-1~
+ WMThawText@Base 0.94.0-1~
WMUnmapSubwidgets@Base 0.94.0-1~
WMUnmapWidget@Base 0.94.0-1~
WMUnregisterViewDraggedTypes@Base 0.94.0-1~
@@ -509,10 +577,13 @@ libWINGs.so.2 libwings2 #MINVER#
_BrowserViewDelegate@Base 0.94.0-1~
_ColorWellViewDelegate@Base 0.94.0-1~
_ListViewDelegate@Base 0.94.0-1~
+ _ProgressIndicatorDelegate@Base 0.94.0-1~
+ _RulerViewDelegate@Base 0.94.0-1~
_ScrollViewViewDelegate@Base 0.94.0-1~
_ScrollerViewDelegate@Base 0.94.0-1~
_SliderViewDelegate@Base 0.94.0-1~
_TextFieldViewDelegate@Base 0.94.0-1~
+ _TextViewDelegate@Base 0.94.0-1~
_WindowViewDelegate@Base 0.94.0-1~
colorListMenuItem@Base 0.94.0-1~
convertCPColor@Base 0.94.0-1~
@@ -520,9 +591,12 @@ libWINGs.so.2 libwings2 #MINVER#
generateNewFilename@Base 0.94.0-1~
getNextRequestedDataType@Base 0.94.0-1~
getShift@Base 0.94.0-1~
+ getStream@Base 0.94.0-1~
+ getStreamObjects@Base 0.94.0-1~
makeMenuPixmap@Base 0.94.0-1~
requestDropData@Base 0.94.0-1~
requestDropDataInSelection@Base 0.94.0-1~
+ requestHandler@Base 0.94.0-1~
rgbColors@Base 0.94.0-1~
sourceOperationList@Base 0.94.0-1~
storeRequiredTypeList@Base 0.94.0-1~
diff --git a/debian/rules b/debian/rules
index d59a10f..d3b448f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -132,17 +132,24 @@ override_dh_clean:
override_dh_installmenu:
dh_installmenu -a --noscripts
+ # Copy extra menu files to the WMCONFIG
$(install_prog) $(DEBDIR)/appearance.menu-method -
$(WMAKER_TMP)/etc/menu-methods/wmappearance
+ $(WMAKER_COMMON_TMP)/etc/menu-methods/wmappearance
$(install_file) $(TOPSRCDIR)/WindowMaker/appearance.menu -
$(WMAKER_TMP)/$(WMCONFDIR)/
+ $(WMAKER_COMMON_TMP)/$(WMCONFDIR)/
$(install_file) $(TOPSRCDIR)/WindowMaker/background.menu -
$(WMAKER_TMP)/$(WMCONFDIR)/
+ $(WMAKER_COMMON_TMP)/$(WMCONFDIR)/
$(install_file) $(TOPSRCDIR)/WindowMaker/wmmacros -
$(WMAKER_TMP)/$(WMCONFDIR)/
- touch $(WMAKER_TMP)/$(WMCONFDIR)/menu.prehook
- touch $(WMAKER_TMP)/$(WMCONFDIR)/menu.posthook
- chmod 755 $(WMAKER_TMP)/etc/menu-methods/wmaker
+ $(WMAKER_COMMON_TMP)/$(WMCONFDIR)/
+ touch $(WMAKER_COMMON_TMP)/$(WMCONFDIR)/menu.prehook
+ touch $(WMAKER_COMMON_TMP)/$(WMCONFDIR)/menu.posthook
+ # Now, change the #wmdatadir# string to $(WMSHAREDIR)
+ perl -pi -e 's:#wmdatadir#:$(WMSHAREDIR):'
$(WMAKER_COMMON_TMP)/$(WMCONFDIR)/wmmacros
+ perl -pi -e 's:#wmdatadir#:$(WMSHAREDIR):'
$(WMAKER_COMMON_TMP)/$(WMSHAREDIR)/wmmacros
+ perl -pi -e 's:#wmdatadir#:$(WMSHAREDIR):'
$(WMAKER_COMMON_TMP)/$(WMSHAREDIR)/plmenu
+ perl -pi -e 's:#wmdatadir#:$(WMSHAREDIR):' `find
$(WMAKER_COMMON_TMP)/$(WMSHAREDIR) -name plmenu.*`
+ perl -pi -e 's:#wmdatadir#:$(WMSHAREDIR):'
$(WMAKER_COMMON_TMP)/$(DEFAULTSDIR)/WMRootMenu
+ perl -pi -e 's:#wmdatadir#:$(WMSHAREDIR):'
$(WMAKER_COMMON_TMP)/$(WMSHAREDIR)/Defaults/WMRootMenu
override_dh_installdocs:
dh_installdocs -a
@@ -195,7 +202,7 @@ override_dh_install:
# the next is stricly not necessary, because there's a symlink in place,
# but I don't want to abuse it. Some dumb program uses that path and is a
# PITA to modify it)
- perl -pi -e 's:/$(WPREFSAPPDIR)/WPrefs:/$(BINDIR)/WPrefs:' + perl
-pi -e 's:$(WPREFSAPPDIR)/WPrefs:$(BINDIR)/WPrefs:'
$(WMAKER_COMMON_TMP)/$(DEFAULTSDIR)/WMState
# Fix permissions
diff --git a/debian/wmaker-common.dirs b/debian/wmaker-common.dirs
index c135127..c972bdc 100644
--- a/debian/wmaker-common.dirs
+++ b/debian/wmaker-common.dirs
@@ -1,4 +1,6 @@
+etc/menu-methods
etc/GNUstep/Defaults
+etc/X11/WindowMaker
usr/bin
usr/sbin
usr/share/doc/wmaker
diff --git a/debian/wmaker-common.install b/debian/wmaker-common.install
index 2f80b6e..4df3956 100644
--- a/debian/wmaker-common.install
+++ b/debian/wmaker-common.install
@@ -65,74 +65,10 @@ usr/share/WindowMaker/plmenu.de
usr/share/WindowMaker/plmenu.bg
usr/share/WindowMaker/plmenu.pl
usr/share/WindowMaker/menu.ru
-usr/share/WindowMaker/Icons/Pencil.png
-usr/share/WindowMaker/Icons/Ftp.png
-usr/share/WindowMaker/Icons/pdf.tiff
-usr/share/WindowMaker/Icons/Pen.png
-usr/share/WindowMaker/Icons/timer.xpm
-usr/share/WindowMaker/Icons/wilber.xpm
-usr/share/WindowMaker/Icons/Mozilla.png
-usr/share/WindowMaker/Icons/notepad.xpm
-usr/share/WindowMaker/Icons/Real.png
-usr/share/WindowMaker/Icons/GNUstepGlow.tiff
-usr/share/WindowMaker/Icons/TerminalGNUstep.tiff
-usr/share/WindowMaker/Icons/notepad.tiff
-usr/share/WindowMaker/Icons/Terminal.tiff
-usr/share/WindowMaker/Icons/BitchX.tiff
-usr/share/WindowMaker/Icons/Ear.png
-usr/share/WindowMaker/Icons/sgiterm.xpm
-usr/share/WindowMaker/Icons/ICQ.png
-usr/share/WindowMaker/Icons/clip.xpm
-usr/share/WindowMaker/Icons/GNUstep3D.xpm
-usr/share/WindowMaker/Icons/real.tiff
-usr/share/WindowMaker/Icons/xdvi.tiff
-usr/share/WindowMaker/Icons/defaultAppIcon.tiff
-usr/share/WindowMaker/Icons/real.xpm
-usr/share/WindowMaker/Icons/linuxterm.xpm
-usr/share/WindowMaker/Icons/clip.tiff
-usr/share/WindowMaker/Icons/GreenWilber.png
-usr/share/WindowMaker/Icons/Magnify.xpm
-usr/share/WindowMaker/Icons/draw.xpm
-usr/share/WindowMaker/Icons/staroffice2.tiff
-usr/share/WindowMaker/Icons/DefaultAppIcon.tiff
-usr/share/WindowMaker/Icons/linuxterm.tiff
-usr/share/WindowMaker/Icons/TerminalGNUstep.xpm
-usr/share/WindowMaker/Icons/defaultterm.xpm
-usr/share/WindowMaker/Icons/GNUstep3D.tiff
-usr/share/WindowMaker/Icons/TerminalLinux.tiff
-usr/share/WindowMaker/Icons/defaultAppIcon.xpm
-usr/share/WindowMaker/Icons/pdf.xpm
-usr/share/WindowMaker/Icons/mixer.tiff
-usr/share/WindowMaker/Icons/TerminalLinux.xpm
-usr/share/WindowMaker/Icons/ps.tiff
-usr/share/WindowMaker/Icons/GNUterm.tiff
-usr/share/WindowMaker/Icons/Wine.png
-usr/share/WindowMaker/Icons/Shell.png
-usr/share/WindowMaker/Icons/xv.xpm
-usr/share/WindowMaker/Icons/GNUterm.xpm
-usr/share/WindowMaker/Icons/Magnify.tiff
+usr/share/WindowMaker/Icons/*.png
+usr/share/WindowMaker/Icons/*.tiff
+usr/share/WindowMaker/Icons/*.xpm
usr/share/WindowMaker/Icons/README
-usr/share/WindowMaker/Icons/draw.tiff
-usr/share/WindowMaker/Icons/XChat.png
-usr/share/WindowMaker/Icons/mixer.xpm
-usr/share/WindowMaker/Icons/Speaker.png
-usr/share/WindowMaker/Icons/sgiterm.tiff
-usr/share/WindowMaker/Icons/write.xpm
-usr/share/WindowMaker/Icons/Mouth.png
-usr/share/WindowMaker/Icons/xdvi.xpm
-usr/share/WindowMaker/Icons/defaultterm.tiff
-usr/share/WindowMaker/Icons/staroffice2.xpm
-usr/share/WindowMaker/Icons/wilber.tiff
-usr/share/WindowMaker/Icons/xv.tiff
-usr/share/WindowMaker/Icons/GNUstep.tiff
-usr/share/WindowMaker/Icons/GNUstepGlow.xpm
-usr/share/WindowMaker/Icons/write.tiff
-usr/share/WindowMaker/Icons/Terminal.xpm
-usr/share/WindowMaker/Icons/timer.tiff
-usr/share/WindowMaker/Icons/GNUstep.xpm
-usr/share/WindowMaker/Icons/ps.xpm
-usr/share/WindowMaker/Icons/BitchX.xpm
-usr/share/WindowMaker/Icons/Jabber.png
usr/share/WindowMaker/plmenu
usr/share/WindowMaker/menu.es
usr/share/WindowMaker/wmmacros
@@ -143,41 +79,7 @@ usr/share/WindowMaker/menu
usr/share/WindowMaker/Backgrounds/BlueImage.jpeg
usr/share/WindowMaker/menu.nl
usr/share/WindowMaker/plmenu.ja
-usr/share/WindowMaker/Styles/Purple.style
-usr/share/WindowMaker/Styles/NewBlue.style
-usr/share/WindowMaker/Styles/DarkRed.style
-usr/share/WindowMaker/Styles/RednBlue.style
-usr/share/WindowMaker/Styles/Green.style
-usr/share/WindowMaker/Styles/Emerald.style
-usr/share/WindowMaker/Styles/Fire.style
-usr/share/WindowMaker/Styles/LightBlue.style
-usr/share/WindowMaker/Styles/BlueishGreen.style
-usr/share/WindowMaker/Styles/GreyBlue.style
-usr/share/WindowMaker/Styles/BlueDawn.style
-usr/share/WindowMaker/Styles/Interlace.style
-usr/share/WindowMaker/Styles/Brown.style
-usr/share/WindowMaker/Styles/Pastel.style
-usr/share/WindowMaker/Styles/Copper.style
-usr/share/WindowMaker/Styles/Golden.style
-usr/share/WindowMaker/Styles/NightSky.style
-usr/share/WindowMaker/Styles/Food.style
-usr/share/WindowMaker/Styles/Spring.style
-usr/share/WindowMaker/Styles/Summer.style
-usr/share/WindowMaker/Styles/IRednBlue.style
-usr/share/WindowMaker/Styles/Gtk.style
-usr/share/WindowMaker/Styles/Black.style
-usr/share/WindowMaker/Styles/Pink.style
-usr/share/WindowMaker/Styles/Autumn.style
-usr/share/WindowMaker/Styles/DarkBlue.style
-usr/share/WindowMaker/Styles/Chumbo.style
-usr/share/WindowMaker/Styles/Pumpkin.style
-usr/share/WindowMaker/Styles/Traditional.style
-usr/share/WindowMaker/Styles/VioletBlue.style
-usr/share/WindowMaker/Styles/BlackTexture.style
-usr/share/WindowMaker/Styles/Red.style
-usr/share/WindowMaker/Styles/Brownish.style
-usr/share/WindowMaker/Styles/Blue.style
-usr/share/WindowMaker/Styles/Purplish.style
+usr/share/WindowMaker/Styles/*.style
usr/share/WindowMaker/menu.ro
usr/share/WindowMaker/menu.bg
usr/share/WindowMaker/menu.se
@@ -193,11 +95,7 @@ usr/share/WindowMaker/plmenu.fi
usr/share/WindowMaker/plmenu.it
usr/share/WindowMaker/menu.ja
usr/share/WindowMaker/menu.fi
-usr/share/WindowMaker/Themes/Blau.style
-usr/share/WindowMaker/Themes/Pastel.style
-usr/share/WindowMaker/Themes/SteelBlueSilk.style
-usr/share/WindowMaker/Themes/OpenStep.style
-usr/share/WindowMaker/Themes/Default.style
+usr/share/WindowMaker/Themes/*.style
usr/share/WindowMaker/plmenu.da
usr/share/WindowMaker/plmenu.ro
usr/share/WindowMaker/README.themes
@@ -218,11 +116,8 @@ usr/share/WindowMaker/plmenu.zh_TW
usr/share/WindowMaker/menu.gl
usr/share/WindowMaker/menu.tr
usr/share/WindowMaker/menu.zh_CN
-usr/share/WindowMaker/Pixmaps/tile.xpm
-usr/share/WindowMaker/Pixmaps/swtile.png
-usr/share/WindowMaker/Pixmaps/swback.png
-usr/share/WindowMaker/Pixmaps/tile.tiff
-usr/share/WindowMaker/Pixmaps/swback2.png
+usr/share/WindowMaker/Pixmaps/*.xpm
+usr/share/WindowMaker/Pixmaps/*.png
usr/share/WINGs/defaultIcon.xpm
usr/share/WINGs/defaultIcon.tiff
usr/share/WINGs/Images.xpm
diff --git a/debian/wmaker-common.lintian-overrides
b/debian/wmaker-common.lintian-overrides
new file mode 100644
index 0000000..6dbcf16
--- /dev/null
+++ b/debian/wmaker-common.lintian-overrides
@@ -0,0 +1 @@
+wmaker-common: menu-method-should-include-menu-h
diff --git a/debian/wmaker.postinst b/debian/wmaker-common.postinst
similarity index 99%
copy from debian/wmaker.postinst
copy to debian/wmaker-common.postinst
index 000d853..416af6b 100644
--- a/debian/wmaker.postinst
+++ b/debian/wmaker-common.postinst
@@ -1,7 +1,7 @@
#! /bin/sh -e
#
# Window Maker postinst.
-#
+#
# Marcelo Magallon <[email protected]>
inst="/etc/menu-methods/wmaker /etc/menu-methods/wmappearance"
diff --git a/debian/wmaker-common.postrm b/debian/wmaker-common.postrm
new file mode 100644
index 0000000..17400d1
--- /dev/null
+++ b/debian/wmaker-common.postrm
@@ -0,0 +1,42 @@
+#!/bin/sh
+set -e
+
+inst="/etc/menu-methods/wmaker /etc/menu-methods/wmappearance"
+
+case "$1" in
+ remove)
+ for file in $inst ; do
+ if [ -f $file ] ; then
+ chmod a-x $file
+ fi
+ done
+ ;;
+ purge)
+ if [ -x /usr/sbin/register-window-manager ]; then
+ register-window-manager --remove wmaker
+ fi
+
+ if [ -x /usr/bin/update-menus ] ; then
+ update-menus
+ rm -f /etc/X11/WindowMaker/menu.hook /etc/X11/WindowMaker/plmenu.hook
+ fi
+ ;;
+ upgrade|abort-install|disappear)
+ # nothing to do
+ ;;
+ failed-upgrade)
+ # this is an upgrade, and it has failed. What can fail?
+ exit 1
+ ;;
+ abort-upgrade)
+ # preinst failed, leave things like they were
+ ;;
+ *)
+ echo "postrm called with unknown argument `$1'" >&2
+ exit 1
+ ;;
+esac
+
+#DEBHELPER#
+
+exit 0
diff --git a/debian/wmaker.dirs b/debian/wmaker.dirs
index f34b5c2..501f3d6 100644
--- a/debian/wmaker.dirs
+++ b/debian/wmaker.dirs
@@ -1,4 +1,2 @@
-etc/X11/WindowMaker
-etc/menu-methods
usr/lib/WindowMaker
usr/lib/GNUstep/System/Applications/WPrefs.app
diff --git a/debian/wmaker.postinst b/debian/wmaker.postinst
index 000d853..1c8bdef 100644
--- a/debian/wmaker.postinst
+++ b/debian/wmaker.postinst
@@ -4,7 +4,6 @@
#
# Marcelo Magallon <[email protected]>
-inst="/etc/menu-methods/wmaker /etc/menu-methods/wmappearance"
x_wm_link=/etc/alternatives/x-window-manager
x_wm_man_link=/usr/share/man/man1/x-window-manager.1.gz
@@ -20,12 +19,6 @@ case "$1" in
ln -sf /usr/share/man/man1/wmaker.1x.gz ${x_wm_man_link}
fi
- for file in $inst ; do
- if [ -f $file ] ; then
- chmod a+x $file
- fi
- done
-
if [ -x /usr/bin/update-menus -a -x /usr/bin/install-menu ] ; then
update-menus
fi
diff --git a/debian/wmaker.postrm b/debian/wmaker.postrm
index 43273fb..db97712 100644
--- a/debian/wmaker.postrm
+++ b/debian/wmaker.postrm
@@ -1,21 +1,8 @@
#!/bin/sh
-
set -e
-inst="/etc/menu-methods/wmaker /etc/menu-methods/wmappearance"
-asclock="/usr/X11R6/bin/asclock"
-asclock_diversion="/usr/X11R6/bin/asclock.afterstep"
-asclock_man="/usr/X11R6/man/man1/asclock.1x.gz"
-asclock_man_diversion="/usr/X11R6/man/man1/asclock.afterstep.1x.gz"
-old_asclock_man_diversion="/usr/X11R6/man/man1/asclock.1x.afterstep.gz"
-
case "$1" in
remove)
- for file in $inst ; do
- if [ -f $file ] ; then
- chmod a-x $file
- fi
- done
;;
purge)
if [ -x /usr/sbin/register-window-manager ]; then
@@ -36,15 +23,6 @@ case "$1" in
;;
abort-upgrade)
# preinst failed, leave things like they were
- if dpkg --compare-versions $2 eq 0.6.3-1 ; then
- # reinstall the removed diversions
- dpkg-divert --quiet --rename --package wmaker - --divert
$asclock_man_diversion --remove $asclock_man
- dpkg-divert --quiet --rename --package wmaker - --divert
$old_asclock_man_diversion --add $asclock_man
- dpkg-divert --quiet --rename --package wmaker - --divert
$asclock_diversion --add $asclock
- fi
;;
*)
echo "postrm called with unknown argument `$1'" >&2
diff --git a/debian/wmaker.preinst b/debian/wmaker.preinst
deleted file mode 100644
index 41d0dd6..0000000
--- a/debian/wmaker.preinst
+++ /dev/null
@@ -1,69 +0,0 @@
-#! /bin/sh
-
-# set some variables to make the thing a bit more readable...
-
-remove_diversion ()
-{
- real_file=$1
- temp_file=$1.wmaker-tmp
- diversion=$2
-
- if [ -e ${real_file} ] ; then
- mv ${real_file} ${temp_file}
- fi
- dpkg-divert --remove --rename --quiet --package wmaker - --divert
${diversion} ${real_file}
- if [ -e ${temp_file} ] ; then
- mv ${temp_file} ${real_file}
- fi
-}
-
-# asclock's location and its diversion
-
-asclock=/usr/X11R6/bin/asclock
-asclock_divert_to=/usr/X11R6/bin/asclock.afterstep
-
-# asclock's manpage and its diversions
-
-asclock_man=/usr/X11R6/man/man1/asclock.1x.gz
-asclock_man_divert_to=/usr/X11R6/man/man1/asclock.afterstep.1x.gz
-old_asclock_man_divert_to=/usr/X11R6/man/man1/asclock.1x.afterstep.gz
-
-# are the diversions present?
-
-asclock_diversion=$(dpkg-divert --list | grep 'asclock .*by wmaker')
-asclock_man_diversion=$(dpkg-divert --list | grep 'asclock.afterstep.1x.*by
wmaker')
-old_man_diversion=$(dpkg-divert --list | grep 'asclock.1x.afterstep.*by
wmaker')
-
-# ... and set a safety net in case something goes really wrong
-
-set -e
-
-case "$1" in
- upgrade|install)
- if [ "$old_man_diversion" ] ; then
- echo "Removing really old diversion of asclock manpage by wmaker..."
- remove_diversion ${asclock_man} ${old_asclock_man_divert_to}
- fi
-
- if [ "$asclock_diversion" ] ; then
- echo "Removing diversion of asclock to asclock.afterstep..."
- remove_diversion ${asclock} ${asclock_divert_to}
- fi
-
- if [ "$asclock_man_diversion" ] ; then
- echo "Removing diversion of asclock.1x to asclock.afterstep.1x..."
- remove_diversion ${asclock_man} ${asclock_man_divert_to}
- fi
-
- exit 0
- ;;
- abort-upgrade)
- # the postrm has failed; preinst is only called like this after
- # a failed upgrade and the current postrm also fails. Now,
- # in what situation does this happen? Force non-zero exit code.
- exit 1
- ;;
-esac
-
-#DEBHELPER#
-----------------------------------------------------------------------
Summary of changes:
debian/WMWindowAttributes | 2 +-
debian/changelog | 17 +++-
debian/control | 2 +-
debian/libwings2.symbols | 74 ++++++++++++
debian/rules | 23 +++--
debian/wmaker-common.dirs | 2 +
debian/wmaker-common.install | 119 +------------------
debian/wmaker-common.lintian-overrides | 1 +
debian/{wmaker.postinst => wmaker-common.postinst} | 2 +-
debian/wmaker-common.postrm | 42 +++++++
debian/wmaker.dirs | 2 -
debian/wmaker.postinst | 7 -
debian/wmaker.postrm | 22 ----
debian/wmaker.preinst | 69 -----------
14 files changed, 159 insertions(+), 225 deletions(-)
create mode 100644 debian/wmaker-common.lintian-overrides
copy debian/{wmaker.postinst => wmaker-common.postinst} (99%)
create mode 100644 debian/wmaker-common.postrm
delete mode 100644 debian/wmaker.preinst
repo.or.cz automatic notification. Contact project admin [email protected]
if you want to unsubscribe, or site admin [email protected] if you receive
no reply.
--
wmaker-crm.git ("Fork from the last available CVS version of Window Maker")
--
To unsubscribe, send mail to [email protected].
