Package: usermode Version: 1.81-3.1 Severity: important Please find attched the diff file.
Aníbal Monsalve Salazar -- http://v7w.com/anibal
interdiff -z -p1 ../usermode_1.81-3.diff.gz ../usermode_1.81-3.1.diff.gz
diff -u usermode-1.81/debian/changelog usermode-1.81/debian/changelog
--- usermode-1.81/debian/changelog
+++ usermode-1.81/debian/changelog
@@ -1,3 +1,13 @@
+usermode (1.81-3.1) unstable; urgency=low
+
+ * NMU.
+ * Fixed "FTBFS: error: Categories values must be one of ...".
+ Patch by Ana Guerrero <[EMAIL PROTECTED]>. Closes: #378026.
+ * Fixed "FTBFS: bashisms". Patch by Jonas Meyer <[EMAIL PROTECTED]>.
+ Closes: #374911.
+
+ -- Anibal Monsalve Salazar <[EMAIL PROTECTED]> Fri, 18 Aug 2006 16:20:19
+1000
+
usermode (1.81-3) unstable; urgency=low
* replaced xlibs-dev build-dep with libice-dev and libsm-dev, closes:
#346943.
diff -u usermode-1.81/debian/rules usermode-1.81/debian/rules
--- usermode-1.81/debian/rules
+++ usermode-1.81/debian/rules
@@ -5,7 +5,7 @@
pngtopnm $< | pnmscale -xysize 32 32 | ppmtoxpm -alphamask=alpha.pnm >
$@
rm alpha.pnm
clean:
- rm -rf build debian/{tmp,files,substvars} autom4te.cache
{user_icon,password,disks}.xpm
+ rm -rf build debian/tmp debian/files debian/substvars autom4te.cache
user_icon.xpm password.xpm disks.xpm
-$(MAKE) distclean
build:
./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE)
--prefix=/usr --sysconfdir=/etc --mandir=/usr/share/man
@@ -15,13 +15,13 @@
rm -rf debian/tmp
$(MAKE) install DESTDIR=$(DESTDIR)
# this functionality doesn't appear to be supported in Debian
- rm debian/tmp/usr/{bin/pam-panel-icon,share/pixmaps/badge-small.png}
+ rm debian/tmp/usr/bin/pam-panel-icon
debian/tmp/usr/share/pixmaps/badge-small.png
# can't figure out what the hell this stuff is for
- rm
debian/tmp/usr/share/pixmaps/{keys.xpm,status_lock.png,status_unlocked.png}
+ rm debian/tmp/usr/share/pixmaps/keys.xpm
debian/tmp/usr/share/pixmaps/status_lock.png
debian/tmp/usr/share/pixmaps/status_unlocked.png
# this is superfluous
- rm -r debian/tmp/{etc,usr/bin/shutdown}
+ rm -r debian/tmp/etc debian/tmp/usr/bin/shutdown
chmod 04755 debian/tmp/usr/sbin/userhelper
- -strip --strip-unneeded -R .comment debian/tmp/usr/{,s}bin/*
+ -strip --strip-unneeded -R .comment debian/tmp/usr/sbin/*
debian/tmp/usr/bin/*
install -m 644 debian/consolehelper-gtk.8 debian/tmp/usr/share/man/man8
-gzip -9 debian/tmp/usr/share/man/*/*
install -m 644 user_icon.xpm password.xpm disks.xpm
debian/tmp/usr/share/pixmaps
only in patch2:
unchanged:
--- usermode-1.81.orig/Makefile.in
+++ usermode-1.81/Makefile.in
@@ -1086,21 +1086,18 @@
install-data-local: userinfo.desktop usermount.desktop userpasswd.desktop
mkdir -p $(DESTDIR)/$(datadir)/applications
desktop-file-install --vendor=$(VENDOR) \
- --add-category Settings \
- --add-category AdvancedSettings \
- --add-category Application \
+ --add-category Utility \
+ --add-category System \
--dir=$(DESTDIR)/$(datadir)/applications \
$(top_builddir)/userinfo.desktop
desktop-file-install --vendor=$(VENDOR) \
- --add-category X-Red-Hat-Base \
+ --add-category Utility \
--add-category System \
- --add-category Application \
--dir=$(DESTDIR)/$(datadir)/applications \
$(top_builddir)/usermount.desktop
desktop-file-install --vendor=$(VENDOR) \
- --add-category X-Red-Hat-Base \
- --add-category Settings \
- --add-category Application \
+ --add-category Utility \
+ --add-category System \
--dir=$(DESTDIR)/$(datadir)/applications \
$(top_builddir)/userpasswd.desktop
signature.asc
Description: Digital signature
