Bug#369068: diff for 2001.08.13-4 NMU

2006-07-15 Thread Amaya
Jari Aalto wrote:
> The package is in my sonsor's queue.

But I did upload my NMU, so please work from there, and add yourself to
the Maintainers field.

-- 
 .''`. Fuck your fascist beauty standards
: :' :   
`. `'   Proudly running unstable Debian GNU/Linux
  `- www.amayita.com  www.malapecora.com  www.chicasduras.com


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]



Bug#369068: diff for 2001.08.13-4 NMU

2006-07-15 Thread Jari Aalto
| 
| Package: fvwm-icons
| Version: 2001.08.13-3
| Severity: normal
| Tags: patch
| 
| Hi,
| 
| Attached is the diff for my fvwm-icons 2001.08.13-4 NMU.
| +
| +  * QA upload.
| +  * Changed the maintainer field to the QA Team, s this package is
| +orphaned and the ITA looks quiet

Thanks,

The package is in my sonsor's queue.

Jari


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]



Bug#369068: diff for 2001.08.13-4 NMU

2006-07-14 Thread Amaya
Package: fvwm-icons
Version: 2001.08.13-3
Severity: normal
Tags: patch

Hi,

Attached is the diff for my fvwm-icons 2001.08.13-4 NMU.

-- 
 .''`. Fuck your fascist beauty standards
: :' :   
`. `'   Proudly running unstable Debian GNU/Linux
  `- www.amayita.com  www.malapecora.com  www.chicasduras.com
diff -u fvwm-icons-2001.08.13/debian/dirs fvwm-icons-2001.08.13/debian/dirs
--- fvwm-icons-2001.08.13/debian/dirs
+++ fvwm-icons-2001.08.13/debian/dirs
@@ -1 +1 @@
-usr/X11R6/include/X11/pixmaps
+usr/include/X11/pixmaps
diff -u fvwm-icons-2001.08.13/debian/control 
fvwm-icons-2001.08.13/debian/control
--- fvwm-icons-2001.08.13/debian/control
+++ fvwm-icons-2001.08.13/debian/control
@@ -4,10 +4,14 @@
-Maintainer: Alexander Kotelnikov <[EMAIL PROTECTED]>
-Build-Depends-Indep: debhelper (>> 3.0.0)
-Standards-Version: 3.5.2
+Maintainer: Debian QA Group <[EMAIL PROTECTED]>
+Build-Depends: debhelper (>= 4)
+Standards-Version: 3.7.2
 
 Package: fvwm-icons
 Architecture: all
+Pre-Depends: x11-common (>= 1:7.0.0)
 Conflicts: fvwm-common
 Replaces: fvwm-common
 Description: XPMs for fvwm
- Miscellaneous icons in XPM fromat from fvwm.
+ FVWM is a powerful ICCCM2 compliant multiple virtual desktop window manager
+ for the X Window System. FVWM requires relatively little memory.
+ .
+ This package contains miscellaneous icons for fvwm in XPM format.
diff -u fvwm-icons-2001.08.13/debian/rules fvwm-icons-2001.08.13/debian/rules
--- fvwm-icons-2001.08.13/debian/rules
+++ fvwm-icons-2001.08.13/debian/rules
@@ -6,14 +6,12 @@
 #export DH_VERBOSE=1
 
 # This is the debhelper compatability version to use.
-export DH_COMPAT=2
+export DH_COMPAT=4
 
 configure: configure-stamp
 configure-stamp:
dh_testdir
# Add here commands to configure the package.
-   
-
touch configure-stamp
 
 build: configure-stamp build-stamp
@@ -43,11 +41,11 @@
dh_installdirs
 
# Add here commands to install the package into debian/fvwm-icons.
-   install -d debian/tmp/usr/X11R6/include/X11/pixmaps
-   install --mode=644 *.xpm debian/tmp/usr/X11R6/include/X11/pixmaps/
-   install --mode=644 debian/addons/*.xpm 
debian/tmp/usr/X11R6/include/X11/pixmaps/
-   mv debian/tmp/usr/X11R6/include/X11/pixmaps/keyboard.xpm\
-  debian/tmp/usr/X11R6/include/X11/pixmaps/keyboard2.xpm
+   install -d debian/fvwm-icons/usr/include/X11/pixmaps
+   install --mode=644 *.xpm debian/fvwm-icons/usr/include/X11/pixmaps/
+   install --mode=644 debian/addons/*.xpm 
debian/fvwm-icons/usr/include/X11/pixmaps/
+   mv debian/fvwm-icons/usr/include/X11/pixmaps/keyboard.xpm\
+  debian/fvwm-icons/usr/include/X11/pixmaps/keyboard2.xpm
 
 
 # Build architecture-independent files here.
@@ -59,7 +57,7 @@
 #  dh_testversion 2
dh_testdir
dh_testroot
-   dh_movefiles -pfvwm-icons usr/
+   #dh_movefiles -pfvwm-icons usr/
dh_installdocs
dh_installchangelogs 
dh_link
diff -u fvwm-icons-2001.08.13/debian/changelog 
fvwm-icons-2001.08.13/debian/changelog
--- fvwm-icons-2001.08.13/debian/changelog
+++ fvwm-icons-2001.08.13/debian/changelog
@@ -1,3 +1,16 @@
+fvwm-icons (2001.08.13-4) unstable; urgency=low
+
+  * QA upload.
+  * Changed the maintainer field to the QA Team, s this package is
+orphaned and the ITA looks quiet
+  * Get rid of the /usr/doc link in postinst (Closes: #359406).
+  * Slightly improved the description (Closes: #209482, #166755).
+  * Moved pixmaps to /usr/include/X11/pixmaps (Closes: #376733).
+  * Revamped packaging a bit. Updated Standars Version, no changes
+needed. Upgraded to DH_COMPAT 4
+
+ -- Amaya Rodrigo Sastre <[EMAIL PROTECTED]>  Fri, 14 Jul 2006 20:32:23 +0200
+
 fvwm-icons (2001.08.13-3) unstable; urgency=low
 
   * fixed package description (closes: #124654)
diff -u fvwm-icons-2001.08.13/debian/copyright 
fvwm-icons-2001.08.13/debian/copyright
--- fvwm-icons-2001.08.13/debian/copyright
+++ fvwm-icons-2001.08.13/debian/copyright
@@ -8 +8,6 @@
-Copyright: GPL
+Copyright:
+
+This program is under the GPLv2.
+On Debian systems, the complete text of the GNU General Public License can be
+found in `/usr/share/common-licenses/GPL'.
+
only in patch2:
unchanged:
--- fvwm-icons-2001.08.13.orig/debian/postinst
+++ fvwm-icons-2001.08.13/debian/postinst
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+if [ "$1" = "configure" ]; then
+if [ -d /usr/doc -a -h /usr/doc/fvwm-icons -a -d 
/usr/share/doc/fvwm-icons ]; then
+rm -f /usr/doc/fvwm-icons
+fi
+fi
+
+#DEBHELPER#