bugsaction
23545
Comment:
|
23639
|
Deletions are marked like this. | Additions are marked like this. |
Line 6: | Line 6: |
== sgt-puzzle: netslide desktop file executes wrong command == straightforward correction |
Actions made to correct bugs
This page has been written to have a trace about the correction of the packages I have done yet.
sgt-puzzle: netslide desktop file executes wrong command
straightforward correction
update pygoocanvas
straightforward update
update gnome-volume-manager
- Same as above
- some patch don't apply:
- same method as below (adapt each patch)
- cdbs-edit-patch ... and compare with .rej file
- - src/manager.c all depends now on #ifdef ENABLE_AUTOMOUNT
- - src/properties.c
=> All depends on this #define automount
- 02_fix_autokeyboard_gconf.patch: adapt to the new src/manager.c with #ifdef ENABLE_AUTOMOUNT structure
- 08_fix_scanner_support.patch: deleted as applied upstreamcd .
- - src/manager.c all depends now on #ifdef ENABLE_AUTOMOUNT
update gnome-spell
File: gnome-spell-1.0.8-0ubuntu1 Uploaded by seb128
- when uncompressing new data:
didrocks@DidSCU:~/packaging/gnome-spell/gnome-spell-1.0.8$ zcat ../gnome-spell_1.0.7-1ubuntu2.diff.gz | patch -p1 patching file config.guess Reversed (or previously applied) patch detected! Assume -R? [n] Apply anyway? [n] Skipping patch. 16 out of 16 hunks ignored -- saving rejects to file config.guess.rej patching file config.sub Reversed (or previously applied) patch detected! Assume -R? [n] Apply anyway? [n] Skipping patch. 20 out of 20 hunks ignored -- saving rejects to file config.sub.rej ...
- comparing them between old source and new one:
diff config.guess ../gnome-spell-1.0.7/config.guess => no diff
diff config.sub ../gnome-spell-1.0.7/config.sub => no diff
=> those configuration file are produced by debian autotools. Do not touch them
- rm *.rej
...
- dch -i
...
update goocanvas
Same as below
Some patch aren't applied so dpatch-edit-patch (as it uses dpatch) and compare with the .rej what has be to be updated
update nautilus-python
File: nautilus-python-0.5.1-0ubuntu1 Uploaded by geser
- get old package
- apt-get source nautilus-python
lsdiff -z ...diff.gz => in debian/ and in src/
- get, rename and extract the new source package:
wget http://download.gnome.org/sources/nautilus-python/0.5/nautilus-python-0.5.1.tar.gz=
- mv nautilus-python-0.5.1.tar.gz nautilus-python_0.5.1.orig.tar.gz
- tar xvf nautilus-python_0.5.1.orig.tar.gz
- cd nautilus-python-0.5.1
- Applying the diff:
- zcat ../nautilus-python_0.5.0-0ubuntu3.diff.gz | patch -p1
- dch -i
- change version
- read the NEWS to specify what's new on the new upstream release
changes in patch :
- 01_fix-extension-directory.patch deleted: replacement of nautilus extensions dir with upstream one (@NAUTILUS_EXTENSION_DIR@)
- debian/control is ok
- debuild -S
- debian/rules:7: /usr/share/gnome-pkg-tools/1/rules/uploaders.mk: Aucun fichier ou dossier de ce type
- install gnome-pkg-tools
- sudo pbuilder…
backport ufw 0.22/iptable to hardy. Bug #268931
- Dependencies:
Build-Depends-Indep: python-central (>= 0.5.6), sed (>= 3.95), netbase, po-debconf Depends: debconf, ${python:Depends}, iptables (>= 1.4.0), ucf
All are ok, but iptable (1.3.8 in hardy) -> have to backport iptable.
- apt-cache rdepends ufw
-> ubuntu-standard (metapackage). Ok.
- apt-cache rdepends iptables
for each rdepends:
for i in $(cat toto) do echo $i": "$(apt-cache show $i | grep iptables | grep "<") done
=>
util-vserver: uruk: uif: specter: shorewall-lite: shaperd: pyroman: psad: p3scan: network-config: netscript-2.4: lokkit: libabz0: kvpnc: knetfilter: ipset: ipmasq: Conflicts: iptables (<< 1.2.1-1) ipkungfu: heartbeat: guidedog: grml-btnet: gpe-shield: fwanalog: firestarter: firehol: fiaif: ferm: fail2ban: education-thin-client-server: education-main-server: ebtables: ebox-network: Depends: dhcp3-client, dnsutils, ebox (>= 0.11.99), ebox (<< 0.12), ebox-objects, gconf2 (>= 2.10.1-2), iproute, iptables, jnettop, libnet-arp-perl, libnet-ip-perl, librrds-perl, net-tools, rrdtool, vlan ebox-firewall: Depends: ebox (>= 0.11.99), ebox (<< 0.12), ebox-network, ebox-objects, ebox-services, gconf2 (>= 2.10.1-2), iptables arno-iptables-firewall: ubuntu-standard: shorewall-common: ppp: libvirt-bin:
=> Seems ok.
- So, we have to try to compile iptables and ufw.
dch -e intrepid -> hardy
- sudo DIST=hardy pbuilder build iptables...dsc
cc -g -O2 -Wall -Wunused -I/usr/include -I/usr/include -Iinclude/ -DIPTABLES_VERSION=\"1.4.0\" -c -o libiptc/libip6tc.o libiptc/libip6tc.c libiptc/libip6tc.c: In function 'ipv6_prefix_length': libiptc/libip6tc.c:123: error: 'const struct in6_addr' has no member named '__in6_u' libiptc/libip6tc.c:127: error: 'const struct in6_addr' has no member named '__in6_u' make[1]: *** [libiptc/libip6tc.o] Error 1 rm libiptc/libip4tc.o make[1]: Leaving directory `/tmp/buildd/iptables-1.4.0/debian/build/iptables' make: *** [build] Error 2 dpkg-buildpackage: failure: debian/rules build gave error exit status 2 pbuilder: Failed autobuilding of package -> Aborting with an error
FTBFS.
No change in the source libiptc/libip6tc.c from hardy to intrepid:
ipv6_prefix_length(const struct in6_addr *a) { int l, i; for (l = 0; l < 128; l++) { if (BIT6(a, l) == 0) break; } for (i = l + 1; i < 128; i++) { if (BIT6(a, i) == 1) return -1; } return l; }
BIT6 #define has not changed neither
in http://ou800doc.caldera.com/en/SDK_netapi/sockC.TheIPv6sockaddrstructure.html found that the structure is declared at: netinet/in.h
in hardy:
struct in6_addr { union { uint8_t u6_addr8[16]; uint16_t u6_addr16[8]; uint32_t u6_addr32[4]; } in6_u; #define s6_addr in6_u.u6_addr8 #define s6_addr16 in6_u.u6_addr16 #define s6_addr32 in6_u.u6_addr32 };
- dpkg -S /usr/include/netinet/in.h
-> libc6-dev
in intrepid:
/* IPv6 address */ struct in6_addr { union { uint8_t __u6_addr8[16]; #if defined __USE_MISC || defined __USE_GNU uint16_t __u6_addr16[8]; uint32_t __u6_addr32[4]; #endif } __in6_u; #define s6_addr __in6_u.__u6_addr8 #if defined __USE_MISC || defined __USE_GNU # define s6_addr16 __in6_u.__u6_addr16 # define s6_addr32 __in6_u.__u6_addr32 #endif };
So, libc6 has changed and implemented in6_u instead of in6_u
As I do not want to touch libc6 (strange isn'it ? ;)). I think the idea will be to change iptables to adress in6_u instead of in6_u
- Hum sounds great:
$ grep -r __in6_u * debian/patches/0900-compile-against-linux-libc-dev.patch:+ ((ntohl(a->__in6_u.__u6_addr32[(l) / 32]) >> (31 - ((l) & 31))) & 1) debian/patches/0900-compile-against-linux-libc-dev.patch:+ addrp[j].__in6_u.__u6_addr32[k] &= maskp->__in6_u.__u6_addr32[k];
So, removing this from the patch can be helpful (and that's why we didn't see it before !), no?
-> trying to make it in a clean way: ie quilt push 0900..., but a lot of patch can't applied ! Also, some time, can't execute debuild -S successfully. Removing directly from the .patch files what has to be removed and it builds!
It builds in a hardy pbuilder! Change changelog and versionning regarding https://help.ubuntu.com/community/UbuntuBackports.
- ufw build successfully and work with it
- build iptables on my ppa
- as no source change for ufw, ask to a backporter
Add ufw rules to cups. Bug #261903
File: 1.3.8-5ubuntu4 Uploaded by jdstrand
Similar to #261198
Add ufw rules to openssh. Bug #261884
File: openssh_5.1p1-1ubuntu2 Uploaded by jdstrand
Similar to #261198
Add ufw rules to apache. Bug #261198
File: apache2_2.2.9-3ubuntu2 Uploaded by jdstrand
Collision: kees updloaded after I submitted my debdiff. Had to rebuild it
- debian/control: suggest to ufw on apache2.2-common binary packages as every packages (apache2 and its different dependencies) rely on it.
- The package uses dh_installdirs. Edit so apache2.2-common.dirs to add etc/ufw/applications.d.
- update script files:
- apache2.2-common.postinst: add only Apache rules as default install only use port 80. (just before #DEBHELPER# and exit 0)
if [ -x /usr/sbin/ufw ]; then ufw app update --add-new Apache || true fi
- apache2.2-common.postrm: in "purge" target
rm -f /etc/ufw/applications.d/apache2.2-common >/dev/null 2>&1 || true
- add debian/apache2.2-common.ufw.profile with the 3 profiles in it.
- Finally add to debian/rules to install target:
install -m644 debian/apache2.2-common.ufw.profile debian/apache2.2-common/etc/ufw/applications.d/apache2.2-common
- dch -i
* add ufw integration (see https://wiki.ubuntu.com/UbuntuFirewall#Integrating%20UFW%20with%20Packages) (LP: #261198) - debian/control: suggest ufw for apache2.2-common - add apache2.2-common.ufw.profile with 3 profiles and install it to /etc/ufw/applications.d/apache2.2-common - apache2.2-common.postinst: add Apache rules as default - apache2.2-common.postrm: remove the profile on --purge
Remove multiuser for nvidia-kernel-common. Bug #254264
File: nvidia-kernel-common_20051028+1+nmu2ubuntu1 Uploaded by tseliot & timo Accepted in debian
- grep -r multiuser *
- old in debian/rules:
dh_installinit --name=nvidia-kernel -- multiuser
- I replaced with:
dh_installinit --name=nvidia-kernel -- start 20 2 3 4 5 . stop 20 1 .
- grep -r Default-Stop *
-> Nothing
See also the change in debian/control (cf below). Remove depends on sysv-rc (>= 2.86.ds1-14.1ubuntu2)
- Assure that a debian/*.postinst exists to remove kill links in 0 et 6 status
- dch -i
- debuild -S, debdiff, pbuilder
unassigned, state -> confirmed, suscribed u-m-s (rmadison <package_name> -> nothing shown, so, it's under main section)
- have to send to upstream
Remove multiuser for nis. Bug #254262 and FTBFS #259138
- grep -r multiuser *
- old in debian/postinst:
update-rc.d nis multiuser 18 >/dev/null 2>&1
- I replaced with:
update-rc.d nis start 18 2 3 4 5 . stop 18 1 . >/dev/null 2>&1
- grep -r Default-Stop *
* debian/rc.nis:# Default-Stop: 0 1 6 -> 1 * ypbind-mt-1.20.1/etc/ypbind.init:# Default-Stop: 0 1 2 6 -> do not change it as it is on the source (and we do not want a patch for that) and not for debian/ubuntu
See also the change in debian/control (cf below). Remove depends on sysv-rc (>= 2.86.ds1-14.1ubuntu2)
- Assure that a debian/*.postinst exists to remove kill links in 0 et 6 status
- dch -i
- debuild -S, debdiff, pbuilder
-> FTBFS
unassigned, state -> confirmed, suscribed u-m-s (rmadison <package_name> -> nothing shown, so, it's under main section)
- send to upstream
Remove multiuser for lm-sensors. Bug #254259
File: lm-sensors-3_3.0.2-1ubuntu2 Uploaded by bryyce Accepted in debian
- grep -r multiuser *
- old in debian/rules:
dh_installinit -psensord -- multiuser
- I replaced with:
dh_installinit -psensord -- start 20 2 3 4 5 . stop 20 1 .
- grep -r Default-Stop *
* debian/lm-sensors.fancontrol.init:# Default-Stop: 0 1 6 -> (Not changed as fancontrol is not impacted) * debian/sensord.init:# Default-Stop: 0 1 6 -> 1 * debian/lm-sensors.lm-sensors.init:# Default-Stop: (Not changed as even Default-Start as "S" as a value instead of 2 3 4 5…) * prog/init/lm_sensors.init.suse:# Default-Stop: 0 1 2 6 (Not changed as in the source and specific to suse)
See also the change in debian/control (cf below). Remove depends on sysv-rc (>= 2.86.ds1-14.1ubuntu2) on one of the binary package
- Assure that a debian/*.postinst exists to remove kill links in 0 et 6 status
- dch -i
- debuild -S, debdiff, pbuilder
unassigned, state -> confirmed, suscribed u-m-s (rmadison <package_name> -> nothing shown, so, it's under main section)
- send to upstream
Remove multiuser for keepalived. Bug #254257
File: keepalived_1.1.15-1ubuntu2.debdiff Uploaded by StevenK
- grep -r multiuser *
- old in debian/rules:
DEB_UPDATE_RCD_PARAMS := multiuser
- This package use cdbs. I replaced with:
DEB_UPDATE_RCD_PARAMS := start 20 2 3 4 5 . stop 20 1 .
- grep -r Default-Stop *
- old in debian/init.d:
# Default-Stop: 0 1 6
- replaced with:
# Default-Stop: 1
See also the change in debian/control (cf below). Remove depends on sysv-rc (>= 2.86.ds1-14.1ubuntu2)
- Assure that a debian/*.postinst exists to remove kill links in 0 et 6 status
- dch -i
- debuild -S, debdiff, pbuilder
unassigned, state -> confirmed, suscribed u-m-s (rmadison <package_name> -> nothing shown, so, it's under main section)
- send to upstream
Remove multiuser for dictd. Bug #254252
- grep -r multiuser *
- old in debian/rules:
dh_installinit -- multiuser
- replaced with:
dh_installinit -- start 20 2 3 4 5 . stop 20 1 .
- grep -r Default-Stop *
- old in debian/dictd.init:
# Default-Stop: 0 1 6
- replaced with:
# Default-Stop: 1
Since the maintainer is not Ubuntu Core Developers <ubuntu-devel-discuss@lists.ubuntu.com> (even if the previous version was xxxubuntu1), change it as debuild -S shout about it.
- See also the change in debian/control (cf below). No change seems necessary.
- Assure that a debian/*.postinst exists to remove kill links in 0 et 6 status
- dch -i
- debuild -S, debdiff, pbuilder
unassigned, state -> confirmed, suscribed u-m-s (rmadison <package_name> -> nothing shown, so, it's under main section)
- send to upstream
Remove multiuser for acpid. Bug #254249
File: acpid_1.0.6-9ubuntu3 Uploaded by bryyce
- grep -r multiuser *
- old in debian/rules:
dh_installinit -- multiuser 10 21
replaced with (cf https://lists.ubuntu.com/archives/ubuntu-devel-announce/2008-June/000430.html):
dh_installinit -- start 10 2 3 4 5 . stop 21 1 .
- grep -r Default-Stop *
- old in debian/acpid.init.d:
# Default-Stop: 0 1 6
- replaced with:
# Default-Stop: 1
further information from james_w show that I have to remove sysvinit special dependency has multiuser forced that (just use debian old rules from patches.ubuntu.com or packages.debian.org) apart from lsb-base (>= 3.2-14) which is used for status action in init script
- Assure that a debian/*.postinst exists to remove kill links in 0 et 6 status
- dch -i
* Replace "multiuser" deprecated init mode in debian/rules with manual arguments. Adapt the corresponding change in LSB init script header and runtime dependency in debian/control (LP: #254249)
- debuild -S, debdiff, pbuilder
unassigned, state -> confirmed, suscribed u-m-s (rmadison <package_name> -> nothing shown, so, it's under main section)
send to upstream, cleaning all modifications that are not Ubuntu-dependent (example: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=494951)
Fix NBS for icedtea-java7-jre, bug #203636
File: project-x_0.90.4dfsg-0ubuntu5; sun-javadb_10.3.2.1-0ubuntu2; freecol_0.7.4.dfsg-1ubuntu1; libwoodstox-java_3.9.2.dfsg-1ubuntu1 Uploaded by Lutin & dholbach & doko -> NBS removed asking on #ubuntu-devel
Look at http://people.ubuntu.com/~ubuntu-archive/NBS/icedtea-java7-jre page.
- Found 6 dependencies :
-- intrepid/universe xxx deps on icedtea-java7-jre: azureus freecol project-x -- intrepid/multiverse xxx deps on icedtea-java7-jre: sun-javadb-client sun-javadb-core sun-javadb-demo
+1 "late" dependencie:
libwoodstox-java
- for each binary package, to find the source package:
apt-cache showsrc <package> | grep Package
Package: azureus Package: freecol Package: project-x Package: sun-javadb
- None of those are NBS
- download all of them and look into debian/control
azureus: Depends: openjdk-6-jre | icedtea-java7-jre | sun-java6-jre | sun-java5-jre, libcommons-cli-java, liblog4j1.2-java, libseda-java, libswt3.2-gtk-java freecol: Depends: openjdk-6-jre | icedtea-java7-jre | sun-java6-jre | j2re1.6 , libhiglayout-java, libwoodstox-java, , java-wrappers (>= 0.1.4) project-x: Depends:${misc:Depends}, libcommons-net-java, openjdk-6-jre | icedtea-java7-jre | sun-java6-jre | sun-java5-jre sun-javadb: Depends: sun-javadb-common, openjdk-6-jre | sun-java5-jre | sun-java6-jre | icedtea-java7-jre | java2-runtime
- Azureus has been merged during this time.
- Removed icedtea-java7-jre from dependencies and well as specific dependencies :
https://lists.ubuntu.com/archives/ubuntu-devel-announce/2008-July/000460.html It is either 'default-jre | java2-runtime' or 'default-jre-headless | java2-runtime-headless'. Headless if the package does not any UI classes like AWT and SWING. for buildd: default-jdk
Change maintainer field for non Ubuntu specific package
- dch -i for each of them with xxxubuntu1 (if not specifically packaged for Ubuntu: not Build1 as there is a change in debian/control)
attach the 4 debdiff to the existing bug (https://bugs.launchpad.net/ubuntu/+source/project-x/+bug/203636)
- once done, have to sync to ask for removal in NBS.
Bug #61039 (no desktop entry) and #255086 (FTBFS)
File: sgt-puzzles_7983-1ubuntu1 Uploaded by Adri2000
https://bugs.launchpad.net/ubuntu/+source/sgt-puzzles/+bug/61039
https://bugs.launchpad.net/ubuntu/+source/sgt-puzzles/+bug/255086
Try to compile current sgt-puzzles (sudo pbuilder build sgt-puzzles_7983-1.dsc) => FTBFS (because of new flags used in intrepid: https://wiki.ubuntu.com/CompilerFlags)
- Fill a bug and put it in progress, assigned to me. #255085
- Begin to work on the FTBFS first, seing that quilt was used in this package
check if gtk.c (the faulting file ) is already used in a patch : grep gtk.c debian/patches/*
- found in 202_online-help.diff, 203_follow-fd.o-clipboards-spec.diff, 304_combine-binaries.diff
- As no previous patch seems to be relevant, I applied them with quilt and create a new one
export QUILT_PATCHES=debian/patches quilt push 202_online-help.diff quilt push 203_follow-fd.o-clipboards-spec.diff quilt push 304_combine-binaries.diff (but error has weren't is the series file) quilt new 306_fix-ftbfs-with-fortify-source-2.diff quilt add gtk.c vim gtk.c quilt refresh quilt pop -a
I think that unstead searching for the patches including this files, I could use push -a
echo "306_fix-ftbfs-with-fortify-source-2.diff" >> debian/patches/series
- Changed original maintainer (see below)
dch -i and add "add 306_fix-ftbfs-with-fortify-source-2.diff to fix FTBFS in gtk.c (LP: #255086)"
- Created and validated the 27 desktop files (one for each game) in debian/desktop/ (created directory)
- Create pixmap icons
for source in `ls icons/*48d8*` do dest=$(basename $source | sed -e 's/\([a-z][A-Z]*\)-48d8.png/\1/') convert $source debian/desktop/${dest}.xpm done
(and rename the 3 debian renamed files to avoid conflicts)
- Added to debian/rules, after dh_installmenu in binary-arch target
mkdir -p -m755 debian/sgt-puzzles/usr/share/applications install -m644 debian/desktop/*.desktop debian/sgt-puzzles/usr/share/applications mkdir -p -m755 debian/sgt-puzzles/usr/share/pixmaps/ install -m644 debian/desktop/*.xpm debian/sgt-puzzles/usr/share/pixmaps/
run dch -a and add :
* add desktop files and xpm files (on for each game) to the menu in debian/dekstop (LP: #61039)
build it and generate the debdiff file attached to the bugs and add intrepid origin-ubuntu ubuntu-patch as a tag (I cannot put any milestone for the bug? Intrepid alpha 4 milestone would have been great), place them back to "confirmed" status and assigned to nobody, subscribe u-u-s
- Report to upstream
'''#245633: wrong text for a .desktop file''' https://bugs.launchpad.net/bzr-gtk/+bug/245633, add also some french translation to it and remove deprecated/wrong key in the .desktop
File: bzr-gtk-0.94.0-1ubuntu1 Uploaded by warp10 PATCH COMMITED TO UPSTREAM with rev 0.95.0 https://bugs.launchpad.net/bzr-gtk/+bug/245633/comments/17
- Place the bug status to "in progress" and assigned to me
- Get the source and had a look at it.
As the file to correct is at the root of the source, I had to patch the package.
- The original maintainer was a Debian one, so I changed the debian/control file:
Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com> XSBC-Original-Maintainer: ...
used dpatch (as the original maintainer use it) and runned dpatch-edit-patch 04-change-menu-entry.dpatch
- vim the right file and change the content of it. Then exit 0 - vim 04-change-menu-entry.dpatch to change the first lines (DP field to give a description of the patch)
(if multiple lines add ## DP: at the begining of each line)
- add 04-change-menu-entry.dpatch to debian/patches/00list
run dch -i to update the debian/changelog file and added (LP: #245633)
bzr-gtk (0.94.0-1ubuntu1) intrepid; urgency=low * add 04-change-menu-entry.dpatch to fix name, add french translation and remove some deprecated keys in olive-gtk.desktop (LP: #245633) -- Didier Roche <didrocks@...> Fri, 01 Aug 2008 15:14:06 +0200
rebuild the source package with debuild -S (for new diff.gz and .dsc file)
Finally: debdiff bzr-gtk_0.94.0-1.dsc bzr-gtk_0.94.0-1ubuntu1.dsc > debdiff
build the package for a try: sudo pbuilder build bzr-gtk_0.94.0-1ubuntu1.dsc
- the .deb is in /var/cache/pbuilder/result/ - install in a VM
run desktop-file-validate olive-gtk.desktop to validate the desktop file
test the debdiff by patch -p1 < debdiff
- Attach the debdiff to the bug report, place it back to "confirmed" status and assigned to nobody, subscribe u-u-s
Added tags intrepid origin-ubuntu ubuntu-patch (cf https://wiki.ubuntu.com/Debian/Usertagging)
- Report to upstream
DidierRoche/MOTU/bugsaction (last edited 2009-03-23 11:59:52 by 91)