Bug#368284: still uses X11R6 directories

2006-05-24 Thread GOTO Masanori
Dear Frank,

Great, thanks for your change, I'll upload it with applying your fix
after tests.

Thanks,
-- gotom

At Sun, 21 May 2006 01:56:58 -0500,
Frank Lichtenheld wrote:
 
 Package: xipmsg
 Severity: serious
 Tags: patch
 
 This is a policy violation now.
 
 Patch (despite changelog entry not intended for immediate upload):
 diff -Naur xipmsg-0.8088/debian/changelog xipmsg-0.8088.nmu/debian/changelog
 --- xipmsg-0.8088/debian/changelog2006-05-21 00:34:55.0 -0500
 +++ xipmsg-0.8088.nmu/debian/changelog2006-05-21 01:52:50.0 
 -0500
 @@ -1,3 +1,15 @@
 +xipmsg (0.8088-1.2) unstable; urgency=low
 +
 +  * Non-maintainer upload.
 +  * Adapt menu file and XIpmsg_jp.ad to new location of files after
 +rebuild with new Xorg.
 +  * Change build-depends on xutils to xutils-dev
 +  * Add Pre-Depends on x11-common since we still use /usr/lib/X11
 +  * Delete debian/conffiles because debhelper actually takes care
 +of that for us
 +
 + -- Frank Lichtenheld [EMAIL PROTECTED]  Sun, 21 May 2006 01:50:16 -0500
 +
  xipmsg (0.8088-1.1) unstable; urgency=high
  
* Non-maintainer upload.
 diff -Naur xipmsg-0.8088/debian/conffiles xipmsg-0.8088.nmu/debian/conffiles
 --- xipmsg-0.8088/debian/conffiles2006-05-21 00:34:55.0 -0500
 +++ xipmsg-0.8088.nmu/debian/conffiles1969-12-31 18:00:00.0 
 -0600
 @@ -1,2 +0,0 @@
 -/etc/X11/app-defaults/XIpmsg
 -/etc/X11/ja_JP.eucJP/app-defaults/XIpmsg
 diff -Naur xipmsg-0.8088/debian/control xipmsg-0.8088.nmu/debian/control
 --- xipmsg-0.8088/debian/control  2006-05-21 00:34:55.0 -0500
 +++ xipmsg-0.8088.nmu/debian/control  2006-05-21 01:30:56.0 -0500
 @@ -2,11 +2,12 @@
  Section: x11
  Priority: optional
  Maintainer: GOTO Masanori [EMAIL PROTECTED]
 -Build-Depends: debhelper (= 4.0.0), xutils, libx11-dev, libxt-dev, x-dev, 
 libxaw7-dev
 +Build-Depends: debhelper (= 4.0.0), xutils-dev, libx11-dev, libxt-dev, 
 x-dev, libxaw7-dev
  Standards-Version: 3.6.0
  
  Package: xipmsg
  Architecture: any
 +Pre-Depends: x11-common (= 1:7.0.0)
  Depends: ${shlibs:Depends}, ${misc:Depends}
  Description: A pop up style message communication software
   IP Messenger is a pop up style message communication software
 diff -Naur xipmsg-0.8088/debian/dirs xipmsg-0.8088.nmu/debian/dirs
 --- xipmsg-0.8088/debian/dirs 2006-05-21 00:34:55.0 -0500
 +++ xipmsg-0.8088.nmu/debian/dirs 2006-05-21 00:40:34.0 -0500
 @@ -1,8 +1,4 @@
  etc/X11/app-defaults
  etc/X11/ja_JP.eucJP/app-defaults
 -etc/X11
 -usr/X11R6/bin
 -usr/X11R6/lib/X11/xipmsg
 -usr/X11R6/man/man1
  usr/lib/menu
  usr/share/doc/xipmsg
 diff -Naur xipmsg-0.8088/debian/menu xipmsg-0.8088.nmu/debian/menu
 --- xipmsg-0.8088/debian/menu 2006-05-21 00:34:55.0 -0500
 +++ xipmsg-0.8088.nmu/debian/menu 2006-05-21 00:35:28.0 -0500
 @@ -1,2 +1,2 @@
  ?package(xipmsg):needs=x11 section=Apps/Net\
 - title=xipmsg command=/usr/X11R6/bin/xipmsg
 + title=xipmsg command=/usr/bin/xipmsg
 diff -Naur xipmsg-0.8088/debian/rules xipmsg-0.8088.nmu/debian/rules
 --- xipmsg-0.8088/debian/rules2006-05-21 00:34:55.0 -0500
 +++ xipmsg-0.8088.nmu/debian/rules2006-05-21 01:45:54.0 -0500
 @@ -33,7 +33,7 @@
   # Add here commands to compile the package.
   xmkmf -a
   $(MAKE)
 - sed 's!XIPM_XBMDIR!/usr/X11R6/lib/X11/xipmsg!g' XIpmsg_jp.ad.in  
 XIpmsg_jp.ad
 + sed 's!XIPM_XBMDIR!/usr/lib/X11/xipmsg!g' XIpmsg_jp.ad.in  XIpmsg_jp.ad
  
   touch build-stamp
  
 
 Gruesse,
   Frank Lichtenheld
 
 -- System Information:
 Debian Release: testing/unstable
   APT prefers unstable
   APT policy: (990, 'unstable'), (1, 'experimental')
 Architecture: powerpc (ppc)
 Shell:  /bin/sh linked to /bin/bash
 Kernel: Linux 2.6.16-1-powerpc
 Locale: LANG=de_DE.UTF-8, LC_CTYPE=de_DE.UTF-8 (charmap=UTF-8)
 


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



Bug#368284: still uses X11R6 directories

2006-05-21 Thread Frank Lichtenheld
Package: xipmsg
Severity: serious
Tags: patch

This is a policy violation now.

Patch (despite changelog entry not intended for immediate upload):
diff -Naur xipmsg-0.8088/debian/changelog xipmsg-0.8088.nmu/debian/changelog
--- xipmsg-0.8088/debian/changelog  2006-05-21 00:34:55.0 -0500
+++ xipmsg-0.8088.nmu/debian/changelog  2006-05-21 01:52:50.0 -0500
@@ -1,3 +1,15 @@
+xipmsg (0.8088-1.2) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Adapt menu file and XIpmsg_jp.ad to new location of files after
+rebuild with new Xorg.
+  * Change build-depends on xutils to xutils-dev
+  * Add Pre-Depends on x11-common since we still use /usr/lib/X11
+  * Delete debian/conffiles because debhelper actually takes care
+of that for us
+
+ -- Frank Lichtenheld [EMAIL PROTECTED]  Sun, 21 May 2006 01:50:16 -0500
+
 xipmsg (0.8088-1.1) unstable; urgency=high
 
   * Non-maintainer upload.
diff -Naur xipmsg-0.8088/debian/conffiles xipmsg-0.8088.nmu/debian/conffiles
--- xipmsg-0.8088/debian/conffiles  2006-05-21 00:34:55.0 -0500
+++ xipmsg-0.8088.nmu/debian/conffiles  1969-12-31 18:00:00.0 -0600
@@ -1,2 +0,0 @@
-/etc/X11/app-defaults/XIpmsg
-/etc/X11/ja_JP.eucJP/app-defaults/XIpmsg
diff -Naur xipmsg-0.8088/debian/control xipmsg-0.8088.nmu/debian/control
--- xipmsg-0.8088/debian/control2006-05-21 00:34:55.0 -0500
+++ xipmsg-0.8088.nmu/debian/control2006-05-21 01:30:56.0 -0500
@@ -2,11 +2,12 @@
 Section: x11
 Priority: optional
 Maintainer: GOTO Masanori [EMAIL PROTECTED]
-Build-Depends: debhelper (= 4.0.0), xutils, libx11-dev, libxt-dev, x-dev, 
libxaw7-dev
+Build-Depends: debhelper (= 4.0.0), xutils-dev, libx11-dev, libxt-dev, x-dev, 
libxaw7-dev
 Standards-Version: 3.6.0
 
 Package: xipmsg
 Architecture: any
+Pre-Depends: x11-common (= 1:7.0.0)
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: A pop up style message communication software
  IP Messenger is a pop up style message communication software
diff -Naur xipmsg-0.8088/debian/dirs xipmsg-0.8088.nmu/debian/dirs
--- xipmsg-0.8088/debian/dirs   2006-05-21 00:34:55.0 -0500
+++ xipmsg-0.8088.nmu/debian/dirs   2006-05-21 00:40:34.0 -0500
@@ -1,8 +1,4 @@
 etc/X11/app-defaults
 etc/X11/ja_JP.eucJP/app-defaults
-etc/X11
-usr/X11R6/bin
-usr/X11R6/lib/X11/xipmsg
-usr/X11R6/man/man1
 usr/lib/menu
 usr/share/doc/xipmsg
diff -Naur xipmsg-0.8088/debian/menu xipmsg-0.8088.nmu/debian/menu
--- xipmsg-0.8088/debian/menu   2006-05-21 00:34:55.0 -0500
+++ xipmsg-0.8088.nmu/debian/menu   2006-05-21 00:35:28.0 -0500
@@ -1,2 +1,2 @@
 ?package(xipmsg):needs=x11 section=Apps/Net\
-   title=xipmsg command=/usr/X11R6/bin/xipmsg
+   title=xipmsg command=/usr/bin/xipmsg
diff -Naur xipmsg-0.8088/debian/rules xipmsg-0.8088.nmu/debian/rules
--- xipmsg-0.8088/debian/rules  2006-05-21 00:34:55.0 -0500
+++ xipmsg-0.8088.nmu/debian/rules  2006-05-21 01:45:54.0 -0500
@@ -33,7 +33,7 @@
# Add here commands to compile the package.
xmkmf -a
$(MAKE)
-   sed 's!XIPM_XBMDIR!/usr/X11R6/lib/X11/xipmsg!g' XIpmsg_jp.ad.in  
XIpmsg_jp.ad
+   sed 's!XIPM_XBMDIR!/usr/lib/X11/xipmsg!g' XIpmsg_jp.ad.in  XIpmsg_jp.ad
 
touch build-stamp
 

Gruesse,
Frank Lichtenheld

-- System Information:
Debian Release: testing/unstable
  APT prefers unstable
  APT policy: (990, 'unstable'), (1, 'experimental')
Architecture: powerpc (ppc)
Shell:  /bin/sh linked to /bin/bash
Kernel: Linux 2.6.16-1-powerpc
Locale: LANG=de_DE.UTF-8, LC_CTYPE=de_DE.UTF-8 (charmap=UTF-8)


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