Bug#494033: xpp: diff for NMU version 1.5-cvs20050828-1.1

2010-02-22 Thread Christoph Egger
Dear maintainer,

I've prepared an NMU for xpp (versioned as 1.5-cvs20050828-1.1) and
uploaded it to DELAYED/2. Please feel free to tell me if I
should delay it longer.

Regards.

-- 
/\  ASCII Ribbon : GPG-Key ID: 0xD49AE731
\ /Campaign   : CaCert Assurer
 X   against HTML : Debian Maintainer
/ \   in eMails   : http://www.debian.org/

http://www.christoph-egger.org/
diff -u xpp-1.5-cvs20050828/xpp.h xpp-1.5-cvs20050828/xpp.h
--- xpp-1.5-cvs20050828/xpp.h
+++ xpp-1.5-cvs20050828/xpp.h
@@ -83,9 +83,9 @@
   const char*STDIN_STR; /* Key word representing standard
input in 'filelist' */
   int		job_id;		/* Job ID */
-  const char	*dest;		/* Destination printer */
+  char	*dest;		/* Destination printer */
   const char	*instance;	/* instance of destination printer */
-  const char*default_pr;/* Default printer defined under CUPS */
+  char*default_pr;/* Default printer defined under CUPS */
   int   dest_pos;   /* Position of destination entry in list */
   const char	*title;		/* Job title */
   const char*extra_options; /* Extra options */
diff -u xpp-1.5-cvs20050828/debian/menu xpp-1.5-cvs20050828/debian/menu
--- xpp-1.5-cvs20050828/debian/menu
+++ xpp-1.5-cvs20050828/debian/menu
@@ -1,4 +1,4 @@
-?package(xpp):needs=X11 section=Apps/Tools\
+?package(xpp):needs=X11 section=Applications/System/Hardware\
   title=X Printing Panel command=/usr/bin/xpp\
   icon=/usr/share/pixmaps/xpp.xpm \
   hints=Printing,Printer,Print,CUPS
diff -u xpp-1.5-cvs20050828/debian/control xpp-1.5-cvs20050828/debian/control
--- xpp-1.5-cvs20050828/debian/control
+++ xpp-1.5-cvs20050828/debian/control
@@ -5,14 +5,13 @@
-Build-Depends: debhelper ( 5), libfltk1.1-dev, fluid (= 1.1.6-7), libcupsys2-dev (= 1.1.20final+cvs20040330-4), cupsys, autotools-dev
+Build-Depends: debhelper ( 5), libfltk1.1-dev, fluid (= 1.1.6-7), libcups2-dev (= 1.1.20final+cvs20040330-4), cups, autotools-dev
 Standards-Version: 3.7.2
+Homepage: http://cups.sourceforge.net/xpp/
 
 Package: xpp
 Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Conflicts: iraf
 Description: X Printing Panel
  Graphical substitute for the lp/lpr command.  With xpp, you can control
- every printing option known to the CUPS print system (the cupsys package).
+ every printing option known to the CUPS print system (the cups package).
  Best results are available with usage of the appropriate PPD file for your
  printer.  Each user can save their own customized printing preferences.
- .
-  Homepage: http://cups.sourceforge.net/xpp/
diff -u xpp-1.5-cvs20050828/debian/changelog xpp-1.5-cvs20050828/debian/changelog
--- xpp-1.5-cvs20050828/debian/changelog
+++ xpp-1.5-cvs20050828/debian/changelog
@@ -1,3 +1,22 @@
+xpp (1.5-cvs20050828-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+
+  [ Stefano Zacchiroli ]
+  * Replace (build-)deps on old libcupsys2(-dev) to new libcups2(-dev),
+the former packages are now dummy packages (Closes: #494033). Do the
+same for cupsys vs cups
+  * debian/contorl: remove the old pseudo-field homepage in description
+with the proper Homepage field
+
+  [ Christoph Egger ]
+  * Fix package building (conversion from const char * to char*)
+  * Add misc:Depends substvar
+  * Change menu section from Apps/Tools to Applications/System/Hardware
+  * Fix watchfile using sf redirector
+
+ -- Christoph Egger christ...@debian.org  Mon, 22 Feb 2010 10:29:25 +0100
+
 xpp (1.5-cvs20050828-1) unstable; urgency=low
 
   * The it gathered enough dust already release
diff -u xpp-1.5-cvs20050828/debian/watch xpp-1.5-cvs20050828/debian/watch
--- xpp-1.5-cvs20050828/debian/watch
+++ xpp-1.5-cvs20050828/debian/watch
@@ -2 +2 @@
-http://prdownloads.sourceforge.net/cups/ (?:.*/)?xpp-(.*)\.tar\.(?:gz|bz2) debian false
+http://sf.net/cups/ (?:.*/)?xpp-(.*)\.tar\.(?:gz|bz2) debian false


Bug#494033: xpp: diff for NMU version 1.5-cvs20050828-1.1

2010-02-22 Thread Henrique de Moraes Holschuh
On Mon, 22 Feb 2010, Christoph Egger wrote:
 I've prepared an NMU for xpp (versioned as 1.5-cvs20050828-1.1) and
 uploaded it to DELAYED/2. Please feel free to tell me if I
 should delay it longer.

No need to delay.  Thanks for fixing the more pressing issues, and for the
NMU.

-- 
  One disk to rule them all, One disk to find them. One disk to bring
  them all and in the darkness grind them. In the Land of Redmond
  where the shadows lie. -- The Silicon Valley Tarot
  Henrique Holschuh



-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org