Re: Patch for wmtime in dockapps repo, new Debian maintainer

2013-09-22 Thread Torrance, Douglas
On 09/22/2013 03:47 PM, Rodolfo García Peñas wrote:
> Some time ago we agree to remove the debian directory in the dockapps.
> The debian folder in wmaker is used to create the Debian package and
> create the nightly build package. Cheers, kix
I've attached a patch to remove the debian directory from wmtime.

Thanks,
Doug
From daf841d56e621112c34eac0b905b6e2b35da8a39 Mon Sep 17 00:00:00 2001
From: Doug Torrance 
Date: Sun, 22 Sep 2013 17:01:08 -0500
Subject: [PATCH] wmtime - Removed debian directory.

As per the policy of the dockapp git repository, the debian directory of wmtime has been removed.
---
 wmtime/debian/changelog | 73 --
 wmtime/debian/compat|  1 -
 wmtime/debian/control   | 21 ---
 wmtime/debian/copyright | 29 ---
 wmtime/debian/dirs  |  1 -
 wmtime/debian/examples  |  1 -
 wmtime/debian/manpages  |  1 -
 wmtime/debian/menu  |  6 
 wmtime/debian/rules | 93 -
 wmtime/debian/wmtimerc  |  3 --
 10 files changed, 229 deletions(-)
 delete mode 100644 wmtime/debian/changelog
 delete mode 100644 wmtime/debian/compat
 delete mode 100644 wmtime/debian/control
 delete mode 100644 wmtime/debian/copyright
 delete mode 100644 wmtime/debian/dirs
 delete mode 100644 wmtime/debian/examples
 delete mode 100644 wmtime/debian/manpages
 delete mode 100644 wmtime/debian/menu
 delete mode 100755 wmtime/debian/rules
 delete mode 100644 wmtime/debian/wmtimerc

diff --git a/wmtime/debian/changelog b/wmtime/debian/changelog
deleted file mode 100644
index f9682a9..000
--- a/wmtime/debian/changelog
+++ /dev/null
@@ -1,73 +0,0 @@
-wmtime (1.0b2-10) unstable; urgency=low
-
-  * New maintainer.  (Closes: #487135)
-  * Checked the debian files against the latest standard.  (Closes: Bug#379574)
-  * Moved menu item to Applications/System/Monitoring.
-  * Minor code corrections to avoid build warnings.
-
- -- Paul Harris   Tue, 15 Jul 2008 15:24:09 +0800
-
-wmtime (1.0b2-9) unstable; urgency=medium
-
-  * Fixed build dependencies so we no longer depend on libxpm4-dev.
-  * Quoted all strings in /usr/lib/menu/wmtime.
-
- -- Simon Law   Tue, 10 Aug 2004 21:15:53 -0400
-
-wmtime (1.0b2-8) unstable; urgency=low
-
-  * Fixed more problems in wmtime.1
-  * Add a Debian menu entry for WMTime.
-
- -- Simon Law   Wed, 26 Nov 2003 23:16:11 -0500
-
-wmtime (1.0b2-7) unstable; urgency=low
-
-  * Corrected some usage information.
-  * Fixed some problems in wmtime.1
-
- -- Simon Law   Thu, 13 Nov 2003 01:29:24 -0500
-
-wmtime (1.0b2-6) unstable; urgency=low
-
-  * New maintainer.
-  * Added a manual page for wmtime.  It was inspired by Adriaan Peeters'
-work.  (Closes: Bug#181684)
-  * Added the -geometry option.  (Closes: Bug#182278, Bug#212426)
-  * Added the -noseconds option.  (Closes: Bug#25438)
-  * Fixed some buffer overflow problems.
-
- -- Simon Law   Thu, 09 Oct 2003 17:52:34 -0400
-
-wmtime (1.0b2-5) unstable; urgency=low
-
-  * Forgot to update menu entry with new path (closes: #142461)
-
- -- Fredrik Hallenberg   Fri, 12 Apr 2002 17:58:04 +0200
-
-wmtime (1.0b2-4) unstable; urgency=low
-
-  * Install in /usr/bin instead of /usr/X11R6/bin (closes: #122023)
-  * Recompile fixes dependencies (closes: #132386)
-
- -- Fredrik Hallenberg   Thu, 11 Apr 2002 18:20:07 +0200
-
-wmtime (1.0b2-3) frozen unstable; urgency=low
-
-  * Fixed monthname (NOV instead of NOW).
-  * Added menu entry. (closes: #51996)
-  * Bumped standards revision to 3.1.1.
-
- -- Fredrik Hallenberg   Sun,  6 Feb 2000 21:01:55 +0100
-
-wmtime (1.0b2-2) unstable; urgency=low
-
-  * WMTime didn't work properly with -digital flag. (closes: #31869)
-
- -- Fredrik Hallenberg   Mon,  5 Jul 1999 09:32:59 +0200
-
-wmtime (1.0b2-1) unstable; urgency=low
-
-  * Initial Release.
-
- -- Fredrik Hallenberg   Wed, 15 Jul 1998 18:18:07 +0200
diff --git a/wmtime/debian/compat b/wmtime/debian/compat
deleted file mode 100644
index b8626c4..000
--- a/wmtime/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-4
diff --git a/wmtime/debian/control b/wmtime/debian/control
deleted file mode 100644
index 16498db..000
--- a/wmtime/debian/control
+++ /dev/null
@@ -1,21 +0,0 @@
-Source: wmtime
-Section: x11
-Priority: optional
-Maintainer: Paul Harris 
-Build-Depends: debhelper (>= 7), libx11-dev, libxpm-dev, libxext-dev
-Standards-Version: 3.8.0
-
-Package: wmtime
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: Window Maker dockapp that displays the time and date
- WMTime displays the time and date and gives you some nice additional 
- features too.  It is intended for docking in Window Maker.
- .
- It currently provides:
- .
-   * the time and date;
-   * a realtime morphing interface (analog <> digital mode);
-   * auto-scaled and anti-aliased hands;
-   * localization: displaying the day and date in various languages;
-   * three user-defined commands to launch.
diff --git a/wmtime/debian/copyright b/wmtime/debian/copyright
dele

Re: Patch for wmtime in dockapps repo, new Debian maintainer

2013-09-22 Thread Rodolfo García Peñas
On Sun, 22 Sep 2013, Torrance, Douglas escribió:

> Hi everyone,
> 
> I've attached a patch for wmtime in the dockapps repo.  It came from
> John Paul Adrian Glaubitz, who recently helped me adopt the Debian
> package.  (I'm the guy who originally said he'd adopt wmtime.  It took
> me a while, but I did it!)
> 
> I've also adopted wmclock and am in the process of adopting wmsystemtray
> (which is currently not in Debian).  I know kix has a long list of
> orphaned dockapps, and as I get more comfortable with packaging, I plan
> on adopting some more.

Hi,

if I can help you with something, write me.
 
> I have a question, as well.  Should I be submitting patches for changes
> to the debian directory?  Should we even have debian directories in git?

Some time ago we agree to remove the debian directory in the dockapps. The 
debian folder in wmaker is used to create the Debian package and create the 
nightly build package.

Cheers,
kix
 
> Thanks,
> Doug
> 
> 

> From 6a5337d242bf11f6be53ce8cc6a6ddd48a0851c5 Mon Sep 17 00:00:00 2001
> From: Doug Torrance 
> Date: Sun, 22 Sep 2013 09:49:01 -0500
> Subject: [PATCH] wmtime - Fix compiler and linker flags in Makefile.
> 
> The Makefile of wmtime had to be patched in order for CFLAGS
> not to be redefined by the Makefile but to use the CFLAGS
> passed by debhelper and add additional flags through
> string concatenation. LDFLAGS and CPPFLAGS weren't passed
> at all and have been added to the linker command line.
> 
> Patch by John Paul Adrian Glaubitz ,
> from Debian package.
> ---
>  wmtime/wmtime/Makefile | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/wmtime/wmtime/Makefile b/wmtime/wmtime/Makefile
> index 26b8571..a1c3c58 100755
> --- a/wmtime/wmtime/Makefile
> +++ b/wmtime/wmtime/Makefile
> @@ -7,13 +7,13 @@ OBJS =  wmtime.o \
>  XPMS = wmtime-master.xpm wmtime-mask.xbm
>  
>  CC = gcc
> -CFLAGS = -O2
> +CFLAGS += -O2
>  
>  .c.o:
> - $(CC) $(CFLAGS) -c -Wall $< -o $*.o
> + $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -c -Wall $< -o $*.o
>  
>  wmtime: $(OBJS) $(XPMS)
> - $(CC) $(CFLAGS) -o wmtime $(OBJS) $(LIBDIR) $(LIBS)
> + $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o wmtime $(OBJS) $(LIBDIR) 
> $(LIBS)
>  
>  clean::
>   for i in $(OBJS) ; do \
> -- 
> 1.8.1.2
> 


-- 
To unsubscribe, send mail to wmaker-dev-unsubscr...@lists.windowmaker.org.